From: Joshua Wise <joshua@rebirth.joshuawise.com>
Date: Tue, 6 Jan 2009 07:50:55 +0000 (-0500)
Subject: st_data -> op2
X-Git-Url: http://git.joshuawise.com/firearm.git/commitdiff_plain/6d0f9d8259aa4b3624bfec65b679ee42e54f7875

st_data -> op2
---

diff --git a/Decode.v b/Decode.v
index a34eb3b..b58951a 100644
--- a/Decode.v
+++ b/Decode.v
@@ -171,6 +171,7 @@ module Decode(
 		begin
 			read_0 = insn[19:16]; /* Rn */
 			read_1 = insn[3:0];   /* Rm */
+			read_2 = insn[15:12];
 			
 			op0_out = regs0;
 			if(insn[25]) begin
@@ -180,6 +181,7 @@ module Decode(
 				op1_out = shift_res;
 				carry_out = shift_cflag_out;
 			end
+			op2_out = regs2;
 		end
 		`DECODE_LDMSTM:		/* Block data transfer */
 		begin
diff --git a/Memory.v b/Memory.v
index 4af216d..2378177 100644
--- a/Memory.v
+++ b/Memory.v
@@ -22,6 +22,7 @@ module Memory(
 	input [31:0] insn,
 	input [31:0] op0,
 	input [31:0] op1,
+	input [31:0] op2,
 	input write_reg,
 	input [3:0] write_num,
 	input [31:0] write_data,
@@ -98,8 +99,7 @@ module Memory(
 				align_rddata = insn[22] ? {24'b0, align_s2[7:0]} : align_s2;
 				
 				if(!insn[20]) begin
-					st_read = insn[15:12];
-					wr_data = insn[22] ? {4{st_data[7:0]}} : st_data; /* XXX need to actually store just a byte */
+					wr_data = insn[22] ? {4{op2[7:0]}} : op2; /* XXX need to actually store just a byte */
 				end
 				else if(!inc_next) begin
 					next_write_reg = 1'b1;