WCH RISC-V software breakpoints, and a few other bits of refactoring/tidying

src/DebugServer/Gdb/RiscVGdb/CommandPackets/RemoveBreakpoint.cpp

@@ -0,0 +1,76 @@
+#include "RemoveBreakpoint.hpp"
+
+#include <string>
+
+#include "src/DebugServer/Gdb/ResponsePackets/OkResponsePacket.hpp"
+#include "src/DebugServer/Gdb/ResponsePackets/EmptyResponsePacket.hpp"
+#include "src/DebugServer/Gdb/ResponsePackets/ErrorResponsePacket.hpp"
+
+#include "src/Targets/TargetBreakpoint.hpp"
+
+#include "src/Services/StringService.hpp"
+
+#include "src/Logger/Logger.hpp"
+#include "src/Exceptions/Exception.hpp"
+
+namespace DebugServer::Gdb::RiscVGdb::CommandPackets
+{
+    using Services::TargetControllerService;
+
+    using ResponsePackets::OkResponsePacket;
+    using ResponsePackets::ErrorResponsePacket;
+    using ResponsePackets::EmptyResponsePacket;
+
+    using ::Exceptions::Exception;
+
+    RemoveBreakpoint::RemoveBreakpoint(const RawPacket& rawPacket)
+        : CommandPacket(rawPacket)
+    {
+        const auto packetString = std::string{this->data.begin(), this->data.end()};
+
+        if (packetString.size() < 6) {
+            throw Exception{"Unexpected RemoveBreakpoint packet size"};
+        }
+
+        this->type = (packetString[1] == '0')
+            ? BreakpointType::SOFTWARE_BREAKPOINT
+            : (packetString[1] == '1') ? BreakpointType::HARDWARE_BREAKPOINT : BreakpointType::UNKNOWN;
+
+        const auto firstCommaPos = packetString.find_first_of(',');
+        const auto secondCommaPos = packetString.find_first_of(',', firstCommaPos + 1);
+        if (firstCommaPos == std::string::npos || secondCommaPos == std::string::npos) {
+            throw Exception{"Invalid RemoveBreakpoint packet"};
+        }
+
+        const auto addressString = packetString.substr(firstCommaPos + 1, secondCommaPos - firstCommaPos - 1);
+        const auto sizeString = packetString.substr(
+            secondCommaPos + 1,
+            packetString.find_first_of(';', secondCommaPos) - secondCommaPos - 1
+        );
+
+        this->address = Services::StringService::toUint32(addressString, 16);
+        this->size = Services::StringService::toUint32(sizeString, 10);
+    }
+
+    void RemoveBreakpoint::handle(
+        DebugSession& debugSession,
+        const RiscVGdbTargetDescriptor& gdbTargetDescriptor,
+        const Targets::TargetDescriptor&,
+        TargetControllerService& targetControllerService
+    ) {
+        Logger::info("Handling RemoveBreakpoint packet");
+
+        try {
+            debugSession.removeExternalBreakpoint(
+                gdbTargetDescriptor.systemAddressSpaceDescriptor,
+                this->address,
+                targetControllerService
+            );
+            debugSession.connection.writePacket(OkResponsePacket{});
+
+        } catch (const Exception& exception) {
+            Logger::error("Failed to remove breakpoint on target - " + exception.getMessage());
+            debugSession.connection.writePacket(ErrorResponsePacket{});
+        }
+    }
+}