Wrap all addresses immediately

3 files changed, 10 insertions, 9 deletions

diff --git a/inc/dram.h b/inc/dram.h
index 2a4e358..847642d 100644
--- a/inc/dram.h
+++ b/inc/dram.h
@@ -5,15 +5,6 @@
 #include <functional>
 #include <ostream>
 
-// clang-format off
-/**
- * Ensures address is within the current memory size using a clean wrap.
- * @param an address
- */
-#define WRAP_ADDRESS(a) \
-  ((a < 0) ? ((a % MEM_WORDS) + MEM_WORDS) % MEM_WORDS : a % MEM_WORDS)
-// clang-format on
-
 class Dram : public Storage
 {
   public:
diff --git a/inc/storage.h b/inc/storage.h
index 1bf5805..994bb8f 100644
--- a/inc/storage.h
+++ b/inc/storage.h
@@ -7,6 +7,15 @@
 #include <map>
 #include <vector>
 
+// clang-format off
+/**
+ * Ensures address is within the current memory size using a clean wrap.
+ * @param an address
+ */
+#define WRAP_ADDRESS(a) \
+  ((a < 0) ? ((a % MEM_WORDS) + MEM_WORDS) % MEM_WORDS : a % MEM_WORDS)
+// clang-format on
+
 class Storage
 {
   public:
diff --git a/src/cache.cc b/src/cache.cc
index a2d4525..c934a26 100644
--- a/src/cache.cc
+++ b/src/cache.cc
@@ -62,6 +62,7 @@ Cache::read_word(void *id, int address, signed int &data)
 int
 Cache::process(void *id, int address, std::function<void(int index, int offset)> request_handler)
 {
+	address = WRAP_ADDRESS(address);
 	if (!preprocess(id) || priming_address(address) || !this->is_data_ready())
 		return 0;