X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.machine%2Fsrc%2Fnet%2Fmograsim%2Fmachine%2Fstandard%2Fmemory%2FModelWordAddressableMemory.java;h=807c12811d762d9198eac5f1b56f82dfbd33e85e;hb=4ba119cab03498736851e6f3f32eec1957839a2e;hp=7e5296d439add3a3d194085baa8745552e81eb40;hpb=91f076c44a4f00786343beb923ab01894672416f;p=Mograsim.git diff --git a/net.mograsim.machine/src/net/mograsim/machine/standard/memory/ModelWordAddressableMemory.java b/net.mograsim.machine/src/net/mograsim/machine/standard/memory/ModelWordAddressableMemory.java index 7e5296d4..807c1281 100644 --- a/net.mograsim.machine/src/net/mograsim/machine/standard/memory/ModelWordAddressableMemory.java +++ b/net.mograsim.machine/src/net/mograsim/machine/standard/memory/ModelWordAddressableMemory.java @@ -8,23 +8,22 @@ import net.mograsim.machine.ModelMemory; public abstract class ModelWordAddressableMemory extends ModelMemory { - private final Pin addrPin, dataPin, rWPin, clock; + private final Pin addrPin, dataPin, rWPin; private CoreWordAddressableMemory memory; private MainMemoryDefinition definition; public ModelWordAddressableMemory(LogicModelModifiable model, MainMemoryDefinition definition, String name) { - super(model, 100, 300, name, "RAM", false); + super(model, 120, 150, name, "RAM", false); this.definition = definition; - - addPin(addrPin = new Pin(model, this, "A", definition.getMemoryAddressBits(), PinUsage.INPUT, width, 20)); - addPin(dataPin = new Pin(model, this, "D", definition.getCellWidth(), PinUsage.TRISTATE, width, 50)); - addPin(rWPin = new Pin(model, this, "RW", 1, PinUsage.INPUT, width, 80)); - addPin(clock = new Pin(model, this, "C", 1, PinUsage.INPUT, width, 110)); + + addPin(addrPin = new Pin(model, this, "A", definition.getMemoryAddressBits(), PinUsage.INPUT, getWidth(), 30)); + addPin(dataPin = new Pin(model, this, "D", definition.getCellWidth(), PinUsage.TRISTATE, getWidth(), 50)); + addPin(rWPin = new Pin(model, this, "RW", 1, PinUsage.INPUT, getWidth(), 70)); init(); } - + public MainMemoryDefinition getDefinition() { return definition; @@ -45,11 +44,6 @@ public abstract class ModelWordAddressableMemory extends ModelMemory return rWPin; } - public Pin getClockPin() - { - return clock; - } - public void setCoreModelBinding(CoreWordAddressableMemory memory) { this.memory = memory;