X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.machine%2Fsrc%2Fnet%2Fmograsim%2Fmachine%2Fmi%2Fcomponents%2FCoreMicroInstructionMemory.java;h=60902af288440f3e3c5792f2aa493617273f6c80;hb=4294019fb99a78ffa6802c0765e4efb7f96bd880;hp=29793c5c3bb159958a0cfe225ea996282f162004;hpb=7b8035a065c7b64f38850907d519f9a7dfb67e24;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..60902af2 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,27 @@ 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; + address.registerObserver(this); } public MicroInstructionMemory getMemory() { return memory; } - + @Override public List getAllInputs() { - return List.of(address, clock); + return List.of(address); } @Override @@ -47,12 +46,9 @@ public class CoreMicroInstructionMemory extends BasicCoreComponent @Override protected TimelineEventHandler compute() { - if(clock.getValue() != Bit.ONE) - return null; - if (!address.hasNumericValue()) { - 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(); BitVector storedData = memory.getCell(addressed).toBitVector();