Issue: Fix case in which lr is read in the instruction immediately after a bl; now...

[firearm.git] / Writeback.v

diff --git a/Writeback.v b/Writeback.v
index b0e69cf91cfec00c07165c5d1e05c918b9c91a33..d0d43041f19cea96de24a85a3ed6397dfa349cbf 100644 (file)
--- a/Writeback.v
+++ b/Writeback.v
@@ -9,6 +9,7 @@ module Writeback(
        
        input [31:0] cpsr,
        input [31:0] spsr,
+       input cpsrup,
        
        output reg regfile_write,
        output reg [3:0] regfile_write_reg,
@@ -23,13 +24,13 @@ module Writeback(
        reg [31:0] last_outcpsr = 0, last_outspsr = 0;
        
        always @(*)
-               if (inbubble)
+               if (inbubble || !cpsrup)
                        outcpsr = last_outcpsr;
                else
                        outcpsr = cpsr;
        
        always @(*)
-               if (inbubble)
+               if (inbubble || !cpsrup)
                        outspsr = last_outspsr;
                else
                        outspsr = spsr;