From 06b6c4460ba0d7d09aa12c0ac8ed76281b0dcc9b Mon Sep 17 00:00:00 2001
From: Nav <nav@navnav.me>
Date: Sat, 1 Apr 2023 12:40:12 +0100
Subject: [PATCH] Tidying

---
 .../CMSIS-DAP/VendorSpecific/EDBG/AVR/EdbgAvr8Interface.cpp     | 2 +-
 .../CMSIS-DAP/VendorSpecific/EDBG/AVR/EdbgAvr8Interface.hpp     | 2 +-
 .../TargetInterfaces/Microchip/AVR/AVR8/Avr8DebugInterface.hpp  | 2 +-
 src/Services/TargetControllerService.cpp                        | 2 +-
 src/Services/TargetControllerService.hpp                        | 2 +-
 src/SignalHandler/SignalHandler.cpp                             | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/EdbgAvr8Interface.cpp b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/EdbgAvr8Interface.cpp
index 5f3b997b..4488d103 100644
--- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/EdbgAvr8Interface.cpp
+++ b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/EdbgAvr8Interface.cpp
@@ -208,7 +208,7 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr
         this->targetState = TargetState::RUNNING;
     }
 
-    void EdbgAvr8Interface::runTo(TargetProgramCounter address) {
+    void EdbgAvr8Interface::runTo(TargetMemoryAddress address) {
         this->clearEvents();
         const auto responseFrame = this->edbgInterface->sendAvrCommandFrameAndWaitForResponseFrame(
             RunTo(address)
diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/EdbgAvr8Interface.hpp b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/EdbgAvr8Interface.hpp
index 81f7a216..40a38aeb 100644
--- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/EdbgAvr8Interface.hpp
+++ b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/EdbgAvr8Interface.hpp
@@ -127,7 +127,7 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr
          * @param address
          *  The (byte) address to run to.
          */
-        void runTo(Targets::TargetProgramCounter address) override;
+        void runTo(Targets::TargetMemoryAddress address) override;
 
         /**
          * Issues the "step" command to the debug tool, stepping the execution on the target. The stepping can be
diff --git a/src/DebugToolDrivers/TargetInterfaces/Microchip/AVR/AVR8/Avr8DebugInterface.hpp b/src/DebugToolDrivers/TargetInterfaces/Microchip/AVR/AVR8/Avr8DebugInterface.hpp
index 4629213b..8e4c154c 100644
--- a/src/DebugToolDrivers/TargetInterfaces/Microchip/AVR/AVR8/Avr8DebugInterface.hpp
+++ b/src/DebugToolDrivers/TargetInterfaces/Microchip/AVR/AVR8/Avr8DebugInterface.hpp
@@ -81,7 +81,7 @@ namespace Bloom::DebugToolDrivers::TargetInterfaces::Microchip::Avr::Avr8
         /**
          * Continue execution up to a specific byte address.
          */
-        virtual void runTo(Targets::TargetProgramCounter address) = 0;
+        virtual void runTo(Targets::TargetMemoryAddress address) = 0;
 
         /**
          * Step execution on teh AVR8 target.
diff --git a/src/Services/TargetControllerService.cpp b/src/Services/TargetControllerService.cpp
index 3a474d67..03bbc62b 100644
--- a/src/Services/TargetControllerService.cpp
+++ b/src/Services/TargetControllerService.cpp
@@ -146,7 +146,7 @@ namespace Bloom::Services
         );
     }
 
-    void TargetControllerService::stepTargetExecution(std::optional<TargetProgramCounter> fromAddress) const {
+    void TargetControllerService::stepTargetExecution(std::optional<TargetMemoryAddress> fromAddress) const {
         auto stepExecutionCommand = std::make_unique<StepTargetExecution>();
 
         if (fromAddress.has_value()) {
diff --git a/src/Services/TargetControllerService.hpp b/src/Services/TargetControllerService.hpp
index 80544ddc..2ab7596e 100644
--- a/src/Services/TargetControllerService.hpp
+++ b/src/Services/TargetControllerService.hpp
@@ -93,7 +93,7 @@ namespace Bloom::Services
          *
          * @param fromAddress
          */
-        void stepTargetExecution(std::optional<Targets::TargetProgramCounter> fromAddress) const;
+        void stepTargetExecution(std::optional<Targets::TargetMemoryAddress> fromAddress) const;
 
         /**
          * Requests the TargetController to read register values from the target.
diff --git a/src/SignalHandler/SignalHandler.cpp b/src/SignalHandler/SignalHandler.cpp
index 76ee14b9..dd7fe5d5 100644
--- a/src/SignalHandler/SignalHandler.cpp
+++ b/src/SignalHandler/SignalHandler.cpp
@@ -19,7 +19,7 @@ namespace Bloom
                 if (::sigwait(&signalSet, &signalNumber) == 0) {
                     Logger::debug("SIGNAL " + std::to_string(signalNumber) + " received");
 
-                    const auto handlerIt = this->handlersBySignalNum.find(signalNumber);
+                    const auto& handlerIt = this->handlersBySignalNum.find(signalNumber);
                     if (handlerIt != this->handlersBySignalNum.end()) {
                         // We have a registered handler for this signal.
                         handlerIt->second();