Merge remote-tracking branch 'origin/master' into bdunahu

4 files changed, 147 insertions, 18 deletions

diff --git a/src/cli/cli.cc b/src/cli/cli.cc
index c9f83e9..d90edef 100644
--- a/src/cli/cli.cc
+++ b/src/cli/cli.cc
@@ -115,7 +115,7 @@ void Cli::load(Accessor accessor, int address)
 
 void Cli::store(Accessor accessor, int data, int address)
 {
-	Response r = this->cache->write(accessor, data, address);
+	Response r = this->cache->write_word(accessor, data, address);
 	std::cout << r << " to " << accessor << " storing " << data << " in "
 			  << address << std::endl;
 }
diff --git a/src/storage/cache.cc b/src/storage/cache.cc
index ddab551..a73390b 100644
--- a/src/storage/cache.cc
+++ b/src/storage/cache.cc
@@ -25,7 +25,7 @@ Cache::~Cache()
 	delete this->data;
 }
 
-Response Cache::write(Accessor accessor, signed int data, int address)
+Response Cache::write_word(Accessor accessor, signed int data, int address)
 {
 	Response r = WAIT;
 
@@ -49,10 +49,71 @@ Response Cache::write(Accessor accessor, signed int data, int address)
 	return r;
 }
 
-Response Cache::read(
-	Accessor accessor, int address, std::array<signed int, LINE_SIZE> &data)
+Response Cache::write_line(
+	Accessor accessor, std::array<signed int, LINE_SIZE> data_line, int address)
 {
-	return WAIT;
+	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_line(
+	Accessor accessor,
+	int address,
+	std::array<signed int, LINE_SIZE> &data_line)
+{
+	Response r = WAIT;
+	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);
+			data_line = this->data->at(index);
+			r = OK;
+		}
+	}
+	return r;
+}
+
+Response Cache::read_word(Accessor accessor, int address, signed int &data)
+{
+	Response r = WAIT;
+	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);
+			data = this->data->at(index).at(offset);
+			r = OK;
+		}
+	}
+	return r;
 }
 
 void Cache::fetch_resource(int expected)
@@ -64,19 +125,24 @@ void Cache::fetch_resource(int expected)
 
 	get_bit_fields(expected, &tag, &index, &offset);
 	meta = &this->meta.at(index);
+	actual = this->data->at(index);
 
 	if (meta->at(0) != tag) {
 		// address not in cache
 		if (meta->at(1) >= 0) {
 			// occupant is dirty
-			// TODO
-			r = WAIT;
+			// writing line to DRam in case of dirty cache eviction
+			r = this->lower->write_line(
+				L1CACHE, actual,
+				((index << LINE_SPEC) +
+				 (meta->at(0) << (L1_CACHE_SPEC + LINE_SPEC))));
+			if (r == OK) {
+				meta->at(1) = -1;
+			}
 		} else {
-			actual = this->data->at(index);
-			r = this->lower->read(L1CACHE, expected, actual);
+			r = this->lower->read_line(L1CACHE, expected, actual);
 			if (r == OK) {
 				meta->at(0) = tag;
-				meta->at(1) = -1;
 			}
 		}
 	}
diff --git a/src/storage/dram.cc b/src/storage/dram.cc
index 8513147..c244da5 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,7 +28,50 @@ void Dram::do_write(signed data, int address)
 	this->data->at(line).at(word) = data;
 }
 
-Response Dram::write(Accessor accessor, signed int data, int address)
+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::do_read_word(signed int &data, int address)
+{
+	int line = address / LINE_SIZE;
+	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;
+}
+
+Response Dram::write_word(Accessor accessor, signed int data, int address)
 {
 	Response r = WAIT;
 
@@ -51,14 +94,27 @@ Response Dram::write(Accessor accessor, signed int data, int address)
 	return r;
 }
 
-void Dram::do_read(std::array<signed int, LINE_SIZE> &data_line, int address)
+Response Dram::read_line(
+	Accessor accessor,
+	int address,
+	std::array<signed int, LINE_SIZE> &data_line)
 {
-	int line = address / LINE_SIZE;
-	data_line = this->data->at(line);
+	Response r = WAIT;
+
+	if (this->requester == IDLE)
+		this->requester = accessor;
+
+	if (this->requester == accessor) {
+		if (this->wait_time == 0) {
+			this->do_read(data_line, address);
+			r = OK;
+		}
+	}
+
+	return r;
 }
 
-Response Dram::read(
-	Accessor accessor, int address, std::array<signed int, LINE_SIZE> &data)
+Response Dram::read_word(Accessor accessor, int address, signed int &data)
 {
 	Response r = WAIT;
 
@@ -67,7 +123,7 @@ Response Dram::read(
 
 	if (this->requester == accessor) {
 		if (this->wait_time == 0) {
-			this->do_read(data, address);
+			this->do_read_word(data, address);
 			r = OK;
 		}
 	}
diff --git a/src/utils/utils.cc b/src/utils/utils.cc
index 3a99cec..b5a4d55 100644
--- a/src/utils/utils.cc
+++ b/src/utils/utils.cc
@@ -28,3 +28,10 @@ const std::string string_format(const char *const zcFormat, ...)
 	va_end(vaArgs);
 	return std::string(zc.data(), iLen);
 }
+
+int wrap_address(int address) {
+	if (address < 0){
+		return ((address % MEM_SIZE) + MEM_SIZE) % MEM_SIZE;
+	}
+	return address % MEM_SIZE;
+}