From 38f6f21627c09a5cc1d075bda853a28165a8ddd3 Mon Sep 17 00:00:00 2001
From: Nav <nav@navnav.me>
Date: Wed, 4 May 2022 19:49:18 +0100
Subject: [PATCH] Renamed DebugSession::targetDescriptor to
 DebugSession::gdbTargetDescriptor

---
 src/DebugServer/Gdb/CommandPackets/ReadRegisters.cpp | 2 +-
 src/DebugServer/Gdb/CommandPackets/WriteRegister.cpp | 4 ++--
 src/DebugServer/Gdb/DebugSession.cpp                 | 2 +-
 src/DebugServer/Gdb/DebugSession.hpp                 | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/DebugServer/Gdb/CommandPackets/ReadRegisters.cpp b/src/DebugServer/Gdb/CommandPackets/ReadRegisters.cpp
index 6d673baf..dbd542b6 100644
--- a/src/DebugServer/Gdb/CommandPackets/ReadRegisters.cpp
+++ b/src/DebugServer/Gdb/CommandPackets/ReadRegisters.cpp
@@ -34,7 +34,7 @@ namespace Bloom::DebugServer::Gdb::CommandPackets
         Logger::debug("Handling ReadRegisters packet");
 
         try {
-            const auto& targetDescriptor = debugSession.targetDescriptor;
+            const auto& targetDescriptor = debugSession.gdbTargetDescriptor;
             auto descriptors = TargetRegisterDescriptors();
 
             if (this->registerNumber.has_value()) {
diff --git a/src/DebugServer/Gdb/CommandPackets/WriteRegister.cpp b/src/DebugServer/Gdb/CommandPackets/WriteRegister.cpp
index 914f846e..6f2a98c7 100644
--- a/src/DebugServer/Gdb/CommandPackets/WriteRegister.cpp
+++ b/src/DebugServer/Gdb/CommandPackets/WriteRegister.cpp
@@ -46,7 +46,7 @@ namespace Bloom::DebugServer::Gdb::CommandPackets
         Logger::debug("Handling WriteRegister packet");
 
         try {
-            auto targetRegisterDescriptor = debugSession.targetDescriptor.getTargetRegisterDescriptorFromNumber(
+            auto targetRegisterDescriptor = debugSession.gdbTargetDescriptor.getTargetRegisterDescriptorFromNumber(
                 this->registerNumber
             );
 
@@ -63,7 +63,7 @@ namespace Bloom::DebugServer::Gdb::CommandPackets
                 }
 
                 if (this->registerValue.size() > targetRegisterDescriptor.size) {
-                    const auto& gdbRegisterDescriptor = debugSession.targetDescriptor.getRegisterDescriptorFromNumber(
+                    const auto& gdbRegisterDescriptor = debugSession.gdbTargetDescriptor.getRegisterDescriptorFromNumber(
                         this->registerNumber
                     );
                     throw Exception("Cannot set value for " + gdbRegisterDescriptor.name
diff --git a/src/DebugServer/Gdb/DebugSession.cpp b/src/DebugServer/Gdb/DebugSession.cpp
index 4a61a367..cd647ee9 100644
--- a/src/DebugServer/Gdb/DebugSession.cpp
+++ b/src/DebugServer/Gdb/DebugSession.cpp
@@ -6,7 +6,7 @@ namespace Bloom::DebugServer::Gdb
 {
     DebugSession::DebugSession(Connection&& connection, const TargetDescriptor& targetDescriptor)
         : connection(std::move(connection))
-        , targetDescriptor(targetDescriptor)
+        , gdbTargetDescriptor(targetDescriptor)
     {}
 
     void DebugSession::terminate() {
diff --git a/src/DebugServer/Gdb/DebugSession.hpp b/src/DebugServer/Gdb/DebugSession.hpp
index 3d78710a..79f32111 100644
--- a/src/DebugServer/Gdb/DebugSession.hpp
+++ b/src/DebugServer/Gdb/DebugSession.hpp
@@ -12,7 +12,7 @@ namespace Bloom::DebugServer::Gdb
     public:
         Connection connection;
 
-        const TargetDescriptor& targetDescriptor;
+        const TargetDescriptor& gdbTargetDescriptor;
 
         /**
          * When the GDB client is waiting for the target to halt, this is set to true so we know when to notify the