X-Git-Url: http://git.joshuawise.com/firearm.git/blobdiff_plain/09e28f01bc93c7e5f280dbef0be909dfffad07c8..a221c031dbfe61723a0313763dcd124acc49c455:/Issue.v

diff --git a/Issue.v b/Issue.v
index 628ef08..6b25d37 100644
--- a/Issue.v
+++ b/Issue.v
@@ -264,6 +264,14 @@ module Issue(
 	reg waiting_regs;
 	wire waiting = waiting_cpsr | waiting_regs;
 	
+	initial
+	begin
+		cpsr_inflight[0] = 0;
+		cpsr_inflight[1] = 0;
+		regs_inflight[0] = 0;
+		regs_inflight[1] = 0;
+	end
+		
 	always @(*)
 	begin
 		waiting_cpsr = use_cpsr & (cpsr_inflight[0] | cpsr_inflight[1]);
@@ -281,6 +289,6 @@ module Issue(
 		outbubble <= inbubble | waiting | !condition_met;
 		outpc <= inpc;
 		outinsn <= insn;
-		outstall <= waiting;
+		outstall <= waiting && !inbubble;
 	end
 endmodule