From: Christopher Lu <lu@stop.hsd1.pa.comcast.net>
Date: Tue, 6 Jan 2009 08:20:31 +0000 (-0500)
Subject: merge memory
X-Git-Url: http://git.joshuawise.com/firearm.git/commitdiff_plain/ec3250aa3b07ac33432383e34565b12465ef3444?hp=--cc

merge memory
---

ec3250aa3b07ac33432383e34565b12465ef3444
diff --cc Memory.v
index 3f82a54,e10a2e7..0b27485
--- a/Memory.v
+++ b/Memory.v
@@@ -37,11 -37,11 +37,12 @@@ module Memory
  	output reg [31:0] out_write_data = 32'hxxxxxxxx
  	);
  
 -	reg [31:0] addr, raddr;
 -	reg next_notdone, next_inc_next;
 +	reg [31:0] addr, raddr, next_regdata;
 +	reg [3:0] next_regsel, cur_reg, prev_reg;
 +	reg next_writeback, 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;
@@@ -81,10 -78,9 +82,11 @@@
  		next_write_num = write_num;
  		next_write_data = write_data;
  		next_inc_next = 1'b0;
+ 		next_outbubble = inbubble;
  		outstall = 1'b0;
 -		
 +		next_regs = 16'b0;
 +		next_started = started;
 +
  		casez(insn)
  		`DECODE_LDRSTR_UNDEFINED: begin end
  		`DECODE_LDRSTR: begin