X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.machine%2Fsrc%2Fnet%2Fmograsim%2Fmachine%2Fstandard%2Fmemory%2FModelMemoryWA.java;h=218c655455f663b0c9f2462140365b4f1288f34d;hb=939f37fb65d2057c3f370214cc2eebd3e9989f69;hp=f874e467839aa87bb960bf208628999a2b7cba50;hpb=1f645882d229fc3d4081e4c5060559d75dc2cc24;p=Mograsim.git diff --git a/net.mograsim.machine/src/net/mograsim/machine/standard/memory/ModelMemoryWA.java b/net.mograsim.machine/src/net/mograsim/machine/standard/memory/ModelMemoryWA.java index f874e467..218c6554 100644 --- a/net.mograsim.machine/src/net/mograsim/machine/standard/memory/ModelMemoryWA.java +++ b/net.mograsim.machine/src/net/mograsim/machine/standard/memory/ModelMemoryWA.java @@ -20,15 +20,15 @@ import net.mograsim.machine.MainMemoryDefinition; public class ModelMemoryWA extends ModelComponent { private final MainMemoryDefinition definition; - private final Pin addrPin, dataPin, rWPin; - private WordAddressableMemoryComponent memory; + private final Pin addrPin, dataPin, rWPin, clock; + private CoreWordAddressableMemory memory; private final static int width = 100, height = 300; private Renderer symbolRenderer; private Renderer outlineRenderer; public ModelMemoryWA(LogicModelModifiable model, MainMemoryDefinition definition, String name) { - super(model, name); + super(model, name,false); this.definition = definition; CenteredTextParams renderer1Params = new CenteredTextParams(); @@ -42,6 +42,9 @@ public class ModelMemoryWA extends ModelComponent addPin(addrPin = new Pin(model, this, "A", definition.getMemoryAddressBits(), PinUsage.INPUT, 0, 10)); addPin(dataPin = new Pin(model, this, "D", definition.getCellWidth(), PinUsage.TRISTATE, 0, 30)); addPin(rWPin = new Pin(model, this, "RW", 1, PinUsage.INPUT, 0, 50)); + addPin(clock = new Pin(model, this, "C", 1, PinUsage.INPUT, 0, 70)); + + init(); } public Pin getAddressPin() @@ -58,8 +61,13 @@ public class ModelMemoryWA extends ModelComponent { return rWPin; } + + public Pin getClockPin() + { + return clock; + } - public void setCoreModelBinding(WordAddressableMemoryComponent memory) + public void setCoreModelBinding(CoreWordAddressableMemory memory) { this.memory = memory; } @@ -69,7 +77,7 @@ public class ModelMemoryWA extends ModelComponent return definition; } - public WordAddressableMemoryComponent getMemory() + public CoreWordAddressableMemory getMemory() { return memory; }