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

Preparation for support for the GDB vCont command packet

Browse Source 
Also fixed a bug in the `StepExecution` and `ContinueExecution` constructors, where the from address wasn't being extracted properly
This commit is contained in:
Nav
2023-04-01 12:37:59 +01:00
parent 837f6d0af3
commit 56ea97369d
11 changed files with 40 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/TargetController/Commands/ResumeTargetExecution.hpp
View File

@@ -14,11 +14,13 @@ namespace Bloom::TargetController::Commands
static constexpr CommandType type = CommandType::RESUME_TARGET_EXECUTION;
static const inline std::string name = "ResumeTargetExecution";
std::optional<Targets::TargetProgramCounter> fromProgramCounter;
std::optional<Targets::TargetMemoryAddress> fromAddress;
std::optional<Targets::TargetMemoryAddress> toAddress;
ResumeTargetExecution() = default;
explicit ResumeTargetExecution(Targets::TargetProgramCounter fromProgramCounter)
: fromProgramCounter(fromProgramCounter)
ResumeTargetExecution(Targets::TargetMemoryAddress fromAddress, Targets::TargetMemoryAddress toAddress)
: fromAddress(fromAddress)
, toAddress(toAddress)
{};
[[nodiscard]] CommandType getType() const override {

6
src/TargetController/TargetControllerComponent.cpp
View File

@@ -797,11 +797,11 @@ namespace Bloom::TargetController
ResumeTargetExecution& command
) {
if (this->target->getState() != TargetState::RUNNING) {
if (command.fromProgramCounter.has_value()) {
this->target->setProgramCounter(command.fromProgramCounter.value());
if (command.fromAddress.has_value()) {
this->target->setProgramCounter(*command.fromAddress);
}
this->target->run();
this->target->run(command.toAddress);
this->lastTargetState = TargetState::RUNNING;
}