X-Git-Url: http://git.joshuawise.com/firearm.git/blobdiff_plain/ec3250aa3b07ac33432383e34565b12465ef3444..dbf45af6b23216aa8fe299e334006fb3138d45f9:/Execute.v diff --git a/Execute.v b/Execute.v index 7f4cf6c..ab204a0 100644 --- a/Execute.v +++ b/Execute.v @@ -101,7 +101,7 @@ module Execute( alu_setflags = 1'bx; jmp = 1'b0; - jmppc = 32'hxxxxxxxx; + jmppc = 32'h00000000; casez (insn) `DECODE_ALU_MULT: /* Multiply -- must come before ALU, because it pattern matches a specific case of ALU */ @@ -171,12 +171,12 @@ module Execute( begin end `DECODE_BRANCH: begin - if(!inbubble) begin + if(!inbubble && !flush) 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; + next_write_data = pc + 32'h4; end jmp = 1'b1; end