From: Joshua Wise <joshua@rebirth.joshuawise.com>
Date: Wed, 14 Jan 2009 07:20:50 +0000 (-0500)
Subject: Execute: Fix outbubble on multiplier so that it remembers to flush, fixing ldm_bonehe... 
X-Git-Url: http://git.joshuawise.com/firearm.git/commitdiff_plain/81a01a2b3225a62f9f0af74e5b2480c51ddbd1fe?ds=sidebyside

Execute: Fix outbubble on multiplier so that it remembers to flush, fixing ldm_bonehead test.
---

diff --git a/Execute.v b/Execute.v
index 66a63e5..ac828a5 100644
--- a/Execute.v
+++ b/Execute.v
@@ -121,8 +121,8 @@ module Execute(
 				mult_in1 = op2 /* Rs */;
 				$display("New MUL instruction");
 			end
-			outstall = stall | ((!prevstall | !mult_done) && !inbubble);
-			next_outbubble = inbubble | !mult_done | !prevstall;
+			outstall = outstall | ((!prevstall | !mult_done) && !inbubble);
+			next_outbubble = next_outbubble | !mult_done | !prevstall;
 			next_outcpsr = insn[20] /* S */ ? {mult_result[31] /* N */, mult_result == 0 /* Z */, 1'b0 /* C */, cpsr[28] /* V */, cpsr[27:0]} : cpsr;
 			next_write_reg = 1;
 			next_write_num = insn[19:16] /* Rd -- why the fuck isn't this the same place as ALU */;