feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.14'

Browse Source 
Change-Id: I7d55c01489dfcdd26fcf3ced9f26539a09073e8c
This commit is contained in:
Orgad Shaneh
2021-02-06 22:35:18 +02:00
parent 55945c3307 bd25785997
commit dad2b3d84b
7 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/debugger/peripheralregisterhandler.cpp
View File

@@ -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 &reg)
{
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 &reg)
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)