From: Joshua Wise <joshua@rebirth.joshuawise.com>
Date: Sun, 11 Jan 2009 04:41:07 +0000 (-0500)
Subject: Memory: Fix FSM for LDR/STR.  Fix pre/post increment to be, uh, pre/post increment... 
X-Git-Url: http://git.joshuawise.com/firearm.git/commitdiff_plain/feb2b5beb6bd3dbeb10ce942e10fbdf5f3df261e

Memory: Fix FSM for LDR/STR.  Fix pre/post increment to be, uh, pre/post increment, not post/pre increment.
---

diff --git a/Memory.v b/Memory.v
index 241c50a..918c5d9 100644
--- a/Memory.v
+++ b/Memory.v
@@ -216,7 +216,7 @@ module Memory(
 			next_outbubble = rw_wait;
 			outstall = rw_wait;
 			addr = insn[23] ? op0 + op1 : op0 - op1; /* up/down select */
-			raddr = insn[24] ? op0 : addr; /* pre/post increment */
+			raddr = insn[24] ? addr : op0; /* pre/post increment */
 			busaddr = raddr;
 			/* rotate to correct position */
 			align_s1 = raddr[1] ? {rd_data[15:0], rd_data[31:16]} : rd_data;
@@ -244,7 +244,7 @@ module Memory(
 				next_write_reg = 1'b1;
 				next_write_num = insn[19:16];
 				next_write_data = addr;
-				next_lsr_state = 2'b10;
+				next_lsr_state = 2'b01;
 			end
 			default: begin end
 			endcase