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

Corrected register group extraction from AVR8 TDFs

Browse Source
This commit is contained in:
Nav
2021-08-27 23:51:21 +01:00
parent 96c3279efd
commit a52d2271b3
3 changed files with 35 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Targets/TargetDescription/TargetDescriptionFile.cpp
View File

@@ -169,9 +169,9 @@ RegisterGroup TargetDescriptionFile::generateRegisterGroupFromXml(const QDomElem
throw Exception("Empty register group name");
}
registerGroup.moduleName = xmlElement.hasAttribute("name-in-module")
? xmlElement.attribute("name-in-module").toLower().toStdString()
: registerGroup.name;
if (xmlElement.hasAttribute("name-in-module")) {
registerGroup.moduleName = xmlElement.attribute("name-in-module").toLower().toStdString();
}
if (xmlElement.hasAttribute("offset")) {
registerGroup.offset = xmlElement.attribute("offset").toInt(nullptr, 16);
@@ -315,6 +315,11 @@ void TargetDescriptionFile::loadPeripheralModules() {
);
module.registerGroupsMappedByName.insert(std::pair(registerGroup.name, registerGroup));
if (registerGroup.moduleName.has_value()) {
this->peripheralRegisterGroupsMappedByModuleRegisterGroupName[registerGroup.moduleName.value()]
.emplace_back(registerGroup);
}
}
auto instanceNodes = moduleElement.elementsByTagName("instance");