From: Joshua Wise <joshua@rebirth.joshuawise.com>
Date: Wed, 7 Jan 2009 08:08:46 +0000 (-0500)
Subject: Merge nyus:/storage/git/firearm
X-Git-Url: http://git.joshuawise.com/firearm.git/commitdiff_plain/c8aae4442c5cc9334970c34f886e2dced6496374?hp=--cc

Merge nyus:/storage/git/firearm

Conflicts:

	Memory.v
---

c8aae4442c5cc9334970c34f886e2dced6496374
diff --cc Memory.v
index 04220ca,221cc77..658e7d2
--- a/Memory.v
+++ b/Memory.v
@@@ -91,7 -95,8 +100,9 @@@ module Memory
  		outstall = 1'b0;
  		next_regs = 16'b0;
  		next_started = started;
 +		cp_req = 1'b0;
+ 		offset = prev_offset;
+ 		next_outcpsr = started ? out_cpsr : cpsr;
  
  		casez(insn)
  		`DECODE_LDRSTR_UNDEFINED: begin end