Merge pull request #14 from bdunahu/bdunahuer

Storage.view + Dram.store methods, tests

3 files changed, 68 insertions, 15 deletions

diff --git a/src/storage/cache.cc b/src/storage/cache.cc
index 34bdc5f..bbefb2a 100644
--- a/src/storage/cache.cc
+++ b/src/storage/cache.cc
@@ -1,8 +1,11 @@
-#include <cache.h>
+#include "cache.h"
+#include "definitions.h"
+#include "response.h"
+#include <bits/stdc++.h>
 
 Cache::Cache(int lines, Storage *lower, int delay)
 {
-	this->data = new std::vector<std::array<unsigned int, 4>>;
+	this->data = new std::vector<std::array<signed int, LINE_SIZE>>;
 	this->data->resize(lines);
 	this->lower = lower;
 	this->delay = delay;
@@ -11,11 +14,9 @@ Cache::Cache(int lines, Storage *lower, int delay)
 
 Cache::~Cache() { delete this->data; }
 
-Response *Cache::write(Accessor accessor, signed int data, int address)
+Response Cache::write(Accessor accessor, signed int data, int address)
 {
-	return new Response();
+	return WAIT;
 }
 
-Response *Cache::read(Accessor accessor, int address) { return nullptr; }
-
-int **Cache::view(int base, int lines) { return nullptr; }
+Response Cache::read(Accessor accessor, int address) { return WAIT; }
diff --git a/src/storage/dram.cc b/src/storage/dram.cc
index 20858cd..7db5676 100644
--- a/src/storage/dram.cc
+++ b/src/storage/dram.cc
@@ -1,21 +1,41 @@
-#include <dram.h>
-#include <response.h>
+#include "dram.h"
+#include "definitions.h"
+#include "response.h"
+#include <algorithm>
 
 Dram::Dram(int lines, int delay)
 {
-	this->data = new std::vector<std::array<unsigned int, 4>>;
+	this->data = new std::vector<std::array<signed int, LINE_SIZE>>;
 	this->data->resize(lines);
 	this->delay = delay;
+	this->wait_time = this->delay;
 	this->lower = nullptr;
+	this->requester = IDLE;
 }
 
 Dram::~Dram() { delete this->data; }
 
-Response *Dram::write(Accessor accessor, signed int data, int address)
+Response Dram::write(Accessor accessor, signed int data, int address)
 {
-	return new Response();
-}
+	Response r = WAIT;
+
+	if (accessor == SIDE) {
+		this->do_write(data, address);
+		r = OK;
+	} else {
+		/* Do this first--then process the first cycle immediately. */
+		if (this->requester == IDLE)
+			this->requester = accessor;
 
-Response *Dram::read(Accessor accessor, int address) { return nullptr; }
+		if (this->requester == accessor) {
+			if (this->wait_time == 0) {
+				this->do_write(data, address);
+				r = OK;
+			}
+		}
+	}
+
+	return r;
+}
 
-int **Dram::view(int base, int lines) { return nullptr; }
+Response Dram::read(Accessor accessor, int address) { return WAIT; }
diff --git a/src/storage/storage.cc b/src/storage/storage.cc
new file mode 100644
index 0000000..e3067a2
--- /dev/null
+++ b/src/storage/storage.cc
@@ -0,0 +1,32 @@
+#include "storage.h"
+#include "definitions.h"
+#include <algorithm>
+
+std::vector<std::array<signed int, LINE_SIZE>>
+Storage::view(int base, int lines)
+{
+	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());
+	return ret;
+}
+
+void Storage::do_write(signed data, int address)
+{
+	int line = address / LINE_SIZE;
+	int word = address % LINE_SIZE;
+
+	this->data->at(line).at(word) = data;
+}
+
+void Storage::resolve()
+{
+	if (this->wait_time == 0) {
+		this->requester = IDLE;
+		this->wait_time = delay;
+	} else if (this->requester != IDLE) {
+		--this->wait_time;
+	}
+}