Memory: Do not progress LSM state machine if rw_wait.
authorJoshua Wise <joshua@nyus.joshuawise.com>
Sun, 22 Feb 2009 09:16:37 +0000 (04:16 -0500)
committerJoshua Wise <joshua@nyus.joshuawise.com>
Sun, 22 Feb 2009 09:16:37 +0000 (04:16 -0500)
Memory.v

index 8a62ed1..6b52989 100644 (file)
--- a/Memory.v
+++ b/Memory.v
@@ -254,7 +254,7 @@ module Memory(
                        end
                        `LSM_MEMIO: begin
                                outstall = 1'b1;
                        end
                        `LSM_MEMIO: begin
                                outstall = 1'b1;
-                               if(next_regs == 16'b0) begin
+                               if(next_regs == 16'b0 && !rw_wait) begin
                                        next_lsm_state = `LSM_BASEWB;
                                end
                                
                                        next_lsm_state = `LSM_BASEWB;
                                end
                                
@@ -402,7 +402,7 @@ module Memory(
                        `LSM_SETUP:
                                next_write_reg = 1'b0;
                        `LSM_MEMIO: begin
                        `LSM_SETUP:
                                next_write_reg = 1'b0;
                        `LSM_MEMIO: begin
-                               if(insn[20]) begin
+                               if(insn[20] /* L */) begin
                                        next_write_reg = !rw_wait;
                                        next_write_num = cur_reg;
                                        next_write_data = rd_data;
                                        next_write_reg = !rw_wait;
                                        next_write_num = cur_reg;
                                        next_write_data = rd_data;
This page took 0.019913 seconds and 4 git commands to generate.