From 2235e18ad81be4ed7097cd9cab93e35a990ec327 Mon Sep 17 00:00:00 2001 From: bd Date: Mon, 31 Mar 2025 23:49:13 -0400 Subject: Partial commit before merge --- src/sim/stage.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/sim/stage.cc') diff --git a/src/sim/stage.cc b/src/sim/stage.cc index 5b81e4c..11eb822 100644 --- a/src/sim/stage.cc +++ b/src/sim/stage.cc @@ -34,8 +34,9 @@ InstrDTO *Stage::advance(Response p) InstrDTO *r = nullptr; Response n; - this->advance_helper(); - if (this->curr_instr != nullptr && p == OK) { + if (this->curr_instr && this->status != OK) + this->advance_helper(); + if (this->curr_instr && p == OK) { // mutual consent this->curr_instr->set_time_of(this->id, this->clock_cycle); r = new InstrDTO(*this->curr_instr); -- cgit v1.2.3