diff --git a/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/Parameters/AVR8Generic/DebugWireJtagParameters.cpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/Parameters/AVR8Generic/DebugWireJtagParameters.cpp index f6a846d2..75fee3c6 100644 --- a/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/Parameters/AVR8Generic/DebugWireJtagParameters.cpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/Parameters/AVR8Generic/DebugWireJtagParameters.cpp @@ -57,9 +57,11 @@ namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::Parameters::Avr8Gen this->eearAddressLow = static_cast(eearlDescriptor.startAddress); /* - * Some debugWire targets only have a single-byte `EEARL` register. In the absence of an `EEARH` register, - * and if there is no high byte in the `EEARL` register, the `eearAddressHigh` parameter should be equal - * to the `eearAddressLow` parameter, as stated in the "EDBG-based Tools Protocols" document. + * Some debugWire targets only have a single-byte `EEARL` register. + * + * In the absence of an `EEARH` register, and if there is no high byte in the `EEARL` register, the + * `eearAddressHigh` parameter should be equal to the `eearAddressLow` parameter, as stated in the + * "EDBG-based Tools Protocols" document. */ const auto eearhDescriptor = eepromRegisterGroupDescriptor.tryGetRegisterDescriptor("eearh"); this->eearAddressHigh = static_cast( diff --git a/src/Targets/RiscV/DebugModule/Registers/AbstractCommandRegister.hpp b/src/Targets/RiscV/DebugModule/Registers/AbstractCommandRegister.hpp index cf5bc888..86108965 100644 --- a/src/Targets/RiscV/DebugModule/Registers/AbstractCommandRegister.hpp +++ b/src/Targets/RiscV/DebugModule/Registers/AbstractCommandRegister.hpp @@ -26,7 +26,7 @@ namespace Targets::RiscV::DebugModule::Registers , commandType(static_cast((registerValue >> 24) & 0xFF)) {} - constexpr RegisterValue value() const { + [[nodiscard]] constexpr RegisterValue value() const { assert(this->control <= 0x00FFFFFF); return RegisterValue{0} diff --git a/src/Targets/RiscV/DebugModule/Registers/AbstractControlStatusRegister.hpp b/src/Targets/RiscV/DebugModule/Registers/AbstractControlStatusRegister.hpp index b352b0ea..f3af9e9a 100644 --- a/src/Targets/RiscV/DebugModule/Registers/AbstractControlStatusRegister.hpp +++ b/src/Targets/RiscV/DebugModule/Registers/AbstractControlStatusRegister.hpp @@ -35,7 +35,7 @@ namespace Targets::RiscV::DebugModule::Registers , programBufferSize(static_cast((registerValue >> 24) & 0x1F)) {} - constexpr RegisterValue value() const { + [[nodiscard]] constexpr RegisterValue value() const { return RegisterValue{0} | static_cast(this->dataCount) | static_cast(this->commandError) << 8 diff --git a/src/Targets/RiscV/DebugModule/Registers/ControlRegister.hpp b/src/Targets/RiscV/DebugModule/Registers/ControlRegister.hpp index 7bcec051..1bd4da23 100644 --- a/src/Targets/RiscV/DebugModule/Registers/ControlRegister.hpp +++ b/src/Targets/RiscV/DebugModule/Registers/ControlRegister.hpp @@ -47,7 +47,7 @@ namespace Targets::RiscV::DebugModule::Registers , haltRequest(static_cast(registerValue & static_cast(0x01 << 31))) {} - constexpr RegisterValue value() const { + [[nodiscard]] constexpr RegisterValue value() const { assert(this->selectedHartIndex <= 0xFFFFF); return RegisterValue{0} diff --git a/src/Targets/RiscV/DebugModule/Registers/MemoryAccessControlField.hpp b/src/Targets/RiscV/DebugModule/Registers/MemoryAccessControlField.hpp index ce504ad7..6d984ef6 100644 --- a/src/Targets/RiscV/DebugModule/Registers/MemoryAccessControlField.hpp +++ b/src/Targets/RiscV/DebugModule/Registers/MemoryAccessControlField.hpp @@ -43,7 +43,7 @@ namespace Targets::RiscV::DebugModule::Registers , virtualAddress(static_cast(controlValue & (0x01 << 23))) {} - constexpr std::uint32_t value() const { + [[nodiscard]] constexpr std::uint32_t value() const { return std::uint32_t{0} | static_cast(this->write) << 16 | static_cast(this->postIncrement) << 19 diff --git a/src/Targets/RiscV/DebugModule/Registers/RegisterAccessControlField.hpp b/src/Targets/RiscV/DebugModule/Registers/RegisterAccessControlField.hpp index cad3dbb4..d29f6781 100644 --- a/src/Targets/RiscV/DebugModule/Registers/RegisterAccessControlField.hpp +++ b/src/Targets/RiscV/DebugModule/Registers/RegisterAccessControlField.hpp @@ -22,8 +22,6 @@ namespace Targets::RiscV::DebugModule::Registers bool postIncrement:1 = false; RegisterSize size:3 = RegisterSize::SIZE_32; - RegisterAccessControlField() = default; - RegisterAccessControlField( RegisterNumber registerNumber, bool write, @@ -49,7 +47,7 @@ namespace Targets::RiscV::DebugModule::Registers , size(static_cast((controlValue >> 20) & 0x07)) {} - constexpr std::uint32_t value() const { + [[nodiscard]] constexpr std::uint32_t value() const { return std::uint32_t{0} | static_cast(this->registerNumber) | static_cast(this->write) << 16 diff --git a/src/Targets/RiscV/DebugModule/Registers/StatusRegister.hpp b/src/Targets/RiscV/DebugModule/Registers/StatusRegister.hpp index 8917fbbd..277d06df 100644 --- a/src/Targets/RiscV/DebugModule/Registers/StatusRegister.hpp +++ b/src/Targets/RiscV/DebugModule/Registers/StatusRegister.hpp @@ -52,7 +52,7 @@ namespace Targets::RiscV::DebugModule::Registers , ndmResetPending(static_cast(registerValue & (0x01 << 24))) {} - constexpr RegisterValue value() const { + [[nodiscard]] constexpr RegisterValue value() const { return RegisterValue{0} | static_cast(this->version) | static_cast(this->validConfigStructurePointer) << 4