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

1 files changed, 10 insertions, 1 deletions

diff --git a/src/sim/mm.cc b/src/sim/mm.cc
index a9a60c2..a02ca83 100644
--- a/src/sim/mm.cc
+++ b/src/sim/mm.cc
@@ -21,8 +21,8 @@ void MM::advance_helper()
 			this->status = STALLED;
 		break;
 
+	case PUSH:
 	case STORE:
-		// TODO signed issues, we aren't wrapping addresses
 		i = this->storage->write_word(
 			this, this->curr_instr->get_s2(), this->curr_instr->get_s1());
 		this->status = i ? OK : STALLED;
@@ -31,6 +31,15 @@ void MM::advance_helper()
 		}
 		break;
 
+	case POP:
+		i = this->storage->read_word(this, this->curr_instr->get_s3(), data);
+		this->status = i ? OK : STALLED;
+		if (this->status == OK) {
+			this->curr_instr->set_s3(data);
+		} else
+			this->status = STALLED;
+		break;
+
 	default:
 		this->status = OK;
 	}