X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.machine%2Fsrc%2Fnet%2Fmograsim%2Fmachine%2Fmi%2Fcomponents%2FCoreMicroInstructionMemory.java;h=739402803fbf4420583034761bb77635296fa512;hb=8bed58cd47f4e53a0a83e066d38864aa6875502f;hp=a958dc20f711f424603d69866d58b6764eb23a1e;hpb=4ba119cab03498736851e6f3f32eec1957839a2e;p=Mograsim.git

diff --git a/net.mograsim.machine/src/net/mograsim/machine/mi/components/CoreMicroInstructionMemory.java b/net.mograsim.machine/src/net/mograsim/machine/mi/components/CoreMicroInstructionMemory.java
index a958dc20..73940280 100644
--- a/net.mograsim.machine/src/net/mograsim/machine/mi/components/CoreMicroInstructionMemory.java
+++ b/net.mograsim.machine/src/net/mograsim/machine/mi/components/CoreMicroInstructionMemory.java
@@ -23,6 +23,8 @@ public class CoreMicroInstructionMemory extends BasicCoreComponent
 		this.memory = memory;
 		this.data = data;
 		this.address = address;
+		memory.registerObserver(a -> update());
+		address.registerObserver(this);
 	}
 
 	public MicroInstructionMemory getMemory()
@@ -45,11 +47,11 @@ public class CoreMicroInstructionMemory extends BasicCoreComponent
 	@Override
 	protected TimelineEventHandler compute()
 	{
-		if (!address.hasNumericValue())
+		if (!address.getValues().isBinary())
 		{
 			return e -> data.feedSignals(Bit.U.toVector(data.width()));// TODO don't always feed U, but decide to feed X or U.
 		}
-		long addressed = address.getUnsignedValue();
+		long addressed = address.getValues().getUnsignedValueLong();
 		BitVector storedData = memory.getCell(addressed).toBitVector();
 		return e -> data.feedSignals(storedData);
 	}