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

Made key and name attributes optional in register-group-instance TDF elements

Browse Source 
Also removed the attribute from all instances of the element, where it wasn't necessary.
This commit is contained in:
Nav
2024-08-13 19:54:05 +01:00
parent 7cf5afde2d
commit f1c82ecd28
265 changed files with 8717 additions and 8742 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -774,7 +774,10 @@ namespace Targets::TargetDescription
element = element.nextSiblingElement("register-group-instance")
) {
auto registerGroupInstance = TargetDescriptionFile::registerGroupInstanceFromXml(element);
output.registerGroupInstancesByKey.emplace(registerGroupInstance.key, std::move(registerGroupInstance));
output.registerGroupInstancesByKey.emplace(
registerGroupInstance.key.value_or(registerGroupInstance.registerGroupKey),
std::move(registerGroupInstance)
);
}
for (
@@ -790,8 +793,8 @@ namespace Targets::TargetDescription
RegisterGroupInstance TargetDescriptionFile::registerGroupInstanceFromXml(const QDomElement& xmlElement) {
return {
TargetDescriptionFile::getAttribute(xmlElement, "key"),
TargetDescriptionFile::getAttribute(xmlElement, "name"),
TargetDescriptionFile::tryGetAttribute(xmlElement, "key"),
TargetDescriptionFile::tryGetAttribute(xmlElement, "name"),
TargetDescriptionFile::getAttribute(xmlElement, "register-group-key"),
TargetDescriptionFile::getAttribute(xmlElement, "address-space-key"),
StringService::toUint32(TargetDescriptionFile::getAttribute(xmlElement, "offset")),