Merge remote-tracking branch 'origin/dev-sid' into bdunahu

1 files changed, 21 insertions, 1 deletions

diff --git a/src/sim/mm.cc b/src/sim/mm.cc
index 2b73207..cd85056 100644
--- a/src/sim/mm.cc
+++ b/src/sim/mm.cc
@@ -6,4 +6,24 @@
 
 MM::MM(Stage *stage) : Stage(stage) { this->id = MEM; } 
 
-void MM::advance_helper() {}
+void MM::advance_helper() {
+	Response r;
+	signed int data;
+	if(this->curr_instr){
+		if (this->curr_instr->get_mnemonic() == LOAD) {
+			r = this->storage->read_word(this->id, this->curr_instr->get_s1(), data);
+			if(r == OK){
+				this->status = OK;
+				this->curr_instr->set_s2(data);
+			}
+		} else if (this->curr_instr->get_mnemonic() == STORE) {
+			r = this->storage->write_word(this->id, this->curr_instr->get_s2(), this->curr_instr->get_s1());
+			if(r == OK){
+				this->status = OK;
+			}
+		} else {
+			// Mem has no work so just forward the instruction to WB
+			this->status = OK;
+		}
+	} 
+}