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

Renamed RiscVDebugInterface::clearAllBreakpoints() in preparation for separating HW breakpoints from SW breakpoints.

Browse Source
This commit is contained in:
Nav
2024-10-07 20:02:39 +01:00
parent 607a344107
commit 248c51acc8
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugTranslator.cpp
View File

@@ -103,7 +103,7 @@ namespace DebugToolDrivers::Protocols::RiscVDebugSpec
if (!this->triggerDescriptorsByIndex.empty()) { if (!this->triggerDescriptorsByIndex.empty()) {
// Clear any left-over triggers from the previous debug session // Clear any left-over triggers from the previous debug session
this->clearAllBreakpoints(); this->clearAllHardwareBreakpoints();
} }
auto debugControlStatusRegister = this->readDebugControlStatusRegister(); auto debugControlStatusRegister = this->readDebugControlStatusRegister();
@@ -300,7 +300,7 @@ namespace DebugToolDrivers::Protocols::RiscVDebugSpec
this->allocatedTriggerIndices.erase(triggerDescriptor.index); this->allocatedTriggerIndices.erase(triggerDescriptor.index);
} }
void DebugTranslator::clearAllBreakpoints() { void DebugTranslator::clearAllHardwareBreakpoints() {
// To ensure that any untracked breakpoints are cleared, we clear all triggers on the target. // To ensure that any untracked breakpoints are cleared, we clear all triggers on the target.
for (const auto [triggerIndex, triggerDescriptor] : this->triggerDescriptorsByIndex) { for (const auto [triggerIndex, triggerDescriptor] : this->triggerDescriptorsByIndex) {
this->clearTrigger(triggerDescriptor); this->clearTrigger(triggerDescriptor);

2
src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugTranslator.hpp
View File

@@ -66,7 +66,7 @@ namespace DebugToolDrivers::Protocols::RiscVDebugSpec
std::uint16_t getHardwareBreakpointCount() override; std::uint16_t getHardwareBreakpointCount() override;
void setHardwareBreakpoint(Targets::TargetMemoryAddress address) override; void setHardwareBreakpoint(Targets::TargetMemoryAddress address) override;
void clearHardwareBreakpoint(Targets::TargetMemoryAddress address) override; void clearHardwareBreakpoint(Targets::TargetMemoryAddress address) override;
void clearAllBreakpoints() override; void clearAllHardwareBreakpoints() override;
Targets::TargetRegisterDescriptorAndValuePairs readCpuRegisters( Targets::TargetRegisterDescriptorAndValuePairs readCpuRegisters(
const Targets::TargetRegisterDescriptors& descriptors const Targets::TargetRegisterDescriptors& descriptors

2
src/DebugToolDrivers/TargetInterfaces/RiscV/RiscVDebugInterface.hpp
View File

@@ -34,7 +34,7 @@ namespace DebugToolDrivers::TargetInterfaces::RiscV
virtual std::uint16_t getHardwareBreakpointCount() = 0; virtual std::uint16_t getHardwareBreakpointCount() = 0;
virtual void setHardwareBreakpoint(Targets::TargetMemoryAddress address) = 0; virtual void setHardwareBreakpoint(Targets::TargetMemoryAddress address) = 0;
virtual void clearHardwareBreakpoint(Targets::TargetMemoryAddress address) = 0; virtual void clearHardwareBreakpoint(Targets::TargetMemoryAddress address) = 0;
virtual void clearAllBreakpoints() = 0; virtual void clearAllHardwareBreakpoints() = 0;
virtual Targets::TargetRegisterDescriptorAndValuePairs readCpuRegisters( virtual Targets::TargetRegisterDescriptorAndValuePairs readCpuRegisters(
const Targets::TargetRegisterDescriptors& descriptors const Targets::TargetRegisterDescriptors& descriptors

2
src/Targets/RiscV/RiscV.cpp
View File

@@ -150,7 +150,7 @@ namespace Targets::RiscV
} }
void RiscV::clearAllBreakpoints() { void RiscV::clearAllBreakpoints() {
this->riscVDebugInterface->clearAllBreakpoints(); this->riscVDebugInterface->clearAllHardwareBreakpoints();
} }
TargetRegisterDescriptorAndValuePairs RiscV::readRegisters(const TargetRegisterDescriptors& descriptors) { TargetRegisterDescriptorAndValuePairs RiscV::readRegisters(const TargetRegisterDescriptors& descriptors) {