Merge nyus:/storage/git/firearm
authorJoshua Wise <joshua@rebirth.joshuawise.com>
Wed, 7 Jan 2009 08:08:46 +0000 (03:08 -0500)
committerJoshua Wise <joshua@rebirth.joshuawise.com>
Wed, 7 Jan 2009 08:08:46 +0000 (03:08 -0500)
Conflicts:

Memory.v

1  2 
Memory.v

diff --cc 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
This page took 0.020232 seconds and 4 git commands to generate.