X-Git-Url: http://git.joshuawise.com/firearm.git/blobdiff_plain/149bcd1aae858c157cb51b351187c66a99410d6d..73e0b1b169d00c94c7538eb612780b09aa8f3b9c:/Issue.v

diff --git a/Issue.v b/Issue.v
index ef53bc3..7b281a3 100644
--- a/Issue.v
+++ b/Issue.v
@@ -282,7 +282,7 @@ module Issue(
 		waiting_cpsr = use_cpsr & (cpsr_inflight[0] | cpsr_inflight[1]);
 		waiting_regs = |(use_regs & (regs_inflight[0] | regs_inflight[1]));
 		
-		outstall = (waiting && !inbubble) || stall;	/* Happens in an always @*, because it is an exception. */
+		outstall = ((waiting && !inbubble) || stall) && !flush;	/* Happens in an always @*, because it is an exception. */
 	end
 	
 	/* Actually do the issue. */
@@ -297,6 +297,7 @@ module Issue(
 			cpsr_inflight[1] = 1'b0;
 			regs_inflight[0] = 16'b0;
 			regs_inflight[1] = 16'b0;
+			outbubble <= 1'b1;
 		end
 		else if (!stall)
 		begin
@@ -305,7 +306,7 @@ module Issue(
 			regs_inflight[0] <= regs_inflight[1];
 			regs_inflight[1] <= (waiting || inbubble || !condition_met) ? 0 : def_regs;
 			
-			outbubble <= inbubble | waiting | !condition_met | flush;
+			outbubble <= inbubble | waiting | !condition_met;
 			outpc <= inpc;
 			outinsn <= insn;
 		end