From 2fc639fb148cb891971accabb6266a9d93ec3a36 Mon Sep 17 00:00:00 2001 From: Nav Date: Sat, 25 Nov 2023 07:44:50 +0000 Subject: [PATCH] Tidying --- src/Targets/Microchip/AVR/AVR8/Avr8.cpp | 8 ++++---- src/Targets/Microchip/AVR/AVR8/Avr8.hpp | 2 +- src/Targets/RiscV/RiscV.hpp | 2 +- src/Targets/Target.hpp | 14 +++++++------- src/Targets/TargetRegister.hpp | 6 +++++- 5 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/Targets/Microchip/AVR/AVR8/Avr8.cpp b/src/Targets/Microchip/AVR/AVR8/Avr8.cpp index 47e832ad..67331f71 100644 --- a/src/Targets/Microchip/AVR/AVR8/Avr8.cpp +++ b/src/Targets/Microchip/AVR/AVR8/Avr8.cpp @@ -330,14 +330,14 @@ namespace Targets::Microchip::Avr::Avr8Bit this->avr8DebugInterface->clearAllBreakpoints(); } - void Avr8::writeRegisters(TargetRegisters registers) { - this->avr8DebugInterface->writeRegisters(registers); - } - TargetRegisters Avr8::readRegisters(const Targets::TargetRegisterDescriptorIds& descriptorIds) { return this->avr8DebugInterface->readRegisters(descriptorIds); } + void Avr8::writeRegisters(const TargetRegisters& registers) { + this->avr8DebugInterface->writeRegisters(registers); + } + TargetMemoryBuffer Avr8::readMemory( TargetMemoryType memoryType, std::uint32_t startAddress, diff --git a/src/Targets/Microchip/AVR/AVR8/Avr8.hpp b/src/Targets/Microchip/AVR/AVR8/Avr8.hpp index 4e0060e5..af592789 100644 --- a/src/Targets/Microchip/AVR/AVR8/Avr8.hpp +++ b/src/Targets/Microchip/AVR/AVR8/Avr8.hpp @@ -66,7 +66,7 @@ namespace Targets::Microchip::Avr::Avr8Bit void removeHardwareBreakpoint(TargetMemoryAddress address) override; void clearAllBreakpoints() override; - void writeRegisters(TargetRegisters registers) override; + void writeRegisters(const TargetRegisters& registers) override; TargetRegisters readRegisters(const Targets::TargetRegisterDescriptorIds& descriptorIds) override; TargetMemoryBuffer readMemory( diff --git a/src/Targets/RiscV/RiscV.hpp b/src/Targets/RiscV/RiscV.hpp index 02f67d17..70df14ed 100644 --- a/src/Targets/RiscV/RiscV.hpp +++ b/src/Targets/RiscV/RiscV.hpp @@ -62,8 +62,8 @@ namespace Targets::RiscV void removeHardwareBreakpoint(TargetMemoryAddress address) override; void clearAllBreakpoints() override; - void writeRegisters(TargetRegisters registers) override; TargetRegisters readRegisters(const Targets::TargetRegisterDescriptorIds& descriptorIds) override; + void writeRegisters(const TargetRegisters& registers) override; TargetMemoryBuffer readMemory( TargetMemoryType memoryType, diff --git a/src/Targets/Target.hpp b/src/Targets/Target.hpp index 647045c4..290c4a38 100644 --- a/src/Targets/Target.hpp +++ b/src/Targets/Target.hpp @@ -145,13 +145,6 @@ namespace Targets */ virtual void clearAllBreakpoints() = 0; - /** - * Should update the value of the given registers. - * - * @param registers - */ - virtual void writeRegisters(TargetRegisters registers) = 0; - /** * Should read register values of the registers described by the given descriptors. * @@ -161,6 +154,13 @@ namespace Targets */ virtual TargetRegisters readRegisters(const Targets::TargetRegisterDescriptorIds& descriptorIds) = 0; + /** + * Should update the value of the given registers. + * + * @param registers + */ + virtual void writeRegisters(const TargetRegisters& registers) = 0; + /** * Should read memory from the target. * diff --git a/src/Targets/TargetRegister.hpp b/src/Targets/TargetRegister.hpp index f7f4be3b..eb45a059 100644 --- a/src/Targets/TargetRegister.hpp +++ b/src/Targets/TargetRegister.hpp @@ -103,9 +103,13 @@ namespace Targets struct TargetRegister { TargetRegisterDescriptorId descriptorId; + + /** + * Register values should be in MSB form + */ TargetMemoryBuffer value; - TargetRegister(TargetRegisterDescriptorId descriptorId, std::vector value) + TargetRegister(TargetRegisterDescriptorId descriptorId, TargetMemoryBuffer value) : descriptorId(descriptorId) , value(std::move(value)) {};