From c962c5e4ca0d0faae6aba6c0f1a4bbcccc526699 Mon Sep 17 00:00:00 2001
From: Nav <nav@navnav.me>
Date: Sun, 26 Nov 2023 15:58:28 +0000
Subject: [PATCH] Tidying

---
 src/Targets/RiscV/RiscV.cpp | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/Targets/RiscV/RiscV.cpp b/src/Targets/RiscV/RiscV.cpp
index b9818e54..0da31ce0 100644
--- a/src/Targets/RiscV/RiscV.cpp
+++ b/src/Targets/RiscV/RiscV.cpp
@@ -293,21 +293,15 @@ namespace Targets::RiscV
         TargetMemorySize bytes,
         const std::set<TargetMemoryAddressRange>& excludedAddressRanges
     ) {
+        using DebugModule::Registers::MemoryAccessControlField;
+
         // TODO: excluded addresses
 
         const auto pageSize = 4;
         if ((startAddress % pageSize) != 0 || (bytes % pageSize) != 0) {
             // Alignment required
-            const auto alignedStartAddress = static_cast<TargetMemoryAddress>(
-                std::floor(static_cast<float>(startAddress) / static_cast<float>(pageSize)) * pageSize
-            );
-
-            const auto alignedBytes = static_cast<TargetMemorySize>(
-                std::ceil(
-                    static_cast<float>(bytes + (startAddress - alignedStartAddress))
-                        / static_cast<float>(pageSize)
-                ) * pageSize
-            );
+            const auto alignedStartAddress = this->alignMemoryAddress(startAddress, pageSize);
+            const auto alignedBytes = this->alignMemorySize(bytes + (startAddress - alignedStartAddress), pageSize);
 
             auto memoryBuffer = this->readMemory(
                 memoryType,
@@ -325,8 +319,6 @@ namespace Targets::RiscV
             return output;
         }
 
-        using DebugModule::Registers::MemoryAccessControlField;
-
         auto output = TargetMemoryBuffer();
         output.reserve(bytes);