X-Git-Url: http://git.joshuawise.com/firearm.git/blobdiff_plain/f8bf38caa402400c5063dc97da9e810c5d9d7ec5..7947b9c731a2c981f1a32d2f8f47ab42464e7b17:/Execute.v?ds=inline diff --git a/Execute.v b/Execute.v index 4e3f44f..8a7d8f6 100644 --- a/Execute.v +++ b/Execute.v @@ -163,12 +163,12 @@ module Execute( begin end `DECODE_BRANCH: begin - if(!prevstall && !inbubble) begin + if(!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; + next_write_data = pc - 32'h4; end jmp = 1'b1; end @@ -236,8 +236,8 @@ module ALU( output reg [31:0] cpsr_out, output reg setres ); - wire [31:0] res; - wire flag_n, flag_z, flag_c, flag_v, setres; + reg [31:0] res; + reg flag_n, flag_z, flag_c, flag_v; wire [32:0] sum, diff, rdiff; wire sum_v, diff_v, rdiff_v;