Merge pull request #46 from bdunahu/bdunahu

 Ensure all stages only do work if they are not 'OK' 

1 files changed, 3 insertions, 5 deletions

diff --git a/src/sim/dum.cc b/src/sim/dum.cc
index dd16660..76d4acd 100644
--- a/src/sim/dum.cc
+++ b/src/sim/dum.cc
@@ -9,13 +9,12 @@ DUM::DUM(Stage *stage) : Stage(stage) { this->id = IDLE; }
 
 InstrDTO *DUM::advance(Response p)
 {
-	InstrDTO *r = curr_instr;
+	InstrDTO *r = nullptr;
 
-	this->advance_helper();
-	if (this->status == OK && p == OK) {
+	if (this->curr_instr && p == WAIT) {
 		this->curr_instr->set_time_of(this->id, this->clock_cycle);
 		r = new InstrDTO(*this->curr_instr);
-		delete curr_instr;
+		delete this->curr_instr;
 		curr_instr = nullptr;
 	}
 
@@ -27,5 +26,4 @@ void DUM::advance_helper() {}
 void DUM::set_curr_instr(InstrDTO *d)
 {
 	this->curr_instr = d;
-	this->status = OK;
 }