Ok, it work.

[firearm.git] / Execute.v

diff --git a/Execute.v b/Execute.v
index 4e3f44f818de983db8e1080e077e1156dbdfe463..8a7d8f62a210b73e4f32ad0837a5f8d30d332398 100644 (file)
--- a/Execute.v
+++ b/Execute.v
@@ -163,12 +163,12 @@ module Execute(
                begin end
                `DECODE_BRANCH:
                begin
                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 */
                                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
                                end
                                jmp = 1'b1;
                        end


@@ -236,8 +236,8 @@ module ALU(
        output reg [31:0] cpsr_out,
        output reg setres
 );
        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;
 
        wire [32:0] sum, diff, rdiff;
        wire sum_v, diff_v, rdiff_v;