Memory: Fix bug in which swp_oldval does not get latched (oops!). Make align_rddata...

[firearm.git] / Memory.v

diff --git a/Memory.v b/Memory.v
index 6b529897d14fede7ab173916aaadfd3abb3450b6..63dfb9bd0a376c57b3df59e0bb1c5bad1e2661b4 100644 (file)
--- a/Memory.v
+++ b/Memory.v
@@ -121,6 +121,7 @@ module Memory(
                lsrh_state <= next_lsrh_state;
                if (do_rd_data_latch)
                        rd_data_latch <= rd_data;
+               swp_oldval <= next_swp_oldval;
                prevaddr <= addr;
        end
        
@@ -692,6 +693,10 @@ module Memory(
                lsrh_rddata_s1 = 16'hxxxx;
                lsrh_rddata_s2 = 8'hxx;
                next_swp_oldval = swp_oldval;
+               
+               align_s1 = 32'hxxxxxxxx;
+               align_s2 = 32'hxxxxxxxx;
+               align_rddata = 32'hxxxxxxxx;
 
                /* XXX shit not given about endianness */
                casez(insn)