From 6f9ba1930d49a68782fc3dec0bd491107b7e428d Mon Sep 17 00:00:00 2001 From: Nav Date: Sun, 29 May 2022 23:17:56 +0100 Subject: [PATCH] Changed addresses to hexadecimal, in the JSON response for the `monitor target-info machine` GDB command --- .../Gdb/CommandPackets/TargetInfoMachine.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/DebugServer/Gdb/CommandPackets/TargetInfoMachine.cpp b/src/DebugServer/Gdb/CommandPackets/TargetInfoMachine.cpp index 9f28e1a9..29772e9c 100644 --- a/src/DebugServer/Gdb/CommandPackets/TargetInfoMachine.cpp +++ b/src/DebugServer/Gdb/CommandPackets/TargetInfoMachine.cpp @@ -42,19 +42,19 @@ namespace Bloom::DebugServer::Gdb::CommandPackets {TargetMemoryType::EEPROM, QString("EEPROM")}, }); - auto memoryDescriptors = QJsonArray(); + auto memoryDescriptorsJson = QJsonArray(); for (const auto& [memoryType, memoryDescriptor] : targetDescriptor.memoryDescriptorsByType) { if (!memoryTypeNamesByType.contains(memoryType)) { continue; } - memoryDescriptors.push_back(QJsonObject({ + memoryDescriptorsJson.push_back(QJsonObject({ {"name", memoryTypeNamesByType.at(memoryType)}, {"size", static_cast(memoryDescriptor.size())}, {"addressRange", QJsonObject({ - {"startAddress", static_cast(memoryDescriptor.addressRange.startAddress)}, - {"endAddress", static_cast(memoryDescriptor.addressRange.endAddress)}, + {"startAddress", "0x" + QString::number(memoryDescriptor.addressRange.startAddress, 16)}, + {"endAddress", "0x" + QString::number(memoryDescriptor.addressRange.endAddress, 16)}, })} })); } @@ -63,7 +63,7 @@ namespace Bloom::DebugServer::Gdb::CommandPackets {"target", QJsonObject({ {"name", QString::fromStdString(targetDescriptor.name)}, {"id", QString::fromStdString(targetDescriptor.id)}, - {"memoryDescriptors", memoryDescriptors}, + {"memoryDescriptors", memoryDescriptorsJson}, })}, }); }