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

Cleaned up the target interface header, as well as some small bits of cleaning in other places

Browse Source
This commit is contained in:
Nav
2021-04-07 20:34:12 +01:00
parent 71f312f925
commit 8d6b09ec21
4 changed files with 276 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/TargetController/TargetController.cpp
View File

@@ -67,6 +67,7 @@ void TargetController::startup() {
// Initiate debug tool and target
this->setDebugTool(std::move(supportedDebugTools.find(debugToolName)->second()));
this->setTarget(supportedTargets.find(targetName)->second());
Logger::info("Connecting to debug tool");
this->debugTool->init();
@@ -75,8 +76,6 @@ void TargetController::startup() {
Logger::info("Debug tool name: " + debugTool->getName());
Logger::info("Debug tool serial: " + debugTool->getSerialNumber());
this->setTarget(supportedTargets.find(targetName)->second());
if (!this->target->isDebugToolSupported(debugTool.get())) {
throw Exceptions::InvalidConfig(
"Debug tool (\"" + debugTool->getName() + "\") not supported " +
@@ -399,10 +398,10 @@ void TargetController::onWriteMemoryEvent(EventPointer<Events::WriteMemoryToTarg
memoryWrittenEvent->correlationId = event->id;
this->eventManager.triggerEvent(memoryWrittenEvent);
if (this->target->willMemoryWriteAffectIoPorts(
if (this->target->memoryAddressRangeClashesWithIoPortRegisters(
event->memoryType,
event->startAddress,
static_cast<std::uint32_t>(event->buffer.size())
static_cast<std::uint32_t>(event->startAddress + (event->buffer.size() - 1))
)) {
// This memory write has affected the target's IO port values
this->eventManager.triggerEvent(std::make_shared<Events::TargetIoPortsUpdated>());