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

Use std::set instead of std::vector for TargetRegisterDescriptors

Browse Source
This commit is contained in:
Nav
2021-08-30 22:23:27 +01:00
parent 4c4bde45cf
commit 3b458bd12d
6 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/DebugServers/GdbRsp/AvrGdbRsp/AvrGdbRsp.cpp
View File

@@ -27,36 +27,31 @@ void AvrGdbRsp::loadRegisterNumberToDescriptorMapping() {
throw Exception("Unexpected general purpose register count");
}
auto& gpRegisterDescriptors = registerDescriptorsByType.at(TargetRegisterType::GENERAL_PURPOSE_REGISTER);
std::sort(
gpRegisterDescriptors.begin(),
gpRegisterDescriptors.end(),
[](const TargetRegisterDescriptor& descriptorA, const TargetRegisterDescriptor& descriptorB) {
return descriptorA.startAddress.value() < descriptorB.startAddress.value();
}
);
for (std::size_t descriptorIndex = 0; descriptorIndex < gpRegisterDescriptors.size(); descriptorIndex++) {
std::size_t descriptorIndex = 0;
for (auto& descriptor : gpRegisterDescriptors) {
this->registerNumberToDescriptorMapping.insert(std::pair(
static_cast<GdbRegisterNumber>(descriptorIndex),
gpRegisterDescriptors[descriptorIndex]
descriptor
));
descriptorIndex++;
}
this->registerNumberToDescriptorMapping.insert(std::pair(
static_cast<GdbRegisterNumber>(32),
registerDescriptorsByType.at(TargetRegisterType::STATUS_REGISTER).front()
*(registerDescriptorsByType.at(TargetRegisterType::STATUS_REGISTER).begin())
));
this->registerNumberToDescriptorMapping.insert(std::pair(
static_cast<GdbRegisterNumber>(33),
registerDescriptorsByType.at(TargetRegisterType::STACK_POINTER).front()
*(registerDescriptorsByType.at(TargetRegisterType::STACK_POINTER).begin())
));
this->registerNumberToDescriptorMapping.insert(std::pair(
static_cast<GdbRegisterNumber>(34),
registerDescriptorsByType.at(TargetRegisterType::PROGRAM_COUNTER).front()
*(registerDescriptorsByType.at(TargetRegisterType::PROGRAM_COUNTER).begin())
));
}

4
src/DebugServers/GdbRsp/GdbRspDebugServer.cpp
View File

@@ -268,12 +268,12 @@ void GdbRspDebugServer::handleGdbPacket(CommandPackets::ReadRegisters& packet) {
if (packet.registerNumber.has_value()) {
Logger::debug("Reading register number: " + std::to_string(packet.registerNumber.value()));
descriptors.push_back(this->getRegisterDescriptorFromNumber(packet.registerNumber.value()));
descriptors.insert(this->getRegisterDescriptorFromNumber(packet.registerNumber.value()));
} else {
// Read all descriptors
for (auto& descriptor : registerNumberToDescriptorMapping.getMap()) {
descriptors.push_back(descriptor.second);
descriptors.insert(descriptor.second);
}
}