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

Corrected regression from previous refactor where the data type and endianness of focused memory regions were not being persisted through debug sessions

Browse Source
This commit is contained in:
Nav
2023-01-05 01:40:43 +00:00
parent 7aa1639df2
commit 80035cadae
2 changed files with 35 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/FocusedMemoryRegion.cpp
View File

@@ -15,8 +15,25 @@ namespace Bloom
FocusedMemoryRegion::FocusedMemoryRegion(const QJsonObject& jsonObject)
: MemoryRegion(jsonObject)
{
using Exceptions::Exception;
if (this->type != MemoryRegionType::FOCUSED) {
throw Exceptions::Exception("Invalid memory region type");
throw Exception("Invalid memory region type");
}
if (!jsonObject.contains("dataType") || !jsonObject.contains("endianness")) {
throw Exception("Missing data");
}
this->dataType = FocusedMemoryRegion::regionDataTypesByName.at(jsonObject.find("dataType")->toString());
this->endianness = FocusedMemoryRegion::regionEndiannessByName.at(jsonObject.find("endianness")->toString());
}
QJsonObject FocusedMemoryRegion::toJson() const {
auto jsonObject = MemoryRegion::toJson();
jsonObject.insert("dataType", FocusedMemoryRegion::regionDataTypesByName.at(this->dataType));
jsonObject.insert("endianness", FocusedMemoryRegion::regionEndiannessByName.at(this->endianness));
return jsonObject;
}
}

17
src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/FocusedMemoryRegion.hpp
View File

@@ -4,6 +4,8 @@
#include "MemoryRegion.hpp"
#include "src/Helpers/BiMap.hpp"
namespace Bloom
{
enum class MemoryRegionDataType: std::uint8_t
@@ -27,5 +29,20 @@ namespace Bloom
);
FocusedMemoryRegion(const QJsonObject& jsonObject);
QJsonObject toJson() const override;
private:
static const inline BiMap<MemoryRegionDataType, QString> regionDataTypesByName = {
{MemoryRegionDataType::UNKNOWN, "other"},
{MemoryRegionDataType::UNSIGNED_INTEGER, "unsigned_int"},
{MemoryRegionDataType::SIGNED_INTEGER, "signed_int"},
{MemoryRegionDataType::ASCII_STRING, "ascii_string"},
};
static const inline BiMap<Targets::TargetMemoryEndianness, QString> regionEndiannessByName = {
{Targets::TargetMemoryEndianness::LITTLE, "little"},
{Targets::TargetMemoryEndianness::BIG, "big"},
};
};
}