X-Git-Url: http://git.joshuawise.com/firearm.git/blobdiff_plain/e68b2378c70caa2807dce8bfea6bc9c7fbb5db8d..b455d4811bb209ccddf70e8789a9efcb92536121:/Memory.v

diff --git a/Memory.v b/Memory.v
index 4af216d..e10a2e7 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,
@@ -36,11 +37,11 @@ module Memory(
 	output reg [31:0] out_write_data = 32'hxxxxxxxx
 	);
 
-	reg [31:0] addr, raddr, next_regdata;
-	reg [3:0] next_regsel;
-	reg next_writeback, next_notdone, next_inc_next;
+	reg [31:0] addr, raddr;
+	reg next_notdone, next_inc_next;
 	reg [31:0] align_s1, align_s2, align_rddata;
-	
+
+	wire next_outbubble;	
 	wire next_write_reg;
 	wire [3:0] next_write_num;
 	wire [31:0] next_write_data;
@@ -54,10 +55,10 @@ module Memory(
 	begin
 		outpc <= pc;
 		outinsn <= insn;
-		outbubble <= rw_wait;
-		out_write_reg <= next_writeback;
-		out_write_num <= next_regsel;
-		out_write_data <= next_regdata;
+		outbubble <= next_outbubble;
+		out_write_reg <= next_write_reg;
+		out_write_num <= next_write_num;
+		out_write_data <= next_write_data;
 		notdone <= next_notdone;
 		inc_next <= next_inc_next;
 		regs <= next_regs;
@@ -77,12 +78,14 @@ module Memory(
 		next_write_num = write_num;
 		next_write_data = write_data;
 		next_inc_next = 1'b0;
+		next_outbubble = inbubble;
 		outstall = 1'b0;
 		
 		casez(insn)
 		`DECODE_LDRSTR_UNDEFINED: begin end
 		`DECODE_LDRSTR: begin
 			if (!inbubble) begin
+				next_outbubble = rw_wait;
 				outstall = rw_wait | notdone;
 			
 				addr = insn[23] ? op0 + op1 : op0 - op1; /* up/down select */
@@ -98,8 +101,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;