Delete some more storage-only files

3 files changed, 1 insertions, 142 deletions

diff --git a/inc/definitions.h b/inc/definitions.h
deleted file mode 100644
index c81c4e3..0000000
--- a/inc/definitions.h
+++ /dev/null
@@ -1,102 +0,0 @@
-#ifndef DEFINITIONS_H
-#define DEFINITIONS_H
-#include "logger.h"
-#include <cmath>
-
-/**
- * The number of bits to specify a word in a line
- */
-#define LINE_SPEC 2
-/**
- * The total number of words in a line
- */
-#define LINE_SIZE static_cast<int>(pow(2, 2))
-/**
- * Number of bits in a word
- */
-#define WORD_SPEC 32
-
-/**
- * The number of bits to specify a memory word
- * The number of bits to specify a memory line
- * The total number of lines in memory
- */
-#define MEM_WORD_SPEC 10
-#define MEM_LINE_SPEC static_cast<unsigned int>(MEM_WORD_SPEC - LINE_SPEC)
-#define MEM_WORDS static_cast<int>(pow(2, MEM_WORD_SPEC))
-#define MEM_LINES static_cast<int>(pow(2, MEM_LINE_SPEC))
-
-/**
- * The number of bits to specify a l1 cache word
- * The number of bits to specify a l1 cache line
- * The total number of lines in l1 cache
- */
-#define L1_CACHE_WORD_SPEC 7
-#define L1_CACHE_LINE_SPEC                                                     \
-	static_cast<unsigned int>(L1_CACHE_WORD_SPEC - LINE_SPEC)
-#define L1_CACHE_LINES static_cast<int>(pow(2, L1_CACHE_LINE_SPEC))
-
-/**
- * The total number of cycles a memory access takes
- */
-#define MEM_DELAY 3
-
-/**
- * The total number of cycles a level one cache access takes
- */
-#define L1_CACHE_DELAY 0
-
-/**
- * The number of general purpose registers
- */
-#define GPR_NUM 16
-
-/**
- * The number of vector registers
- */
-#define V_NUM 8
-
-/**
- * The number of bits to specify an instruction type
- */
-#define TYPE_SIZE 2
-
-/**
- * The number of bits to specify a register
- */
-#define REG_SIZE 5
-
-/**
- * The number of bits to specify an R-Type opcode.
- */
-#define R_OPCODE_SIZE 5
-
-/**
- * The number of bits to specify an opcode.
- */
-#define OPCODE_SIZE 4
-
-/**
- * The maximum value an integer can hold.
- * The minimum is always this number plus one negated.
- */
-#define MAX_INT 2147483647
-
-/**
- * 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
- * @return the N least-significant bits from K
- */
-#define GET_LS_BITS(k, n) ((k) & ((1 << (n)) - 1))
-/**
- * Return the bits from integer K starting at N and ending at M using a bit
- * mask
- * @param the integer to be parsed
- * @param the index of the starting bit to be parsed
- * @param the index of the ending bit to be parsed
- * @return a section of bits from K
- */
-#define GET_MID_BITS(k, m, n) GET_LS_BITS((k) >> (m), ((n) - (m)))
-
-#endif /* DEFINITIONS_H_INCLUDED */
diff --git a/inc/stage.h b/inc/stage.h
index 51ab667..da33075 100644
--- a/inc/stage.h
+++ b/inc/stage.h
@@ -1,8 +1,8 @@
 #ifndef STAGE_H
 #define STAGE_H
 #include "accessor.h"
-#include "definitions.h"
 #include "instrDTO.h"
+#include "pipe_spec.h"
 #include "response.h"
 #include "storage.h"
 #include <array>
diff --git a/inc/utils.h b/inc/utils.h
deleted file mode 100644
index a375b68..0000000
--- a/inc/utils.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef UTILS_H
-#define UTILS_H
-#include <string>
-
-/**
- * Parse an address into a tag, index into the cache table, and a line
- * offset.
- * @param the address to be parsed
- * @param the resulting tag
- * @param the resulting index
- * @param the resulting offset
- */
-void get_cache_fields(int address, int *tag, int *index, int *offset);
-
-/**
- * Formats a string using snprintf.
- * @param an object that represents the format string
- * @param arguments to be formatted
- * @return a string object holding the formatted result
- */
-const std::string string_format(const char *const zcFormat, ...);
-
-/**
- * Given `address`, returns an address that is within the current memory size
- * using a clean wrap.
- * @param an address
- * @return an address guaranteed to be within range.
- */
-int wrap_address(int address);
-
-/**
- * Given `address`, returns the line and word it is in.
- * @param an address
- * @param the line (row) `address` is in
- * @param the word (column) `address` corresponds to
- */
-void get_memory_index(int address, int &line, int &word);
-
-#endif /* UTILS_H_INCLUDED */