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

Reused CPU peripheral for GPRs in AVR8 driver

Browse Source
This commit is contained in:
Nav
2024-12-24 19:58:22 +00:00
parent 9b60bb5682
commit c288e0e838
4 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/DebugServer/Gdb/AvrGdb/AvrGdbTargetDescriptor.cpp
View File

@@ -18,7 +18,7 @@ namespace DebugServer::Gdb::AvrGdb
, eepromMemorySegmentDescriptor(this->eepromAddressSpaceDescriptor.getMemorySegmentDescriptor("internal_eeprom")) , eepromMemorySegmentDescriptor(this->eepromAddressSpaceDescriptor.getMemorySegmentDescriptor("internal_eeprom"))
, sramMemorySegmentDescriptor(this->sramAddressSpaceDescriptor.getMemorySegmentDescriptor("internal_ram")) , sramMemorySegmentDescriptor(this->sramAddressSpaceDescriptor.getMemorySegmentDescriptor("internal_ram"))
, gpRegistersMemorySegmentDescriptor(this->gpRegistersAddressSpaceDescriptor.getMemorySegmentDescriptor("gp_registers")) , gpRegistersMemorySegmentDescriptor(this->gpRegistersAddressSpaceDescriptor.getMemorySegmentDescriptor("gp_registers"))
, cpuGpPeripheralDescriptor(targetDescriptor.getPeripheralDescriptor("cpu_gpr")) , cpuGpPeripheralDescriptor(targetDescriptor.getPeripheralDescriptor("cpu"))
, cpuGpRegisterGroupDescriptor(this->cpuGpPeripheralDescriptor.getRegisterGroupDescriptor("gpr")) , cpuGpRegisterGroupDescriptor(this->cpuGpPeripheralDescriptor.getRegisterGroupDescriptor("gpr"))
{ {
/* /*

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

@@ -280,24 +280,15 @@ namespace Targets::Microchip::Avr8
const auto& registerFileAddressSpace = this->targetDescriptionFile.getRegisterFileAddressSpace(); const auto& registerFileAddressSpace = this->targetDescriptionFile.getRegisterFileAddressSpace();
const auto& registerFileMemorySegment = registerFileAddressSpace.getMemorySegment("gp_registers"); const auto& registerFileMemorySegment = registerFileAddressSpace.getMemorySegment("gp_registers");
auto& gpPeripheral = descriptor.peripheralDescriptorsByKey.emplace( auto& cpuPeripheral = descriptor.getPeripheralDescriptor("cpu");
"cpu_gpr",
TargetPeripheralDescriptor{
"cpu_gpr",
"GPRs",
"CPU General Purpose Registers",
{},
{}
}
).first->second;
auto& gpRegisterGroup = gpPeripheral.registerGroupDescriptorsByKey.emplace( auto& gpRegisterGroup = cpuPeripheral.registerGroupDescriptorsByKey.emplace(
"gpr", "gpr",
TargetRegisterGroupDescriptor{ TargetRegisterGroupDescriptor{
"gpr", "gpr",
"gpr", "gpr",
"CPU General Purpose", "GPR",
gpPeripheral.key, cpuPeripheral.key,
registerFileAddressSpace.key, registerFileAddressSpace.key,
std::nullopt, std::nullopt,
{}, {},
@@ -313,7 +304,7 @@ namespace Targets::Microchip::Avr8
key, key,
"R" + std::to_string(i), "R" + std::to_string(i),
gpRegisterGroup.absoluteKey, gpRegisterGroup.absoluteKey,
gpPeripheral.key, cpuPeripheral.key,
registerFileAddressSpace.key, registerFileAddressSpace.key,
registerFileMemorySegment.startAddress + i, registerFileMemorySegment.startAddress + i,
1, 1,

6
src/Targets/TargetDescriptor.cpp
View File

@@ -128,6 +128,12 @@ namespace Targets
return descriptor->get(); return descriptor->get();
} }
TargetPeripheralDescriptor& TargetDescriptor::getPeripheralDescriptor(const std::string& key) {
return const_cast<TargetPeripheralDescriptor&>(
const_cast<const TargetDescriptor*>(this)->getPeripheralDescriptor(key)
);
}
std::optional< std::optional<
std::reference_wrapper<const TargetPadDescriptor> std::reference_wrapper<const TargetPadDescriptor>
> TargetDescriptor::tryGetPadDescriptor(const std::string& key) const { > TargetDescriptor::tryGetPadDescriptor(const std::string& key) const {

1
src/Targets/TargetDescriptor.hpp
View File

@@ -87,6 +87,7 @@ namespace Targets
) const; ) const;
const TargetPeripheralDescriptor& getPeripheralDescriptor(const std::string& key) const; const TargetPeripheralDescriptor& getPeripheralDescriptor(const std::string& key) const;
TargetPeripheralDescriptor& getPeripheralDescriptor(const std::string& key);
std::optional<std::reference_wrapper<const TargetPadDescriptor>> tryGetPadDescriptor( std::optional<std::reference_wrapper<const TargetPadDescriptor>> tryGetPadDescriptor(
const std::string& key const std::string& key