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

Added TargetMemoryAddress, TargetMemorySize, TargetProgramCounter and TargetStackPointer aliases

Browse Source
This commit is contained in:
Nav
2022-09-06 17:16:49 +01:00
parent 620e6dc06a
commit 46d8ce1854
46 changed files with 234 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Insight/InsightWorker/Tasks/ReadProgramCounter.hpp
View File

@@ -2,6 +2,8 @@
#include "InsightWorkerTask.hpp"
#include "src/Targets/TargetMemory.hpp"
namespace Bloom
{
class ReadProgramCounter: public InsightWorkerTask
@@ -12,7 +14,7 @@ namespace Bloom
ReadProgramCounter() = default;
signals:
void programCounterRead(std::uint32_t programCounter);
void programCounterRead(Targets::TargetProgramCounter programCounter);
protected:
void run(TargetController::TargetControllerConsole& targetControllerConsole) override;

4
src/Insight/InsightWorker/Tasks/ReadStackPointer.hpp
View File

@@ -2,6 +2,8 @@
#include "InsightWorkerTask.hpp"
#include "src/Targets/TargetMemory.hpp"
namespace Bloom
{
class ReadStackPointer: public InsightWorkerTask
@@ -12,7 +14,7 @@ namespace Bloom
ReadStackPointer() = default;
signals:
void stackPointerRead(std::uint32_t stackPointer);
void stackPointerRead(Targets::TargetStackPointer stackPointer);
protected:
void run(TargetController::TargetControllerConsole& targetControllerConsole) override;

4
src/Insight/InsightWorker/Tasks/ReadTargetMemory.cpp
View File

@@ -25,10 +25,10 @@ namespace Bloom
for (auto i = 0; i < readsRequired; i++) {
auto dataSegment = targetControllerConsole.readMemory(
this->memoryType,
this->startAddress + static_cast<std::uint32_t>(readSize * i),
this->startAddress + static_cast<Targets::TargetMemoryAddress>(readSize * i),
(this->size - data.size()) >= readSize
? readSize
: static_cast<std::uint32_t>(this->size - data.size()),
: static_cast<Targets::TargetMemorySize>(this->size - data.size()),
this->excludedAddressRanges
);

8
src/Insight/InsightWorker/Tasks/ReadTargetMemory.hpp
View File

@@ -15,8 +15,8 @@ namespace Bloom
public:
ReadTargetMemory(
Targets::TargetMemoryType memoryType,
std::uint32_t startAddress,
std::uint32_t size,
Targets::TargetMemoryAddress startAddress,
Targets::TargetMemorySize size,
const std::set<Targets::TargetMemoryAddressRange>& excludedAddressRanges = {}
)
: memoryType(memoryType)
@@ -32,8 +32,8 @@ namespace Bloom
private:
Targets::TargetMemoryType memoryType;
std::uint32_t startAddress;
std::uint32_t size;
Targets::TargetMemoryAddress startAddress;
Targets::TargetMemorySize size;
std::set<Targets::TargetMemoryAddressRange> excludedAddressRanges;
};
}