From 1051954333abfe4d9abd5f4abf6f440a7725c13a Mon Sep 17 00:00:00 2001
From: Nav <nav@navnav.me>
Date: Sat, 25 Dec 2021 20:57:34 +0000
Subject: [PATCH] Updated ReadTargetMemory insight worker task to accept
 excluded address ranges

---
 .../InsightWorker/Tasks/ReadTargetMemory.cpp        |  7 ++++++-
 .../InsightWorker/Tasks/ReadTargetMemory.hpp        | 13 +++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/Insight/InsightWorker/Tasks/ReadTargetMemory.cpp b/src/Insight/InsightWorker/Tasks/ReadTargetMemory.cpp
index c45d2d50..af9fae23 100644
--- a/src/Insight/InsightWorker/Tasks/ReadTargetMemory.cpp
+++ b/src/Insight/InsightWorker/Tasks/ReadTargetMemory.cpp
@@ -4,6 +4,11 @@ using namespace Bloom;
 
 void ReadTargetMemory::run(TargetControllerConsole& targetControllerConsole) {
     emit this->targetMemoryRead(
-        targetControllerConsole.readMemory(this->memoryType, this->startAddress, this->size)
+        targetControllerConsole.readMemory(
+            this->memoryType,
+            this->startAddress,
+            this->size,
+            this->excludedAddressRanges
+        )
     );
 }
diff --git a/src/Insight/InsightWorker/Tasks/ReadTargetMemory.hpp b/src/Insight/InsightWorker/Tasks/ReadTargetMemory.hpp
index 0bb11a93..b759b5ef 100644
--- a/src/Insight/InsightWorker/Tasks/ReadTargetMemory.hpp
+++ b/src/Insight/InsightWorker/Tasks/ReadTargetMemory.hpp
@@ -13,8 +13,16 @@ namespace Bloom
         Q_OBJECT
 
     public:
-        ReadTargetMemory(Targets::TargetMemoryType memoryType, std::uint32_t startAddress, std::uint32_t size):
-        InsightWorkerTask(), memoryType(memoryType), startAddress(startAddress), size(size) {}
+        ReadTargetMemory(
+            Targets::TargetMemoryType memoryType,
+            std::uint32_t startAddress,
+            std::uint32_t size,
+            const std::set<Targets::TargetMemoryAddressRange>& excludedAddressRanges = {}
+        ):
+            memoryType(memoryType),
+            startAddress(startAddress),
+            size(size),
+            excludedAddressRanges(excludedAddressRanges) {}
 
     signals:
         void targetMemoryRead(Targets::TargetMemoryBuffer buffer);
@@ -26,5 +34,6 @@ namespace Bloom
         Targets::TargetMemoryType memoryType;
         std::uint32_t startAddress;
         std::uint32_t size;
+        std::set<Targets::TargetMemoryAddressRange> excludedAddressRanges;
     };
 }