Fixed two problems causing memory updates to get "missed" by observers

[Mograsim.git] / net.mograsim.machine / src / net / mograsim / machine / standard / memory / CoreWordAddressableMemory.java

diff --git a/net.mograsim.machine/src/net/mograsim/machine/standard/memory/CoreWordAddressableMemory.java b/net.mograsim.machine/src/net/mograsim/machine/standard/memory/CoreWordAddressableMemory.java
index 882b031..6dc5da2 100644 (file)
--- a/net.mograsim.machine/src/net/mograsim/machine/standard/memory/CoreWordAddressableMemory.java
+++ b/net.mograsim.machine/src/net/mograsim/machine/standard/memory/CoreWordAddressableMemory.java
@@ -45,14 +45,14 @@ public class CoreWordAddressableMemory extends BasicCoreComponent
                        throw new IllegalArgumentException(
                                        String.format("Bit width of address wire does not match main memory definition. Expected: %d Actual: %d",
                                                        definition.getMemoryAddressBits(), address.width()));
+               this.memory = memory;
                this.data = data;
                this.rWBit = rWBit;
                this.address = address;
+               memory.registerObserver(a -> update());
                data.registerObserver(this);
                rWBit.registerObserver(this);
                address.registerObserver(this);
-
-               this.memory = memory;
        }
 
        @Override