tests/*.hex: Update hex files.

[firearm.git] / Memory.v

diff --git a/Memory.v b/Memory.v
index 4b41dcaf9c345cb8d6c1c91d8ae9f2d79dbf6035..eccddb245b5a019a921b08b7f058d831749edf12 100644 (file)
--- a/Memory.v
+++ b/Memory.v
@@ -36,6 +36,7 @@ module Memory(
        input [31:0] op2,
        input [31:0] spsr,
        input [31:0] cpsr,
        input [31:0] op2,
        input [31:0] spsr,
        input [31:0] cpsr,

+       input cpsrup,

        input write_reg,
        input [3:0] write_num,
        input [31:0] write_data,
        input write_reg,
        input [3:0] write_num,
        input [31:0] write_data,


@@ -49,10 +50,12 @@ module Memory(
        output reg [3:0] out_write_num = 4'bxxxx,
        output reg [31:0] out_write_data = 32'hxxxxxxxx,
        output reg [31:0] outspsr = 32'hxxxxxxxx,
        output reg [3:0] out_write_num = 4'bxxxx,
        output reg [31:0] out_write_data = 32'hxxxxxxxx,
        output reg [31:0] outspsr = 32'hxxxxxxxx,

-       output reg [31:0] outcpsr = 32'hxxxxxxxx
+       output reg [31:0] outcpsr = 32'hxxxxxxxx,
+       output reg outcpsrup = 1'hx

        );
 
        reg [31:0] addr, raddr, prev_raddr, next_regdata, next_outcpsr;
        );
 
        reg [31:0] addr, raddr, prev_raddr, next_regdata, next_outcpsr;

+       reg next_outcpsrup;

        reg [31:0] prevaddr;
        reg [3:0] next_regsel, cur_reg, prev_reg;
        reg next_writeback;
        reg [31:0] prevaddr;
        reg [3:0] next_regsel, cur_reg, prev_reg;
        reg next_writeback;


@@ -62,7 +65,7 @@ module Memory(
        reg [3:0] next_write_num;
        reg [31:0] next_write_data;
 
        reg [3:0] next_write_num;
        reg [31:0] next_write_data;
 

-       reg [2:0] lsr_state = 3'b001, next_lsr_state;
+       reg [3:0] lsr_state = 4'b0001, next_lsr_state;

        reg [31:0] align_s1, align_s2, align_rddata;
 
        reg [2:0] lsrh_state = 3'b001, next_lsrh_state;
        reg [31:0] align_s1, align_s2, align_rddata;
 
        reg [2:0] lsrh_state = 3'b001, next_lsrh_state;


@@ -76,6 +79,9 @@ module Memory(
 
        reg [31:0] swp_oldval, next_swp_oldval;
        reg [1:0] swp_state = 2'b01, next_swp_state;
 
        reg [31:0] swp_oldval, next_swp_oldval;
        reg [1:0] swp_state = 2'b01, next_swp_state;

+       
+       reg do_rd_data_latch;
+       reg [31:0] rd_data_latch = 32'hxxxxxxxx;

 
        always @(posedge clk)
        begin
 
        always @(posedge clk)
        begin


@@ -92,10 +98,13 @@ module Memory(
                prev_raddr <= raddr;
                outcpsr <= next_outcpsr;
                outspsr <= spsr;
                prev_raddr <= raddr;
                outcpsr <= next_outcpsr;
                outspsr <= spsr;

+               outcpsrup <= next_outcpsrup;

                swp_state <= next_swp_state;
                lsm_state <= next_lsm_state;
                lsr_state <= next_lsr_state;
                lsrh_state <= next_lsrh_state;
                swp_state <= next_swp_state;
                lsm_state <= next_lsm_state;
                lsr_state <= next_lsr_state;
                lsrh_state <= next_lsrh_state;

+               if (do_rd_data_latch)
+                       rd_data_latch <= rd_data;

                prevaddr <= addr;
        end
        
                prevaddr <= addr;
        end
        


@@ -116,6 +125,7 @@ module Memory(
                busaddr = 32'hxxxxxxxx;
                data_size = 3'bxxx;
                outstall = 1'b0;
                busaddr = 32'hxxxxxxxx;
                data_size = 3'bxxx;
                outstall = 1'b0;

+               do_rd_data_latch = 0;

                next_write_reg = write_reg;
                next_write_num = write_num;
                next_write_data = write_data;
                next_write_reg = write_reg;
                next_write_num = write_num;
                next_write_data = write_data;


@@ -126,6 +136,7 @@ module Memory(
                cp_write = 32'hxxxxxxxx;
                offset = prev_offset;
                next_outcpsr = lsm_state == 4'b0010 ? outcpsr : cpsr;
                cp_write = 32'hxxxxxxxx;
                offset = prev_offset;
                next_outcpsr = lsm_state == 4'b0010 ? outcpsr : cpsr;

+               next_outcpsrup = cpsrup;

                lsrh_rddata = 32'hxxxxxxxx;
                lsrh_rddata_s1 = 16'hxxxx;
                lsrh_rddata_s2 = 8'hxx;
                lsrh_rddata = 32'hxxxxxxxx;
                lsrh_rddata_s1 = 16'hxxxx;
                lsrh_rddata_s2 = 8'hxx;


@@ -205,7 +216,7 @@ module Memory(
                                if(insn[20]) begin
                                        next_write_reg = 1'b1;
                                end
                                if(insn[20]) begin
                                        next_write_reg = 1'b1;
                                end

-                               if(insn[21] | !insn[24] && !flush) begin
+                               if(insn[21] | !insn[24]) begin

                                        outstall = 1'b1;
                                        if(!rw_wait)
                                                next_lsrh_state = 3'b010;
                                        outstall = 1'b1;
                                        if(!rw_wait)
                                                next_lsrh_state = 3'b010;


@@ -225,6 +236,11 @@ module Memory(
                        end
                        default: begin end
                        endcase
                        end
                        default: begin end
                        endcase

+                       
+                       if ((lsrh_state == 3'b001) && flush) begin      /* Reject it. */
+                               outstall = 1'b0;
+                               next_lsrh_state = 3'b001;
+                       end

                end
                `DECODE_LDRSTR_UNDEFINED: begin end
                `DECODE_LDRSTR: if(!inbubble) begin
                end
                `DECODE_LDRSTR_UNDEFINED: begin end
                `DECODE_LDRSTR: if(!inbubble) begin


@@ -238,38 +254,70 @@ module Memory(
                        align_s2 = raddr[0] ? {align_s1[7:0], align_s1[31:8]} : align_s1;
                        /* select byte or word */
                        align_rddata = insn[22] ? {24'b0, align_s2[7:0]} : align_s2;
                        align_s2 = raddr[0] ? {align_s1[7:0], align_s1[31:8]} : align_s1;
                        /* select byte or word */
                        align_rddata = insn[22] ? {24'b0, align_s2[7:0]} : align_s2;

-                       wr_data = insn[22] ? {4{op2[7:0]}} : op2; /* XXX need to actually store just a byte */
+                       wr_data = insn[22] ? {24'h0, {op2[7:0]}} : op2;

                        data_size = insn[22] ? 3'b001 : 3'b100;
                        case(lsr_state)
                        data_size = insn[22] ? 3'b001 : 3'b100;
                        case(lsr_state)

-                       3'b001: begin
-                               rd_req = insn[20] /* L */;
-                               wr_req = ~insn[20] /* L */;
+                       4'b0001: begin
+                               rd_req = insn[20] /* L */ || insn[22] /* B */;
+                               wr_req = !insn[20] /* L */ && !insn[22]/* B */;

                                next_write_reg = insn[20] /* L */;
                                next_write_num = insn[15:12];
                                if(insn[20] /* L */) begin
                                next_write_reg = insn[20] /* L */;
                                next_write_num = insn[15:12];
                                if(insn[20] /* L */) begin

-                                       next_write_data = align_rddata;
+                                       next_write_data = insn[22] /* B */ ? {24'h0, align_rddata[7:0]} : align_rddata;

                                end
                                end

-                               if(insn[21] /* W */ | !insn[24] /* P */ && !flush /* don't move on if we get a flush on the first time around. */) begin
+                               if (insn[22] /* B */ && !insn[20] /* L */) begin
+                                       do_rd_data_latch = 1;
+                                       outstall = 1'b1;
+                                       if (!rw_wait)
+                                               next_lsr_state = 4'b0010;       /* XXX: One-hot, my ass. */
+                               end else if(insn[21] /* W */ | !insn[24] /* P */) begin

                                        outstall = 1'b1;
                                        if(!rw_wait)
                                        outstall = 1'b1;
                                        if(!rw_wait)

-                                               next_lsr_state = 3'b010;
+                                               next_lsr_state = 4'b0100;

                                end
                                $display("LDRSTR: rd_req %d, wr_req %d, raddr %08x, wait %d", rd_req, wr_req, raddr, rw_wait);
                        end
                                end
                                $display("LDRSTR: rd_req %d, wr_req %d, raddr %08x, wait %d", rd_req, wr_req, raddr, rw_wait);
                        end

-                       3'b010: begin
+                       4'b0010: begin
+                               $display("LDRSTR: Handling STRB");
+                               outstall = 1;
+                               rd_req = 0;
+                               wr_req = 1;
+                               next_write_reg = 0;
+                               case (busaddr[1:0])
+                               2'b00: wr_data = {rd_data_latch[31:8], op2[7:0]};
+                               2'b01: wr_data = {rd_data_latch[31:16], op2[7:0], rd_data_latch[7:0]};
+                               2'b10: wr_data = {rd_data_latch[31:24], op2[7:0], rd_data_latch[15:0]};
+                               2'b11: wr_data = {op2[7:0], rd_data_latch[23:0]};
+                               endcase
+                               if(insn[21] /* W */ | !insn[24] /* P */) begin
+                                       if(!rw_wait)
+                                               next_lsr_state = 4'b0100;
+                               end else if (!rw_wait)
+                                       next_lsr_state = 4'b1000;
+                       end
+                       4'b0100: begin

                                outstall = 1;
                                outstall = 1;

+                               rd_req = 0;
+                               wr_req= 0;

                                next_outbubble = 0;
                                next_write_reg = 1'b1;
                                next_write_num = insn[19:16];
                                next_write_data = addr;
                                next_outbubble = 0;
                                next_write_reg = 1'b1;
                                next_write_num = insn[19:16];
                                next_write_data = addr;

-                               next_lsr_state = 3'b100;
+                               next_lsr_state = 4'b1000;

                        end
                        end

-                       3'b100: begin
+                       4'b1000: begin
+                               rd_req = 0;
+                               wr_req= 0;

                                outstall = 0;
                                outstall = 0;

-                               next_lsr_state = 3'b001;
+                               next_lsr_state = 4'b0001;

                        end
                        default: begin end
                        endcase
                        end
                        default: begin end
                        endcase

+                       
+                       if ((lsr_state == 4'b0001) && flush) begin      /* Reject it. */
+                               outstall = 1'b0;
+                               next_lsr_state = 4'b0001;
+                       end

                end
                /* XXX ldm/stm incorrect in that stupid case where one of the listed regs is the base reg */
                `DECODE_LDMSTM: if(!inbubble) begin
                end
                /* XXX ldm/stm incorrect in that stupid case where one of the listed regs is the base reg */
                `DECODE_LDMSTM: if(!inbubble) begin


@@ -284,10 +332,8 @@ module Memory(
                                next_regs = insn[23] /* U */ ? op1[15:0] : {op1[0], op1[1], op1[2], op1[3], op1[4], op1[5], op1[6], op1[7],
                                                                            op1[8], op1[9], op1[10], op1[11], op1[12], op1[13], op1[14], op1[15]};
                                offset = 6'b0;
                                next_regs = insn[23] /* U */ ? op1[15:0] : {op1[0], op1[1], op1[2], op1[3], op1[4], op1[5], op1[6], op1[7],
                                                                            op1[8], op1[9], op1[10], op1[11], op1[12], op1[13], op1[14], op1[15]};
                                offset = 6'b0;

-                               if (!flush /* Don't move on if we got a flush on the first time around. */) begin
-                                       outstall = 1'b1;
-                                       next_lsm_state = 4'b0010;
-                               end
+                               outstall = 1'b1;
+                               next_lsm_state = 4'b0010;

                        end
                        4'b0010: begin
                                rd_req = insn[20];
                        end
                        4'b0010: begin
                                rd_req = insn[20];


@@ -365,6 +411,7 @@ module Memory(
                                cur_reg = insn[23] ? cur_reg : 4'hF - cur_reg;
                                if(cur_reg == 4'hF && insn[22]) begin
                                        next_outcpsr = spsr;
                                cur_reg = insn[23] ? cur_reg : 4'hF - cur_reg;
                                if(cur_reg == 4'hF && insn[22]) begin
                                        next_outcpsr = spsr;

+                                       next_outcpsrup = 1;

                                end
 
                                offset = prev_offset + 6'h4;
                                end
 
                                offset = prev_offset + 6'h4;


@@ -407,6 +454,10 @@ module Memory(
                        end
                        default: $stop;
                        endcase
                        end
                        default: $stop;
                        endcase

+                       if ((lsm_state == 4'b0001) && flush) begin      /* Reject it. */
+                               outstall = 1'b0;
+                               next_lsm_state = 4'b0001;
+                       end

                        $display("LDMSTM: Decoded, bubble %d, insn %08x, lsm state %b -> %b, stall %d", inbubble, insn, lsm_state, next_lsm_state, outstall);
                end
                `DECODE_LDCSTC: if(!inbubble) begin
                        $display("LDMSTM: Decoded, bubble %d, insn %08x, lsm state %b -> %b, stall %d", inbubble, insn, lsm_state, next_lsm_state, outstall);
                end
                `DECODE_LDCSTC: if(!inbubble) begin


@@ -433,8 +484,10 @@ module Memory(
                                        next_write_reg = 1'b1;
                                        next_write_num = insn[15:12];
                                        next_write_data = cp_read;
                                        next_write_reg = 1'b1;
                                        next_write_num = insn[15:12];
                                        next_write_data = cp_read;

-                               end else
+                               end else begin

                                        next_outcpsr = {cp_read[31:28], cpsr[27:0]};
                                        next_outcpsr = {cp_read[31:28], cpsr[27:0]};

+                                       next_outcpsrup = 1;
+                               end

                        end
                        if (cp_busy) begin
                                outstall = 1;
                        end
                        if (cp_busy) begin
                                outstall = 1;