support for reading word, writing line to storage, dirty cache eviction, cache load

2 files changed, 78 insertions, 6 deletions

diff --git a/src/storage/cache.cc b/src/storage/cache.cc
index 66603e2..08699ed 100644
--- a/src/storage/cache.cc
+++ b/src/storage/cache.cc
@@ -49,8 +49,32 @@ Response Cache::write(Accessor accessor, signed int data, int address)
 	return r;
 }
 
+Response Cache::write_line(Accessor accessor, std::array<signed int, LINE_SIZE> data_line, int address)
+{
+	Response r = WAIT;
+
+	/* Do this first--then process the first cycle immediately. */
+	if (this->requester == IDLE)
+		this->requester = accessor;
+
+	if (this->requester == accessor) {
+		fetch_resource(address);
+		if (this->is_waiting)
+			r = BLOCKED;
+		else if (this->wait_time == 0) {
+			int tag, index, offset;
+			get_bit_fields(address, &tag, &index, &offset);
+			this->data->at(index) = data_line;
+			this->meta[index].at(1) = 1;
+			r = OK;
+		}
+	}
+
+	return r;
+}
+
 // TODO: tests for multi level cache
-Response Cache::read(Accessor accessor, int address, std::array<signed int, LINE_SIZE> &data)
+Response Cache::read(Accessor accessor, int address, std::array<signed int, LINE_SIZE> &data_line)
 {
 	Response r = WAIT;
 	if (this->requester == IDLE)
@@ -62,7 +86,7 @@ Response Cache::read(Accessor accessor, int address, std::array<signed int, LINE
 		else if (this->wait_time == 0) {
 			int tag, index, offset;
 			get_bit_fields(address, &tag, &index, &offset);
-			data = this->data->at(index);
+			data_line = this->data->at(index);
 			r = OK;
 		}
 	}
@@ -81,7 +105,7 @@ Response Cache::read_word(Accessor accessor, int address, signed int &data)
 		else if (this->wait_time == 0) {
 			int tag, index, offset;
 			get_bit_fields(address, &tag, &index, &offset);
-			data = this->data->at(index)->at(offset);
+			data = this->data->at(index).at(offset);
 			r = OK;
 		}
 	}
diff --git a/src/storage/dram.cc b/src/storage/dram.cc
index 290d38b..be360a4 100644
--- a/src/storage/dram.cc
+++ b/src/storage/dram.cc
@@ -20,7 +20,7 @@ Dram::Dram(int lines, int delay)
 
 Dram::~Dram() { delete this->data; }
 
-void Dram::do_write(signed data, int address)
+void Dram::do_write(signed int data, int address)
 {
 	int line = address / LINE_SIZE;
 	int word = address % LINE_SIZE;
@@ -28,15 +28,46 @@ void Dram::do_write(signed data, int address)
 	this->data->at(line).at(word) = data;
 }
 
+void Dram::do_write_line(std::array<signed int, LINE_SIZE> data_line, int address){
+	int line = address / LINE_SIZE;
+	this->data->at(line) = data_line;
+}
+
 void Dram::do_read(std::array<signed int, LINE_SIZE> &data_line, int address)
 {
 	int line = address / LINE_SIZE;
 	data_line = this->data->at(line);
 }
 
-void Dram::write_line(std::array<signed int, LINE_SIZE> data_line, int address){
+void Dram::do_read_word(signed int &data, int address)
+{
 	int line = address / LINE_SIZE;
-	this->data->at(line) = data_line;
+	int word = address % LINE_SIZE;
+	data = this->data->at(line).at(word);
+}
+
+
+
+Response Dram::write_line(Accessor accessor, std::array<signed int, LINE_SIZE> data_line, int address)
+{
+	Response r = WAIT;
+
+	if (accessor == SIDE) {
+		this->do_write_line(data_line, address);
+		r = OK;
+	} else {
+		/* Do this first--then process the first cycle immediately. */
+		if (this->requester == IDLE)
+			this->requester = accessor;
+
+		if (this->requester == accessor) {
+			if (this->wait_time == 0) {
+				this->do_write_line(data_line, address);
+				r = OK;
+			}
+		}
+	}
+	return r;
 }
 
 
@@ -79,6 +110,22 @@ Response Dram::read(Accessor accessor, int address, std::array<signed int, LINE_
 	return r;
 }
 
+Response Dram::read_word(Accessor accessor, int address, signed int& data) { 
+	Response r = WAIT;
+
+	if (this->requester == IDLE)
+		this->requester = accessor;
+
+	if (this->requester == accessor) {
+		if (this->wait_time == 0) {
+			this->do_read_word(data, address);
+			r = OK;
+		}
+	}
+
+	return r;
+}
+
 std::ostream &operator<<(std::ostream &os, const Dram &d)
 {
 	const auto default_flags = std::cout.flags();
@@ -102,3 +149,4 @@ std::ostream &operator<<(std::ostream &os, const Dram &d)
 	std::cout.fill(default_fill);
 	return os;
 }
+