Only emit a stall if we didn't take a bubble in.

[firearm.git] / Issue.v

diff --git a/Issue.v b/Issue.v
index 628ef0886c193e420ba7f631cd0b5bf7bae2bec9..6b25d3752a044e54e56f77c3c83d7acfc2b0e810 100644 (file)
--- 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