From: Joshua Wise <joshua@nyus.joshuawise.com>
Date: Sun, 22 Feb 2009 09:16:37 +0000 (-0500)
Subject: Memory: Do not progress LSM state machine if rw_wait.
X-Git-Url: http://git.joshuawise.com/firearm.git/commitdiff_plain/fa42d706a9e0dc3f90f3f45a6b8dc1b2d16ef7fc?ds=sidebyside

Memory: Do not progress LSM state machine if rw_wait.
---

diff --git a/Memory.v b/Memory.v
index 8a62ed1..6b52989 100644
--- a/Memory.v
+++ b/Memory.v
@@ -254,7 +254,7 @@ module Memory(
 			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
 				
@@ -402,7 +402,7 @@ module Memory(
 			`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;