Merge nyus:/storage/git/firearm

Conflicts:

	Memory.v

diff --cc Memory.v
index 04220ca93cb649060c286c1e9e96806ce1168f8c,221cc772b381a11347ae7ae53ebe571063a629ab..658e7d254e3c3e493fcc92d0e1c9cb26f512ff2f
--- 1/Memory.v
--- 2/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