Merge pull request #31 from bdunahu/bdunahuer

Remove manual clock advancing / resolution from storage devices

7 files changed, 21 insertions, 95 deletions

diff --git a/inc/storage.h b/inc/storage.h
index b54a6f7..ff1fbcb 100644
--- a/inc/storage.h
+++ b/inc/storage.h
@@ -54,10 +54,6 @@ class Storage
 	 */
 	std::vector<std::array<signed int, LINE_SIZE>>
 	view(int base, int lines) const;
-	/**
-	 * Refreshes the state of this storage device and lower.
-	 */
-	void resolve();
 
 	/**
 	 * Getter for lower attribute.
diff --git a/src/cli/cli.cc b/src/cli/cli.cc
index e25b316..022b266 100644
--- a/src/cli/cli.cc
+++ b/src/cli/cli.cc
@@ -60,11 +60,6 @@ Cli::Cli()
 		return;
 	};
 
-	commands['c'] = [this](std::vector<std::string> args) {
-		clock();
-		return;
-	};
-
 	commands['h'] = [this](std::vector<std::string> args) {
 		help();
 		return;
@@ -85,11 +80,6 @@ void Cli::help()
 		<< "  [p]eek <storage-level> <base> <lines> - side door function that "
 		   "peeks the current status of the entire memory subsystem"
 		<< std::endl
-		<< std::endl
-		<< "  [c]ycle - manually advances the clock" << std::endl
-		<< "  [f]orce - advances the clock until one operation reports "
-		   "completion"
-		<< std::endl
 		<< "  [r]eset - side door function that resets the memory "
 		   "configuration and "
 		   "cycles"
@@ -122,12 +112,6 @@ void Cli::store(Accessor accessor, int data, int address)
 			  << address << std::endl;
 }
 
-void Cli::clock()
-{
-	this->cache->resolve();
-	++this->cycle;
-}
-
 void Cli::reset()
 {
 	this->initialize();
diff --git a/src/storage/cache.cc b/src/storage/cache.cc
index 8acdf08..d96efe2 100644
--- a/src/storage/cache.cc
+++ b/src/storage/cache.cc
@@ -88,7 +88,11 @@ Response Cache::is_access_cleared(Accessor accessor, int address)
 		if (this->is_waiting)
 			r = BLOCKED;
 		else if (this->wait_time == 0) {
+			this->requester = IDLE;
+			this->wait_time = delay;
 			r = OK;
+		} else {
+			--this->wait_time;
 		}
 	}
 	return r;
diff --git a/src/storage/dram.cc b/src/storage/dram.cc
index 2c24b4b..371503d 100644
--- a/src/storage/dram.cc
+++ b/src/storage/dram.cc
@@ -80,9 +80,15 @@ Response Dram::is_access_cleared(Accessor accessor)
 	else {
 		if (this->requester == IDLE)
 			this->requester = accessor;
-		if (this->requester == accessor)
-			if (this->wait_time == 0)
+		if (this->requester == accessor) {
+			if (this->wait_time == 0) {
+				this->requester = IDLE;
+				this->wait_time = delay;
 				r = OK;
+			} else {
+				--this->wait_time;
+			}
+		}
 	}
 	return r;
 }
diff --git a/src/storage/storage.cc b/src/storage/storage.cc
index 8e2e461..fed607b 100644
--- a/src/storage/storage.cc
+++ b/src/storage/storage.cc
@@ -14,15 +14,3 @@ Storage::view(int base, int lines) const
 }
 
 Storage *Storage::get_lower() { return this->lower; }
-
-void Storage::resolve()
-{
-	if (this->lower)
-		this->lower->resolve();
-	if (this->wait_time == 0) {
-		this->requester = IDLE;
-		this->wait_time = delay;
-	} else if (this->requester != IDLE && !this->is_waiting) {
-		--this->wait_time;
-	}
-}
diff --git a/tests/cache.cc b/tests/cache.cc
index d1171d1..c64f00e 100644
--- a/tests/cache.cc
+++ b/tests/cache.cc
@@ -26,8 +26,7 @@ class CacheFixture
 	{
 		for (int i = 0; i < delay; ++i) {
 			Response r = f();
-			this->c->resolve();
-
+			
 			// check response
 			CHECK(r == expected);
 			// check for early modifications
@@ -91,8 +90,7 @@ TEST_CASE_METHOD(
 		CHECK(r == BLOCKED);
 		r = c->write_word(FETCH, w, 0b1);
 		CHECK(r == WAIT);
-		this->c->resolve();
-
+		
 		// check for early modifications
 		actual = c->view(0, 1)[0];
 		REQUIRE(this->expected == this->actual);
@@ -103,8 +101,7 @@ TEST_CASE_METHOD(
 		CHECK(r == WAIT);
 		r = c->write_word(FETCH, w, 0b1);
 		CHECK(r == WAIT);
-		this->c->resolve();
-
+		
 		// check for early modifications
 		actual = c->view(0, 1)[0];
 		REQUIRE(this->expected == this->actual);
@@ -112,11 +109,6 @@ TEST_CASE_METHOD(
 
 	r = c->write_word(MEM, w, 0b0);
 	CHECK(r == OK);
-	// clock cycle did NOT resolve yet!
-	// this fetch should not make progress
-	r = c->write_word(FETCH, w, 0b1);
-	CHECK(r == WAIT);
-	c->resolve();
 
 	actual = d->view(0, 1)[0];
 	// we do NOT write back now!
@@ -133,8 +125,7 @@ TEST_CASE_METHOD(
 
 	r = c->write_word(FETCH, w, 0b1);
 	CHECK(r == OK);
-	c->resolve();
-
+	
 	expected.at(1) = w;
 	actual = c->view(0, 1)[0];
 	REQUIRE(expected == actual);
@@ -162,8 +153,7 @@ TEST_CASE_METHOD(
 
 	r = c->write_word(MEM, w, 0b0);
 	CHECK(r == OK);
-	c->resolve();
-
+	
 	expected.at(0) = w;
 	actual = c->view(0, 1)[0];
 	REQUIRE(expected == actual);
@@ -181,8 +171,7 @@ TEST_CASE_METHOD(
 	// after the fetch, this cache line should be empty
 	this->c->write_word(FETCH, w, 0b10000001);
 	CHECK(r == OK);
-	c->resolve();
-
+	
 	expected.at(0) = 0;
 	actual = c->view(0, 1)[0];
 	CHECK(expected == actual);
diff --git a/tests/dram.cc b/tests/dram.cc
index 3397f74..7329bf2 100644
--- a/tests/dram.cc
+++ b/tests/dram.cc
@@ -24,7 +24,6 @@ class DramFixture
 	{
 		for (int i = 0; i < delay; ++i) {
 			Response r = f();
-			this->d->resolve();
 
 			// check response
 			CHECK(r == expected);
@@ -52,7 +51,6 @@ TEST_CASE_METHOD(DramFixture, "store 0th element in DELAY cycles", "[dram]")
 	});
 
 	r = this->d->write_word(MEM, w, 0x0);
-	this->d->resolve();
 
 	CHECK(r == OK);
 	expected.at(0) = w;
@@ -76,11 +74,6 @@ TEST_CASE_METHOD(
 
 	r = d->write_word(MEM, w, 0x0);
 	REQUIRE(r == OK);
-	// clock cycle did NOT resolve yet!
-	// this fetch should not make progress
-	r = d->write_word(FETCH, w, 0x1);
-	CHECK(r == WAIT);
-	this->d->resolve();
 
 	expected.at(0) = w;
 	actual = d->view(0, 1)[0];
@@ -92,7 +85,6 @@ TEST_CASE_METHOD(
 
 	r = d->write_word(FETCH, w, 0x1);
 	CHECK(r == OK);
-	this->d->resolve();
 
 	actual = d->view(0, 1)[0];
 	expected.at(1) = w;
@@ -113,7 +105,6 @@ TEST_CASE_METHOD(
 		CHECK(r == WAIT);
 		r = this->d->write_word(FETCH, w, 0x1);
 		CHECK(r == WAIT);
-		this->d->resolve();
 
 		// check for early modifications
 		actual = d->view(0, 1)[0];
@@ -122,11 +113,6 @@ TEST_CASE_METHOD(
 
 	r = d->write_word(MEM, w, 0x0);
 	REQUIRE(r == OK);
-	// clock cycle did NOT resolve yet!
-	// this fetch should not make progress
-	r = d->write_word(FETCH, w, 0x1);
-	CHECK(r == WAIT);
-	this->d->resolve();
 
 	expected.at(0) = w;
 	actual = d->view(0, 1)[0];
@@ -138,7 +124,6 @@ TEST_CASE_METHOD(
 
 	r = d->write_word(FETCH, w, 0x1);
 	CHECK(r == OK);
-	this->d->resolve();
 
 	actual = d->view(0, 1)[0];
 	expected.at(1) = w;
@@ -182,11 +167,6 @@ TEST_CASE_METHOD(
 
 	r = this->d->write_line(MEM, buffer, 0x0);
 	REQUIRE(r == OK);
-	// clock cycle did NOT resolve yet!
-	// this fetch should not make progress
-	r = this->d->write_line(FETCH, buffer, 0x1);
-	CHECK(r == WAIT);
-	d->resolve();
 
 	expected = buffer;
 	actual = d->view(0, 1)[0];
@@ -199,7 +179,6 @@ TEST_CASE_METHOD(
 
 	r = this->d->write_line(FETCH, buffer, 0x1);
 	CHECK(r == OK);
-	d->resolve();
 
 	expected = buffer;
 	actual = d->view(0, 1)[0];
@@ -222,7 +201,6 @@ TEST_CASE_METHOD(
 		CHECK(r == WAIT);
 		r = d->write_line(FETCH, buffer, 0x1);
 		CHECK(r == WAIT);
-		this->d->resolve();
 
 		// check for early modifications
 		actual = d->view(0, 1)[0];
@@ -231,11 +209,6 @@ TEST_CASE_METHOD(
 
 	r = d->write_line(MEM, buffer, 0x0);
 	CHECK(r == OK);
-	// clock cycle did NOT resolve yet!
-	// this fetch should not make progress
-	r = d->write_line(FETCH, buffer, 0x01);
-	CHECK(r == WAIT);
-	d->resolve();
 
 	actual = d->view(0, 1)[0];
 	expected = buffer;
@@ -248,7 +221,6 @@ TEST_CASE_METHOD(
 
 	r = this->d->write_line(FETCH, buffer, 0x1);
 	CHECK(r == OK);
-	d->resolve();
 
 	expected = buffer;
 	actual = d->view(0, 1)[0];
@@ -256,7 +228,9 @@ TEST_CASE_METHOD(
 }
 
 TEST_CASE_METHOD(
-	DramFixture, "store line in DELAY cycles, read in DELAY cycles, no conflict", "[dram]")
+	DramFixture,
+	"store line in DELAY cycles, read in DELAY cycles, no conflict",
+	"[dram]")
 {
 	Response r;
 	signed int w;
@@ -269,22 +243,18 @@ TEST_CASE_METHOD(
 	for (i = 0; i < this->delay; ++i) {
 		r = d->write_line(MEM, expected, addr);
 		CHECK(r == WAIT);
-		d->resolve();
 	}
 	r = d->write_line(MEM, expected, addr);
 	CHECK(r == OK);
-	d->resolve();
 
 	for (i = 0; i < this->delay; ++i) {
 		r = d->read_line(MEM, addr, actual);
-		d->resolve();
 
 		CHECK(r == WAIT);
 		REQUIRE(expected != actual);
 	}
 
 	r = d->read_line(MEM, addr, actual);
-	d->resolve();
 
 	CHECK(r == OK);
 	REQUIRE(expected == actual);
@@ -309,25 +279,18 @@ TEST_CASE_METHOD(
 
 		r = d->read_line(FETCH, addr, actual);
 		CHECK(r == WAIT);
-
-		d->resolve();
 	}
 	r = d->write_line(MEM, expected, addr);
 	CHECK(r == OK);
-	r = d->read_line(FETCH, addr, actual);
-	CHECK(r == WAIT);
-	d->resolve();
 
 	for (i = 0; i < this->delay; ++i) {
 		r = d->read_line(MEM, addr, actual);
-		d->resolve();
 
 		CHECK(r == WAIT);
 		REQUIRE(expected != actual);
 	}
 
 	r = d->read_line(MEM, addr, actual);
-	d->resolve();
 
 	CHECK(r == OK);
 	REQUIRE(expected == actual);
@@ -351,11 +314,9 @@ TEST_CASE_METHOD(
 	for (i = 0; i < this->delay; ++i) {
 		r = d->write_line(MEM, expected, addr);
 		CHECK(r == WAIT);
-		d->resolve();
 	}
 	r = d->write_line(MEM, expected, addr);
 	CHECK(r == OK);
-	d->resolve();
 
 	actual = d->view(0, 1)[0];
 	REQUIRE(expected == actual);
@@ -363,13 +324,11 @@ TEST_CASE_METHOD(
 	for (i = 0; i < LINE_SIZE; ++i) {
 		for (j = 0; j < this->delay; ++j) {
 			r = d->read_word(MEM, addr, a);
-			d->resolve();
 
 			CHECK(r == WAIT);
 			REQUIRE(0x0 == a);
 		}
 		r = d->read_word(MEM, addr++, a);
-		d->resolve();
 		CHECK(r == OK);
 		REQUIRE(w++ == a);