diff options
| -rw-r--r-- | src/plugins/debugger/peripheralregisterhandler.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/plugins/debugger/peripheralregisterhandler.cpp b/src/plugins/debugger/peripheralregisterhandler.cpp index 0236697d7e0..667c3d21dba 100644 --- a/src/plugins/debugger/peripheralregisterhandler.cpp +++ b/src/plugins/debugger/peripheralregisterhandler.cpp @@ -59,6 +59,8 @@ constexpr char kDisplayName[] = "displayName"; constexpr char kField[] = "field"; constexpr char kFields[] = "fields"; constexpr char kGroupName[] = "groupName"; +constexpr char kLsb[] = "lsb"; +constexpr char kMsb[] = "msb"; constexpr char kName[] = "name"; constexpr char kPeripheral[] = "peripheral"; constexpr char kPeripherals[] = "peripherals"; @@ -566,6 +568,8 @@ PeripheralRegisterHandler::PeripheralRegisterHandler(DebuggerEngine *engine) static void handleField(QXmlStreamReader &in, PeripheralRegister ®) { PeripheralRegisterField fld; + Utils::optional<int> from; + Utils::optional<int> to; while (in.readNextStartElement()) { const auto elementName = in.name(); if (elementName == QLatin1String(kName)) { @@ -593,11 +597,20 @@ static void handleField(QXmlStreamReader &in, PeripheralRegister ®) fld.bitOffset = int(decodeNumeric(in.readElementText())); } else if (elementName == QLatin1String(kBitWidth)) { fld.bitWidth = int(decodeNumeric(in.readElementText())); + } else if (elementName == QLatin1String(kLsb)) { + from = int(decodeNumeric(in.readElementText())); + } else if (elementName == QLatin1String(kMsb)) { + to = int(decodeNumeric(in.readElementText())); } else { in.skipCurrentElement(); } } + if (from && to) { + fld.bitOffset = *from; + fld.bitWidth = *to - *from + 1; + } + // Inherit the field access from the register access if the filed // has not the access rights description. if (fld.access == PeripheralRegisterAccess::Unknown) |