summaryrefslogtreecommitdiff
path: root/inc
diff options
context:
space:
mode:
Diffstat (limited to 'inc')
-rw-r--r--inc/definitions.h5
-rw-r--r--inc/dram.h9
-rw-r--r--inc/storage.h9
3 files changed, 9 insertions, 14 deletions
diff --git a/inc/definitions.h b/inc/definitions.h
index 8513361..a9077b2 100644
--- a/inc/definitions.h
+++ b/inc/definitions.h
@@ -31,11 +31,6 @@
#define MEM_DELAY 3
/**
- * The total number of cycles a level one cache access takes
- */
-#define L1_CACHE_DELAY 0
-
-/**
* Return the N least-significant bits from integer K using a bit mask
* @param the integer to be parsed
* @param the number of bits to be parsed
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: