First part of storage rework (see description)

- Removed response enum.
- Removed messy ostream override, and cli.cc test class
- Removed accessor enum, and instead used unique pointer to identify accessor.
- Simplified storage by removing is_waiting variables.
- Rewrote DRAM and Cache to use Storage constructor.

6 files changed, 88 insertions, 267 deletions

diff --git a/src/accessor.cc b/src/accessor.cc
deleted file mode 100644
index 99347ed..0000000
--- a/src/accessor.cc
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "accessor.h"
-#include <iostream>
-
-std::ostream &operator<<(std::ostream &os, Accessor a)
-{
-	const std::string nameA[] = {
-		"IDLE", "WRITE", "MEM", "EXEC", "DCDE", "FETCH", "L1CACHE", "SIDE",
-	};
-	return os << nameA[a];
-}
diff --git a/src/cache.cc b/src/cache.cc
index 80f59ef..bbb90b4 100644
--- a/src/cache.cc
+++ b/src/cache.cc
@@ -1,21 +1,14 @@
 #include "cache.h"
 #include "definitions.h"
-#include "response.h"
 #include "utils.h"
 #include <bits/stdc++.h>
-#include <iostream>
 #include <iterator>
 
-Cache::Cache(Storage *lower, int delay)
+Cache::Cache(Storage *lower, int delay) : Storage(delay)
 {
-	this->data = new std::vector<std::array<signed int, LINE_SIZE>>;
 	this->data->resize(L1_CACHE_LINES);
-	this->delay = delay;
-	this->is_waiting = false;
 	this->lower = lower;
 	this->meta.fill({-1, -1});
-	this->requester = IDLE;
-	this->wait_time = this->delay;
 }
 
 Cache::~Cache()
@@ -24,18 +17,19 @@ Cache::~Cache()
 	delete this->data;
 }
 
-Response Cache::write_word(Accessor accessor, signed int data, int address)
+int
+Cache::write_word(void *id, signed int data, int address)
 {
-	return process(accessor, address, [&](int index, int offset) {
+	return process(id, address, [&](int index, int offset) {
 		this->data->at(index).at(offset) = data;
 		this->meta[index].at(1) = 1;
 	});
 }
 
-Response Cache::write_line(
-	Accessor accessor, std::array<signed int, LINE_SIZE> data_line, int address)
+int
+Cache::write_line(void *id, std::array<signed int, LINE_SIZE> data_line, int address)
 {
-	return process(accessor, address, [&](int index, int offset) {
+	return process(id, address, [&](int index, int offset) {
 		(void)offset;
 		this->data->at(index) = data_line;
 		this->meta[index].at(1) = 1;
@@ -43,31 +37,28 @@ Response Cache::write_line(
 }
 
 // TODO: tests for multi level cache
-Response Cache::read_line(
-	Accessor accessor,
-	int address,
-	std::array<signed int, LINE_SIZE> &data_line)
+int
+Cache::read_line(void *id, int address, std::array<signed int, LINE_SIZE> &data_line)
 {
-	return process(accessor, address, [&](int index, int offset) {
+	return process(id, address, [&](int index, int offset) {
 		(void)offset;
 		data_line = this->data->at(index);
 	});
 }
 
-Response Cache::read_word(Accessor accessor, int address, signed int &data)
+int
+Cache::read_word(void *id, int address, signed int &data)
 {
-	return process(accessor, address, [&](int index, int offset) {
-		data = this->data->at(index).at(offset);
-	});
+	return process(
+		id, address, [&](int index, int offset) { data = this->data->at(index).at(offset); });
 }
 
-Response Cache::process(
-	Accessor accessor,
-	int address,
-	std::function<void(int index, int offset)> request_handler)
+int
+Cache::process(void *id, int address, std::function<void(int index, int offset)> request_handler)
 {
-	Response r = this->is_access_cleared(accessor, address);
-	if (r == OK) {
+	int r;
+	r = this->is_access_cleared(id, address);
+	if (r) {
 		int tag, index, offset;
 		get_cache_fields(address, &tag, &index, &offset);
 		request_handler(index, offset);
@@ -75,106 +66,64 @@ Response Cache::process(
 	return r;
 }
 
-Response Cache::is_access_cleared(Accessor accessor, int address)
+int
+Cache::is_access_cleared(void *id, int address)
 {
-	Response r;
-	r = WAIT;
 	/* Do this first--then process the first cycle immediately. */
-	if (this->requester == IDLE)
-		this->requester = accessor;
-	if (this->requester == accessor) {
-		handle_miss(address);
-		if (this->is_waiting)
-			r = BLOCKED;
+	if (id == nullptr)
+		throw std::invalid_argument("Accessor cannot be nullptr.");
+	if (this->current_request == nullptr)
+		this->current_request = id;
+	if (this->current_request == id) {
+		if (is_address_missing(address))
+			return 0;
 		else if (this->wait_time == 0) {
-			this->requester = IDLE;
+			this->current_request = nullptr;
 			this->wait_time = delay;
-			r = OK;
+			return 1;
 		} else {
 			--this->wait_time;
 		}
 	}
-	return r;
+	return 0;
 }
 
-void Cache::handle_miss(int expected)
+int
+Cache::is_address_missing(int expected)
 {
-	Response r, q;
-	int tag, index, offset;
+	int r, q, tag, index, offset;
 	std::array<signed int, LINE_SIZE> *actual;
 	std::array<int, 2> *meta;
 
 	get_cache_fields(expected, &tag, &index, &offset);
-	r = OK;
+	r = 0;
 	meta = &this->meta.at(index);
 	actual = &this->data->at(index);
 
 	if (meta->at(0) != tag) {
-		r = WAIT;
-		// address not in cache
+		r = 1;
 		if (meta->at(1) >= 0) {
-			// occupant is dirty
-			// writing line to DRam in case of dirty cache eviction
 			q = this->lower->write_line(
-				L1CACHE, *actual,
-				((index << LINE_SPEC) +
-				 (meta->at(0) << (L1_CACHE_LINE_SPEC + LINE_SPEC))));
-			if (q == OK) {
+				this, *actual,
+				((index << LINE_SPEC) + (meta->at(0) << (L1_CACHE_LINE_SPEC + LINE_SPEC))));
+			if (q) {
 				meta->at(1) = -1;
 			}
 		} else {
-			q = this->lower->read_line(L1CACHE, expected, *actual);
-			if (q == OK) {
+			q = this->lower->read_line(this, expected, *actual);
+			if (q) {
 				meta->at(0) = tag;
 			}
 		}
 	}
 
-	this->is_waiting = (r == OK) ? false : true;
+	return r;
 }
 
-std::array<std::array<int, 2>, L1_CACHE_LINES> Cache::get_meta() const
+std::array<std::array<int, 2>, L1_CACHE_LINES>
+Cache::get_meta() const
 {
 	std::array<std::array<int, 2>, L1_CACHE_LINES> ret;
 	std::copy(std::begin(this->meta), std::end(this->meta), std::begin(ret));
 	return ret;
 }
-
-std::ostream &operator<<(std::ostream &os, const Cache &c)
-{
-	const auto default_flags = std::cout.flags();
-	const auto default_fill = std::cout.fill();
-
-	std::vector<std::array<signed int, LINE_SIZE>> data =
-		c.view(0, L1_CACHE_LINES);
-	std::array<std::array<int, 2>, L1_CACHE_LINES> meta = c.get_meta();
-
-	os << " " << std::setfill(' ') << std::setw(L1_CACHE_LINE_SPEC + 2)
-	   << "INDEX"
-	   << " | " << std::setfill(' ') << std::setw((8 + 3) * 4 - 1) << "DATA"
-	   << " | " << std::setfill(' ')
-	   << std::setw(MEM_LINE_SPEC - L1_CACHE_LINE_SPEC + 2) << "TAG"
-	   << " | D" << std::endl;
-	for (int i = 0; i < L1_CACHE_LINES; ++i) {
-		os << " 0b" << std::setw(L1_CACHE_LINE_SPEC)
-		   << std::bitset<L1_CACHE_LINE_SPEC>(i) << " | ";
-		for (int j = 0; j < LINE_SIZE; ++j) {
-			os << "0x" << std::setfill('0') << std::setw(8) << std::hex
-			   << data.at(i).at(j) << " ";
-		}
-		os << "| 0b" << std::setfill(' ');
-
-		if (meta.at(i)[0] < 0)
-			os << std::setfill('?')
-			   << std::setw(MEM_LINE_SPEC - L1_CACHE_LINE_SPEC) << "";
-		else
-			os << std::bitset<MEM_LINE_SPEC - L1_CACHE_LINE_SPEC>(
-				meta.at(i)[0]);
-
-		os << " | " << (int)(meta.at(i)[0] >= 0) << std::endl;
-	}
-
-	std::cout.flags(default_flags);
-	std::cout.fill(default_fill);
-	return os;
-}
diff --git a/src/dram.cc b/src/dram.cc
index f90f8db..d81e2d2 100644
--- a/src/dram.cc
+++ b/src/dram.cc
@@ -1,63 +1,50 @@
 #include "dram.h"
 #include "definitions.h"
-#include "response.h"
 #include <algorithm>
 #include <bits/stdc++.h>
 #include <bitset>
-#include <iostream>
 #include <iterator>
 #include <utils.h>
 
-Dram::Dram(int delay)
-{
-	this->data = new std::vector<std::array<signed int, LINE_SIZE>>;
-	this->data->resize(MEM_LINES);
-	this->delay = delay;
-	this->is_waiting = false;
-	this->lower = nullptr;
-	this->requester = IDLE;
-	this->wait_time = this->delay;
-}
+Dram::Dram(int delay) : Storage(delay) { this->data->resize(MEM_LINES); }
 
 Dram::~Dram() { delete this->data; }
 
-Response Dram::write_line(
-	Accessor accessor, std::array<signed int, LINE_SIZE> data_line, int address)
+int
+Dram::write_line(void *id, std::array<signed int, LINE_SIZE> data_line, int address)
 {
-	return process(accessor, address, [&](int line, int word) {
+	return process(id, address, [&](int line, int word) {
 		(void)word;
 		this->data->at(line) = data_line;
 	});
 }
 
-Response Dram::write_word(Accessor accessor, signed int data, int address)
+int
+Dram::write_word(void *id, signed int data, int address)
 {
-	return process(accessor, address, [&](int line, int word) {
-		this->data->at(line).at(word) = data;
-	});
+	return process(id, address, [&](int line, int word) { this->data->at(line).at(word) = data; });
 }
 
 // TODO requires testing
-Response Dram::read_line(
-	Accessor accessor,
-	int address,
-	std::array<signed int, LINE_SIZE> &data_line)
+int
+Dram::read_line(void *id, int address, std::array<signed int, LINE_SIZE> &data_line)
 {
-	return process(accessor, address, [&](int line, int word) {
+	return process(id, address, [&](int line, int word) {
 		(void)word;
 		data_line = this->data->at(line);
 	});
 }
 
-Response Dram::read_word(Accessor accessor, int address, signed int &data)
+int
+Dram::read_word(void *id, int address, signed int &data)
 {
-	return process(accessor, address, [&](int line, int word) {
-		data = this->data->at(line).at(word);
-	});
+	return process(id, address, [&](int line, int word) { data = this->data->at(line).at(word); });
 }
 
 // TODO load a file instead and test this method
-void Dram::load(std::vector<signed int> program) {
+void
+Dram::load(std::vector<signed int> program)
+{
 	unsigned long i;
 	for (i = 0; i < program.size(); ++i) {
 		int line, word;
@@ -66,13 +53,12 @@ void Dram::load(std::vector<signed int> program) {
 	}
 }
 
-Response Dram::process(
-	Accessor accessor,
-	int address,
-	std::function<void(int line, int word)> request_handler)
+int
+Dram::process(void *id, int address, std::function<void(int line, int word)> request_handler)
 {
-	Response r = this->is_access_cleared(accessor);
-	if (r == OK) {
+	int r;
+	r = this->is_access_cleared(id);
+	if (r) {
 		int line, word;
 		get_memory_index(address, line, word);
 		request_handler(line, word);
@@ -80,51 +66,22 @@ Response Dram::process(
 	return r;
 }
 
-Response Dram::is_access_cleared(Accessor accessor)
+int
+Dram::is_access_cleared(void *id)
 {
-	Response r;
-	r = WAIT;
 	/* Do this first--then process the first cycle immediately. */
-	if (accessor == SIDE)
-		r = OK;
-	else {
-		if (this->requester == IDLE)
-			this->requester = accessor;
-		if (this->requester == accessor) {
-			if (this->wait_time == 0) {
-				this->requester = IDLE;
-				this->wait_time = delay;
-				r = OK;
-			} else {
-				--this->wait_time;
-			}
-		}
-	}
-	return r;
-}
-
-std::ostream &operator<<(std::ostream &os, const Dram &d)
-{
-	const auto default_flags = std::cout.flags();
-	const auto default_fill = std::cout.fill();
-
-	std::vector<std::array<signed int, LINE_SIZE>> data = d.view(0, MEM_LINES);
-
-	os << " " << std::setfill(' ') << std::setw(MEM_LINE_SPEC + 2 + LINE_SPEC)
-	   << "ADDRESS"
-	   << " | " << std::setfill(' ') << std::setw((8 + 3) * 4 - 1) << "DATA"
-	   << std::endl;
-	for (int i = 0; i < MEM_LINES; ++i) {
-		os << " 0b" << std::setw(MEM_LINE_SPEC + LINE_SPEC) << left
-		   << std::bitset<MEM_LINE_SPEC>(i) << " | ";
-		for (int j = 0; j < LINE_SIZE; ++j) {
-			os << "0x" << std::setfill('0') << std::setw(8) << std::hex
-			   << data.at(i).at(j) << ' ';
+	if (id == nullptr)
+		throw std::invalid_argument("Accessor cannot be nullptr.");
+	if (this->current_request == nullptr)
+		this->current_request = id;
+	if (this->current_request == id) {
+		if (this->wait_time == 0) {
+			this->current_request = nullptr;
+			this->wait_time = delay;
+			return 1;
+		} else {
+			--this->wait_time;
 		}
-		os << std::endl;
 	}
-
-	std::cout.flags(default_flags);
-	std::cout.fill(default_fill);
-	return os;
+	return 0;
 }
diff --git a/src/logger.cc b/src/logger.cc
deleted file mode 100644
index b07e66f..0000000
--- a/src/logger.cc
+++ /dev/null
@@ -1,71 +0,0 @@
-#include "logger.h"
-#include <ctime>
-#include <fstream>
-#include <iostream>
-#include <sstream>
-using namespace std;
-
-LogLevel Logger::level = INFO;
-Logger *Logger::logger_instance;
-
-void Logger::setLevel(LogLevel level) { this->level = level; }
-
-void Logger::log(LogLevel level, const string &message)
-{
-	if (level_to_int(level) > level_to_int(this->level)) {
-		return;
-	}
-
-	time_t now = time(0);
-	tm *timeinfo = localtime(&now);
-	char timestamp[20];
-	strftime(timestamp, sizeof(timestamp), "%Y-%m-%d %H:%M:%S", timeinfo);
-
-	ostringstream logEntry;
-	logEntry << "[" << timestamp << "] " << level_to_string(level) << ": "
-			 << message << endl;
-
-	cout << logEntry.str();
-}
-
-Logger *Logger::getInstance()
-{
-	if (logger_instance == nullptr) {
-		logger_instance = new Logger();
-	}
-	return logger_instance;
-}
-
-string Logger::level_to_string(LogLevel level)
-{
-	switch (level) {
-	case DEBUG:
-		return "DEBUG";
-	case INFO:
-		return "INFO";
-	case WARNING:
-		return "WARNING";
-	case ERROR:
-		return "ERROR";
-	case CRITICAL:
-		return "CRITICAL";
-	default:
-		return "UNKNOWN";
-	}
-}
-
-int Logger::level_to_int(LogLevel level)
-{
-	switch (level) {
-	case DEBUG:
-		return 5;
-	case INFO:
-		return 4;
-	case WARNING:
-		return 3;
-	case ERROR:
-		return 2;
-	default:
-		return 1;
-	}
-}
diff --git a/src/response.cc b/src/response.cc
deleted file mode 100644
index 3d6e439..0000000
--- a/src/response.cc
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "response.h"
-#include <iostream>
-
-std::ostream &operator<<(std::ostream &os, Response r)
-{
-	const std::string nameR[] = {"OK", "WAIT", "BLOCKED", "STALLED"};
-	return os << nameR[r];
-}
diff --git a/src/storage.cc b/src/storage.cc
index fed607b..4ad916b 100644
--- a/src/storage.cc
+++ b/src/storage.cc
@@ -2,15 +2,19 @@
 #include "definitions.h"
 #include <algorithm>
 
+Storage::Storage(int delay) {
+	this->data = new std::vector<std::array<signed int, LINE_SIZE>>;
+	this->delay = delay;
+	this->lower = nullptr;
+	this->current_request = nullptr;
+	this->wait_time = this->delay;
+}
+
 std::vector<std::array<signed int, LINE_SIZE>>
 Storage::view(int base, int lines) const
 {
 	base = (base / LINE_SIZE) * LINE_SIZE;
 	std::vector<std::array<signed int, LINE_SIZE>> ret(lines + 1);
-	std::copy(
-		this->data->begin() + base, this->data->begin() + base + lines,
-		ret.begin());
+	std::copy(this->data->begin() + base, this->data->begin() + base + lines, ret.begin());
 	return ret;
 }
-
-Storage *Storage::get_lower() { return this->lower; }