X-Git-Url: http://git.joshuawise.com/firearm.git/blobdiff_plain/03cf736e2c85ee881927ceef1fae0542c85077da..e08b748aff686b30f05624c71148ba96893ea56e:/Issue.v

diff --git a/Issue.v b/Issue.v
index 3c8303a..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. */
@@ -290,8 +290,16 @@ module Issue(
 	begin
 		if (waiting)
 			$display("ISSUE: Stalling instruction %08x because %d/%d", insn, waiting_cpsr, waiting_regs);
-	
-		if (!stall)
+
+		if(flush)
+		begin
+			cpsr_inflight[0] = 1'b0;
+			cpsr_inflight[1] = 1'b0;
+			regs_inflight[0] = 16'b0;
+			regs_inflight[1] = 16'b0;
+			outbubble <= 1'b1;
+		end
+		else if (!stall)
 		begin
 			cpsr_inflight[0] <= cpsr_inflight[1];	/* I'm not sure how well selects work with arrays, and that seems like a dumb thing to get anusulated by. */
 			cpsr_inflight[1] <= (waiting || inbubble || !condition_met) ? 0 : def_cpsr;