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

Removed TargetProgramCounter type alias

Browse Source
This commit is contained in:
Nav
2023-09-21 00:40:30 +01:00
parent 611ad70d6b
commit b5df37ae9b
27 changed files with 46 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Insight/UserInterfaces/InsightWindow/InsightWindow.cpp
View File

@@ -854,7 +854,7 @@ void InsightWindow::refreshProgramCounter(std::optional<std::function<void(void)
readProgramCounterTask.get(),
&ReadProgramCounter::programCounterRead,
this,
[this] (Targets::TargetProgramCounter programCounter) {
[this] (Targets::TargetMemoryAddress programCounter) {
this->programCounterValueLabel->setText(
"0x" + QString::number(programCounter, 16).toUpper() + " (" + QString::number(programCounter) + ")"
);

4
src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/MemorySnapshot.cpp
View File

@@ -12,7 +12,7 @@ MemorySnapshot::MemorySnapshot(
const QString& description,
Targets::TargetMemoryType memoryType,
const Targets::TargetMemoryBuffer& data,
Targets::TargetProgramCounter programCounter,
Targets::TargetMemoryAddress programCounter,
Targets::TargetStackPointer stackPointer,
const std::vector<FocusedMemoryRegion>& focusedRegions,
const std::vector<ExcludedMemoryRegion>& excludedRegions
@@ -50,7 +50,7 @@ MemorySnapshot::MemorySnapshot(const QJsonObject& jsonObject) {
this->name = jsonObject.find("name")->toString();
this->description = jsonObject.find("description")->toString();
this->memoryType = EnumToStringMappings::targetMemoryTypes.at(jsonObject.find("memoryType")->toString());
this->programCounter = static_cast<Targets::TargetProgramCounter>(jsonObject.find("programCounter")->toInteger());
this->programCounter = static_cast<Targets::TargetMemoryAddress>(jsonObject.find("programCounter")->toInteger());
this->stackPointer = static_cast<Targets::TargetStackPointer>(jsonObject.find("stackPointer")->toInteger());
this->createdDate.setSecsSinceEpoch(jsonObject.find("createdTimestamp")->toInteger());

4
src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/MemorySnapshot.hpp
View File

@@ -20,7 +20,7 @@ public:
QString description;
Targets::TargetMemoryType memoryType;
Targets::TargetMemoryBuffer data;
Targets::TargetProgramCounter programCounter;
Targets::TargetMemoryAddress programCounter;
Targets::TargetStackPointer stackPointer;
QDateTime createdDate = Services::DateTimeService::currentDateTime();
@@ -32,7 +32,7 @@ public:
const QString& description,
Targets::TargetMemoryType memoryType,
const Targets::TargetMemoryBuffer& data,
Targets::TargetProgramCounter programCounter,
Targets::TargetMemoryAddress programCounter,
Targets::TargetStackPointer stackPointer,
const std::vector<FocusedMemoryRegion>& focusedRegions,
const std::vector<ExcludedMemoryRegion>& excludedRegions