doryan/BloomPatched
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Applied debug-interface-specific access restrictions for memory and registers

Browse Source
This commit is contained in:
Nav
2024-12-07 16:43:16 +00:00
parent 289919f330
commit cbfbd9f4b8
11 changed files with 78 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Targets/Microchip/AVR8/Avr8.cpp
View File

@@ -328,7 +328,7 @@ namespace Targets::Microchip::Avr8
// The debug interface may have its own access restrictions for registers.
for (auto& [peripheralKey, peripheral] : descriptor.peripheralDescriptorsByKey) {
for (auto& [groupKey, registerGroup] : peripheral.registerGroupDescriptorsByKey) {
this->applyDebugInterfaceRegisterAccessRestrictions(
this->applyDebugInterfaceAccessRestrictions(
registerGroup,
descriptor.getAddressSpaceDescriptor(registerGroup.addressSpaceKey)
);
@@ -781,23 +781,16 @@ namespace Targets::Microchip::Avr8
this->writeRegisters({{descriptor, value}});
}
void Avr8::applyDebugInterfaceRegisterAccessRestrictions(
void Avr8::applyDebugInterfaceAccessRestrictions(
TargetRegisterGroupDescriptor& groupDescriptor,
const TargetAddressSpaceDescriptor& addressSpaceDescriptor
) {
for (auto& [subgroupKey, subgroupDescriptor] : groupDescriptor.subgroupDescriptorsByKey) {
this->applyDebugInterfaceRegisterAccessRestrictions(subgroupDescriptor, addressSpaceDescriptor);
for (auto& [registerKey, registerDescriptor] : groupDescriptor.registerDescriptorsByKey) {
this->avr8DebugInterface->applyAccessRestrictions(registerDescriptor, addressSpaceDescriptor);
}
for (auto& [registerKey, registerDescriptor] : groupDescriptor.registerDescriptorsByKey) {
if (!registerDescriptor.access.readable && !registerDescriptor.access.writable) {
// This register is already inaccessible - no need to check for further restrictions
continue;
}
const auto access = this->avr8DebugInterface->getRegisterAccess(registerDescriptor, addressSpaceDescriptor);
registerDescriptor.access.readable = registerDescriptor.access.readable && access.readable;
registerDescriptor.access.writable = registerDescriptor.access.writable && access.writable;
for (auto& [subgroupKey, subgroupDescriptor] : groupDescriptor.subgroupDescriptorsByKey) {
this->applyDebugInterfaceAccessRestrictions(subgroupDescriptor, addressSpaceDescriptor);
}
}

2
src/Targets/Microchip/AVR8/Avr8.hpp
View File

@@ -169,7 +169,7 @@ namespace Targets::Microchip::Avr8
TargetMemoryBuffer readRegister(const TargetRegisterDescriptor& descriptor);
void writeRegister(const TargetRegisterDescriptor& descriptor, const TargetMemoryBuffer& value) ;
void applyDebugInterfaceRegisterAccessRestrictions(
void applyDebugInterfaceAccessRestrictions(
TargetRegisterGroupDescriptor& groupDescriptor,
const TargetAddressSpaceDescriptor& addressSpaceDescriptor
);

18
src/Targets/RiscV/RiscV.cpp
View File

@@ -307,6 +307,22 @@ namespace Targets::RiscV
return this->programmingMode;
}
void RiscV::applyDebugInterfaceAccessRestrictions(TargetAddressSpaceDescriptor& addressSpaceDescriptor) {
for (auto& [segmentKey, segmentDescriptor] : addressSpaceDescriptor.segmentDescriptorsByKey) {
this->riscVDebugInterface->applyAccessRestrictions(segmentDescriptor);
}
}
void RiscV::applyDebugInterfaceAccessRestrictions(TargetRegisterGroupDescriptor& registerGroupDescriptor) {
for (auto& [registerKey, registerDescriptor] : registerGroupDescriptor.registerDescriptorsByKey) {
this->riscVDebugInterface->applyAccessRestrictions(registerDescriptor);
}
for (auto& [subgroupKey, subgroupDescriptor] : registerGroupDescriptor.subgroupDescriptorsByKey) {
this->applyDebugInterfaceAccessRestrictions(subgroupDescriptor);
}
}
const TargetMemorySegmentDescriptor& RiscV::resolveRegisterMemorySegmentDescriptor(
const TargetRegisterDescriptor& regDescriptor,
const TargetAddressSpaceDescriptor& addressSpaceDescriptor
@@ -355,6 +371,7 @@ namespace Targets::RiscV
false,
{true, true},
{false, false},
false,
std::nullopt
}
);
@@ -371,6 +388,7 @@ namespace Targets::RiscV
false,
{true, true},
{false, false},
false,
std::nullopt
}
);

6
src/Targets/RiscV/RiscV.hpp
View File

@@ -11,6 +11,9 @@
#include "TargetDescriptionFile.hpp"
#include "IsaDescriptor.hpp"
#include "src/Targets/TargetAddressSpaceDescriptor.hpp"
#include "src/Targets/TargetRegisterGroupDescriptor.hpp"
#include "src/DebugToolDrivers/TargetInterfaces/RiscV/RiscVDebugInterface.hpp"
namespace Targets::RiscV
@@ -119,6 +122,9 @@ namespace Targets::RiscV
bool programmingMode = false;
void applyDebugInterfaceAccessRestrictions(TargetAddressSpaceDescriptor& addressSpaceDescriptor);
void applyDebugInterfaceAccessRestrictions(TargetRegisterGroupDescriptor& registerGroupDescriptor);
const TargetMemorySegmentDescriptor& resolveRegisterMemorySegmentDescriptor(
const TargetRegisterDescriptor& regDescriptor,
const TargetAddressSpaceDescriptor& addressSpaceDescriptor

10
src/Targets/RiscV/Wch/WchRiscV.cpp
View File

@@ -78,6 +78,16 @@ namespace Targets::RiscV::Wch
this->cpuPeripheralDescriptor.clone()
);
for (auto& [addressSpaceKey, addressSpaceDescriptor] : descriptor.addressSpaceDescriptorsByKey) {
this->applyDebugInterfaceAccessRestrictions(addressSpaceDescriptor);
}
for (auto& [peripheralKey, peripheralDescriptor] : descriptor.peripheralDescriptorsByKey) {
for (auto& [groupKey, groupDescriptor] : peripheralDescriptor.registerGroupDescriptorsByKey) {
this->applyDebugInterfaceAccessRestrictions(groupDescriptor);
}
}
auto& sysAddressSpaceDescriptor = descriptor.getAddressSpaceDescriptor("system");
sysAddressSpaceDescriptor.getMemorySegmentDescriptor("internal_program_memory").inspectionEnabled = true;
sysAddressSpaceDescriptor.getMemorySegmentDescriptor("internal_ram").inspectionEnabled = true;