X-Git-Url: http://git.joshuawise.com/firearm.git/blobdiff_plain/6d0f9d8259aa4b3624bfec65b679ee42e54f7875..c65110a8c83463c0f95391c2ec7e0277de333c62:/Memory.v?ds=sidebyside

diff --git a/Memory.v b/Memory.v
index 2378177..e10a2e7 100644
--- a/Memory.v
+++ b/Memory.v
@@ -37,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;
@@ -55,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;
@@ -78,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 */