From 64af03c1015918eb3c9c9aa6a6e792dde895846c Mon Sep 17 00:00:00 2001
From: Nav <nav@navnav.me>
Date: Fri, 15 Mar 2024 18:45:48 +0000
Subject: [PATCH] Used target memory aliases in TDF structs

---
 src/Targets/TargetDescription/AddressSpace.hpp        |  9 ++++-----
 src/Targets/TargetDescription/MemorySegment.hpp       |  1 -
 .../TargetDescription/MemorySegmentSection.hpp        | 11 ++++++-----
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/Targets/TargetDescription/AddressSpace.hpp b/src/Targets/TargetDescription/AddressSpace.hpp
index 511e7b49..6d998c94 100644
--- a/src/Targets/TargetDescription/AddressSpace.hpp
+++ b/src/Targets/TargetDescription/AddressSpace.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <cstdint>
 #include <string>
 #include <optional>
 #include <map>
@@ -15,15 +14,15 @@ namespace Targets::TargetDescription
     struct AddressSpace
     {
         std::string key;
-        std::uint32_t startAddress;
-        std::uint32_t size;
+        TargetMemoryAddress startAddress;
+        TargetMemorySize size;
         std::optional<TargetMemoryEndianness> endianness;
         std::map<std::string, MemorySegment, std::less<void>> memorySegmentsByKey;
 
         AddressSpace(
             const std::string& key,
-            std::uint32_t startAddress,
-            std::uint32_t size,
+            TargetMemoryAddress startAddress,
+            TargetMemorySize size,
             const std::optional<TargetMemoryEndianness>& endianness,
             const std::map<std::string, MemorySegment, std::less<void>>& memorySegmentsByKey
         )
diff --git a/src/Targets/TargetDescription/MemorySegment.hpp b/src/Targets/TargetDescription/MemorySegment.hpp
index f2747d48..8e62a839 100644
--- a/src/Targets/TargetDescription/MemorySegment.hpp
+++ b/src/Targets/TargetDescription/MemorySegment.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <cstdint>
 #include <optional>
 
 #include "src/Targets/TargetMemorySegmentType.hpp"
diff --git a/src/Targets/TargetDescription/MemorySegmentSection.hpp b/src/Targets/TargetDescription/MemorySegmentSection.hpp
index cc5226c2..7565c9f5 100644
--- a/src/Targets/TargetDescription/MemorySegmentSection.hpp
+++ b/src/Targets/TargetDescription/MemorySegmentSection.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <cstdint>
 #include <string>
 #include <map>
 #include <optional>
@@ -8,6 +7,8 @@
 #include <functional>
 #include <ranges>
 
+#include "src/Targets/TargetMemory.hpp"
+
 #include "src/Services/StringService.hpp"
 #include "Exceptions/InvalidTargetDescriptionDataException.hpp"
 
@@ -17,15 +18,15 @@ namespace Targets::TargetDescription
     {
         std::string key;
         std::string name;
-        std::uint32_t startAddress;
-        std::uint32_t size;
+        TargetMemoryAddress startAddress;
+        TargetMemorySize size;
         std::map<std::string, MemorySegmentSection, std::less<void>> subSectionsByKey;
 
         MemorySegmentSection(
             const std::string& key,
             const std::string& name,
-            std::uint32_t startAddress,
-            std::uint32_t size,
+            TargetMemoryAddress startAddress,
+            TargetMemorySize size,
             const std::map<std::string, MemorySegmentSection, std::less<void>>& subSectionsByKey
         )
             : key(key)