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/DebugServer/Gdb/AvrGdb/AvrGdbRsp.cpp
View File

@@ -142,7 +142,7 @@ namespace DebugServer::Gdb::AvrGdb
};
}
void AvrGdbRsp::handleTargetStoppedGdbResponse(Targets::TargetProgramCounter programAddress) {
void AvrGdbRsp::handleTargetStoppedGdbResponse(Targets::TargetMemoryAddress programAddress) {
using Services::StringService;
Logger::debug("Target stopped at byte address: 0x" + StringService::toHex(programAddress));

2
src/DebugServer/Gdb/AvrGdb/AvrGdbRsp.hpp
View File

@@ -45,7 +45,7 @@ namespace DebugServer::Gdb::AvrGdb
*/
std::set<std::pair<Feature, std::optional<std::string>>> getSupportedFeatures();
void handleTargetStoppedGdbResponse(Targets::TargetProgramCounter programAddress) override;
void handleTargetStoppedGdbResponse(Targets::TargetMemoryAddress programAddress) override;
private:
TargetDescriptor gdbTargetDescriptor;

2
src/DebugServer/Gdb/AvrGdb/CommandPackets/ReadRegisters.cpp
View File

@@ -46,7 +46,7 @@ namespace DebugServer::Gdb::AvrGdb::CommandPackets
}
Targets::TargetRegisters registerSet;
Targets::TargetProgramCounter programCounter;
Targets::TargetMemoryAddress programCounter;
{
const auto atomicSession = targetControllerService.makeAtomicSession();

4
src/DebugServer/Gdb/AvrGdb/CommandPackets/VContRangeStep.cpp
View File

@@ -45,8 +45,8 @@ namespace DebugServer::Gdb::AvrGdb::CommandPackets
: commandData.end()
);
this->startAddress = static_cast<Targets::TargetProgramCounter>(std::stoi(startAddressHex, nullptr, 16));
this->endAddress = static_cast<Targets::TargetProgramCounter>(std::stoi(endAddressHex, nullptr, 16));
this->startAddress = static_cast<Targets::TargetMemoryAddress>(std::stoi(startAddressHex, nullptr, 16));
this->endAddress = static_cast<Targets::TargetMemoryAddress>(std::stoi(endAddressHex, nullptr, 16));
}
void VContRangeStep::handle(Gdb::DebugSession& debugSession, TargetControllerService& targetControllerService) {

4
src/DebugServer/Gdb/AvrGdb/CommandPackets/VContRangeStep.hpp
View File

@@ -16,8 +16,8 @@ namespace DebugServer::Gdb::AvrGdb::CommandPackets
class VContRangeStep: public Gdb::CommandPackets::CommandPacket
{
public:
Targets::TargetProgramCounter startAddress;
Targets::TargetProgramCounter endAddress;
Targets::TargetMemoryAddress startAddress;
Targets::TargetMemoryAddress endAddress;
explicit VContRangeStep(const RawPacket& rawPacket);

2
src/DebugServer/Gdb/AvrGdb/CommandPackets/WriteRegister.cpp
View File

@@ -52,7 +52,7 @@ namespace DebugServer::Gdb::AvrGdb::CommandPackets
try {
if (this->registerId == TargetDescriptor::PROGRAM_COUNTER_GDB_REGISTER_ID) {
targetControllerService.setProgramCounter(
static_cast<Targets::TargetProgramCounter>(
static_cast<Targets::TargetMemoryAddress>(
(this->registerValue.size() >= 1 ? this->registerValue[0] : 0x00) << 24
| (this->registerValue.size() >= 2 ? this->registerValue[1] : 0x00) << 16
| (this->registerValue.size() >= 3 ? this->registerValue[2] : 0x00) << 8

2
src/DebugServer/Gdb/CommandPackets/ContinueExecution.cpp
View File

@@ -16,7 +16,7 @@ namespace DebugServer::Gdb::CommandPackets
: CommandPacket(rawPacket)
{
if (this->data.size() > 2) {
this->fromAddress = static_cast<Targets::TargetProgramCounter>(
this->fromAddress = static_cast<Targets::TargetMemoryAddress>(
std::stoi(std::string(this->data.begin() + 2, this->data.end()), nullptr, 16)
);
}

2
src/DebugServer/Gdb/CommandPackets/StepExecution.cpp
View File

@@ -17,7 +17,7 @@ namespace DebugServer::Gdb::CommandPackets
: CommandPacket(rawPacket)
{
if (this->data.size() > 2) {
this->fromAddress = static_cast<Targets::TargetProgramCounter>(
this->fromAddress = static_cast<Targets::TargetMemoryAddress>(
std::stoi(std::string(this->data.begin() + 2, this->data.end()), nullptr, 16)
);
}

2
src/DebugServer/Gdb/GdbRspDebugServer.cpp
View File

@@ -370,7 +370,7 @@ namespace DebugServer::Gdb
}
}
void GdbRspDebugServer::handleTargetStoppedGdbResponse(Targets::TargetProgramCounter programAddress) {
void GdbRspDebugServer::handleTargetStoppedGdbResponse(Targets::TargetMemoryAddress programAddress) {
auto* debugSession = this->getActiveDebugSession();
if (debugSession->activeRangeSteppingSession.has_value()) {

2
src/DebugServer/Gdb/GdbRspDebugServer.hpp
View File

@@ -199,7 +199,7 @@ namespace DebugServer::Gdb
*/
void onTargetExecutionResumed(const Events::TargetExecutionResumed&);
virtual void handleTargetStoppedGdbResponse(Targets::TargetProgramCounter programAddress);
virtual void handleTargetStoppedGdbResponse(Targets::TargetMemoryAddress programAddress);
virtual void handleTargetResumedGdbResponse();
};
}

5
src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/EdbgAvr8Interface.cpp
View File

@@ -81,7 +81,6 @@ namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr
using Targets::TargetMemoryBuffer;
using Targets::TargetMemoryAddress;
using Targets::TargetMemorySize;
using Targets::TargetProgramCounter;
using Targets::TargetRegister;
using Targets::TargetRegisterDescriptor;
using Targets::TargetRegisterDescriptors;
@@ -279,7 +278,7 @@ namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr
}
}
TargetProgramCounter EdbgAvr8Interface::getProgramCounter() {
TargetMemoryAddress EdbgAvr8Interface::getProgramCounter() {
if (this->targetState != TargetState::STOPPED) {
this->stop();
}
@@ -295,7 +294,7 @@ namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr
return responseFrame.extractProgramCounter();
}
void EdbgAvr8Interface::setProgramCounter(TargetProgramCounter programCounter) {
void EdbgAvr8Interface::setProgramCounter(TargetMemoryAddress programCounter) {
if (this->targetState != TargetState::STOPPED) {
this->stop();
}

4
src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/EdbgAvr8Interface.hpp
View File

@@ -142,7 +142,7 @@ namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr
*
* @return
*/
Targets::TargetProgramCounter getProgramCounter() override;
Targets::TargetMemoryAddress getProgramCounter() override;
/**
* Issues the "PC Write" command to the debug tool, setting the program counter on the target.
@@ -150,7 +150,7 @@ namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr
* @param programCounter
* The byte address to set as the program counter.
*/
void setProgramCounter(Targets::TargetProgramCounter programCounter) override;
void setProgramCounter(Targets::TargetMemoryAddress programCounter) override;
/**
* Issues the "Get ID" command to the debug tool, to extract the signature from the target.

4
src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AVR8Generic/GetProgramCounter.hpp
View File

@@ -17,7 +17,7 @@ namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::ResponseFrames::Avr8
: Avr8GenericResponseFrame(avrResponses)
{}
Targets::TargetProgramCounter extractProgramCounter() const {
Targets::TargetMemoryAddress extractProgramCounter() const {
/*
* The payload for the PC Read command should always consist of six bytes. Thr first two being the
* command ID and version, the other four being the PC. The four PC bytes are little-endian.
@@ -27,7 +27,7 @@ namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::ResponseFrames::Avr8
"frame - unexpected payload size.");
}
return static_cast<Targets::TargetProgramCounter>(
return static_cast<Targets::TargetMemoryAddress>(
this->payload[5] << 24 | this->payload[4] << 16 | this->payload[3] << 8 | this->payload[2]
) * 2;
}

4
src/DebugToolDrivers/TargetInterfaces/Microchip/AVR/AVR8/Avr8DebugInterface.hpp
View File

@@ -133,14 +133,14 @@ namespace DebugToolDrivers::TargetInterfaces::Microchip::Avr::Avr8
*
* @return
*/
virtual Targets::TargetProgramCounter getProgramCounter() = 0;
virtual Targets::TargetMemoryAddress getProgramCounter() = 0;
/**
* Should update the program counter value on the target.
*
* @param programCounter
*/
virtual void setProgramCounter(Targets::TargetProgramCounter programCounter) = 0;
virtual void setProgramCounter(Targets::TargetMemoryAddress programCounter) = 0;
/**
* Should read the requested registers from the target.

4
src/EventManager/Events/TargetExecutionStopped.hpp
View File

@@ -16,10 +16,10 @@ namespace Events
static constexpr EventType type = EventType::TARGET_EXECUTION_STOPPED;
static const inline std::string name = "TargetExecutionStopped";
Targets::TargetProgramCounter programCounter;
Targets::TargetMemoryAddress programCounter;
Targets::TargetBreakCause breakCause;
TargetExecutionStopped(Targets::TargetProgramCounter programCounter, Targets::TargetBreakCause breakCause)
TargetExecutionStopped(Targets::TargetMemoryAddress programCounter, Targets::TargetBreakCause breakCause)
: programCounter(programCounter)
, breakCause(breakCause)
{}

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

@@ -22,7 +22,7 @@ public:
};
signals:
void programCounterRead(Targets::TargetProgramCounter programCounter);
void programCounterRead(Targets::TargetMemoryAddress programCounter);
protected:
void run(Services::TargetControllerService& targetControllerService) override;

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

5
src/Services/TargetControllerService.cpp
View File

@@ -64,7 +64,6 @@ namespace Services
using Targets::TargetMemorySize;
using Targets::TargetMemoryAddressRange;
using Targets::TargetMemoryBuffer;
using Targets::TargetProgramCounter;
using Targets::TargetStackPointer;
using Targets::TargetBreakpoint;
@@ -237,7 +236,7 @@ namespace Services
);
}
TargetProgramCounter TargetControllerService::getProgramCounter() const {
TargetMemoryAddress TargetControllerService::getProgramCounter() const {
return this->commandManager.sendCommandAndWaitForResponse(
std::make_unique<GetTargetProgramCounter>(),
this->defaultTimeout,
@@ -245,7 +244,7 @@ namespace Services
)->programCounter;
}
void TargetControllerService::setProgramCounter(TargetProgramCounter address) const {
void TargetControllerService::setProgramCounter(TargetMemoryAddress address) const {
this->commandManager.sendCommandAndWaitForResponse(
std::make_unique<SetTargetProgramCounter>(address),
this->defaultTimeout,

4
src/Services/TargetControllerService.hpp
View File

@@ -165,14 +165,14 @@ namespace Services
*
* @return
*/
Targets::TargetProgramCounter getProgramCounter() const;
Targets::TargetMemoryAddress getProgramCounter() const;
/**
* Sets the target's program counter to the given address.
*
* @param address
*/
void setProgramCounter(Targets::TargetProgramCounter address) const;
void setProgramCounter(Targets::TargetMemoryAddress address) const;
/**
* Retrieves the pin states for a particular target variant.

4
src/TargetController/Commands/SetTargetProgramCounter.hpp
View File

@@ -14,9 +14,9 @@ namespace TargetController::Commands
static constexpr CommandType type = CommandType::SET_TARGET_PROGRAM_COUNTER;
static const inline std::string name = "SetTargetProgramCounter";
Targets::TargetProgramCounter address = 0;
Targets::TargetMemoryAddress address = 0;
explicit SetTargetProgramCounter(Targets::TargetProgramCounter address)
explicit SetTargetProgramCounter(Targets::TargetMemoryAddress address)
: address(address)
{};

4
src/TargetController/Commands/StepTargetExecution.hpp
View File

@@ -14,10 +14,10 @@ namespace TargetController::Commands
static constexpr CommandType type = CommandType::STEP_TARGET_EXECUTION;
static const inline std::string name = "StepTargetExecution";
std::optional<Targets::TargetProgramCounter> fromProgramCounter;
std::optional<Targets::TargetMemoryAddress> fromProgramCounter;
StepTargetExecution() = default;
explicit StepTargetExecution(Targets::TargetProgramCounter fromProgramCounter)
explicit StepTargetExecution(Targets::TargetMemoryAddress fromProgramCounter)
: fromProgramCounter(fromProgramCounter)
{};

4
src/TargetController/Responses/TargetProgramCounter.hpp
View File

@@ -13,9 +13,9 @@ namespace TargetController::Responses
public:
static constexpr ResponseType type = ResponseType::TARGET_PROGRAM_COUNTER;
Targets::TargetProgramCounter programCounter;
Targets::TargetMemoryAddress programCounter;
explicit TargetProgramCounter(Targets::TargetProgramCounter programCounter)
explicit TargetProgramCounter(Targets::TargetMemoryAddress programCounter)
: programCounter(programCounter)
{}

12
src/Targets/Microchip/AVR/AVR8/Avr8.hpp
View File

@@ -59,11 +59,11 @@ namespace Targets::Microchip::Avr::Avr8Bit
void step() override;
void reset() override;
void setSoftwareBreakpoint(TargetProgramCounter address) override;
void removeSoftwareBreakpoint(TargetProgramCounter address) override;
void setSoftwareBreakpoint(TargetMemoryAddress address) override;
void removeSoftwareBreakpoint(TargetMemoryAddress address) override;
void setHardwareBreakpoint(TargetProgramCounter address) override;
void removeHardwareBreakpoint(TargetProgramCounter address) override;
void setHardwareBreakpoint(TargetMemoryAddress address) override;
void removeHardwareBreakpoint(TargetMemoryAddress address) override;
void clearAllBreakpoints() override;
void writeRegisters(TargetRegisters registers) override;
@@ -84,8 +84,8 @@ namespace Targets::Microchip::Avr::Avr8Bit
TargetState getState() override;
TargetProgramCounter getProgramCounter() override;
void setProgramCounter(TargetProgramCounter programCounter) override;
TargetMemoryAddress getProgramCounter() override;
void setProgramCounter(TargetMemoryAddress programCounter) override;
TargetStackPointer getStackPointer() override;

4
src/Targets/Target.hpp
View File

@@ -210,14 +210,14 @@ namespace Targets
*
* @return
*/
virtual TargetProgramCounter getProgramCounter() = 0;
virtual TargetMemoryAddress getProgramCounter() = 0;
/**
* Should update the program counter on the target.
*
* @param programCounter
*/
virtual void setProgramCounter(TargetProgramCounter programCounter) = 0;
virtual void setProgramCounter(TargetMemoryAddress programCounter) = 0;
/**
* Should fetch the current stack pointer value.

1
src/Targets/TargetMemory.hpp
View File

@@ -9,7 +9,6 @@ namespace Targets
{
using TargetMemoryAddress = std::uint32_t;
using TargetMemorySize = std::uint32_t;
using TargetProgramCounter = TargetMemoryAddress;
using TargetStackPointer = TargetMemoryAddress;
using TargetMemoryBuffer = std::vector<unsigned char>;