execute: do stuff only if bubble, still incorrect

[firearm.git] / Execute.v

diff --git a/Execute.v b/Execute.v
index cefc4ef00d2c0d23535f938e3c3e91494764e25b..4e3f44f818de983db8e1080e077e1156dbdfe463 100644 (file)
--- a/Execute.v
+++ b/Execute.v
@@ -163,13 +163,15 @@ module Execute(
                begin end
                `DECODE_BRANCH:
                begin
                begin end
                `DECODE_BRANCH:
                begin

-                       jmppc = pc + op0 + 32'h8;
-                       if(insn[24]) begin
-                               next_write_reg = 1;
-                               next_write_num = 4'hE; /* link register */
-                               next_write_data = pc + 32'h4;
+                       if(!prevstall && !inbubble) begin
+                               jmppc = pc + op0 + 32'h8;
+                               if(insn[24]) begin
+                                       next_write_reg = 1;
+                                       next_write_num = 4'hE; /* link register */
+                                       next_write_data = pc + 32'h4;
+                               end
+                               jmp = 1'b1;

                        end
                        end

-                       jmp = 1'b1;

                end                     /* Branch */
                `DECODE_LDCSTC,         /* Coprocessor data transfer */
                `DECODE_CDP,            /* Coprocessor data op */
                end                     /* Branch */
                `DECODE_LDCSTC,         /* Coprocessor data transfer */
                `DECODE_CDP,            /* Coprocessor data op */