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=29793c5c3bb159958a0cfe225ea996282f162004;hpb=91f076c44a4f00786343beb923ab01894672416f;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 29793c5c..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
@@ -14,28 +14,28 @@ import net.mograsim.machine.mi.MicroInstructionMemory;
 public class CoreMicroInstructionMemory extends BasicCoreComponent
 {
 	private final ReadWriteEnd data;
-	private final ReadEnd address, clock;
+	private final ReadEnd address;
 	private final MicroInstructionMemory memory;
-	
-	
-	public CoreMicroInstructionMemory(Timeline timeline, int processTime, MicroInstructionMemory memory, ReadWriteEnd data, ReadEnd address, ReadEnd clock)
+
+	public CoreMicroInstructionMemory(Timeline timeline, int processTime, MicroInstructionMemory memory, ReadWriteEnd data, ReadEnd address)
 	{
 		super(timeline, processTime);
 		this.memory = memory;
 		this.data = data;
 		this.address = address;
-		this.clock = clock;
+		memory.registerObserver(a -> update());
+		address.registerObserver(this);
 	}
 
 	public MicroInstructionMemory getMemory()
 	{
 		return memory;
 	}
-	
+
 	@Override
 	public List<ReadEnd> getAllInputs()
 	{
-		return List.of(address, clock);
+		return List.of(address);
 	}
 
 	@Override
@@ -47,14 +47,11 @@ public class CoreMicroInstructionMemory extends BasicCoreComponent
 	@Override
 	protected TimelineEventHandler compute()
 	{
-		if(clock.getValue() != Bit.ONE)
-			return null;
-		
-		if (!address.hasNumericValue())
+		if (!address.getValues().isBinary())
 		{
-			return e -> data.feedSignals(Bit.U.toVector(data.width()));
+			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);
 	}