Added Clock input to CoreWordAddressableMemory

[Mograsim.git] / net.mograsim.machine / src / net / mograsim / machine / standard / memory / ModelMemoryWA.java

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 78bd16f..218c655 100644 (file)
--- 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();
@@ -39,9 +39,12 @@ public class ModelMemoryWA extends ModelComponent
 
                setSize(width, height);
                //TODO check the usages
-               addPin(addrPin = new Pin(this, "A", definition.getMemoryAddressBits(), PinUsage.INPUT, 0, 10));
-               addPin(dataPin = new Pin(this, "D", definition.getCellWidth(), PinUsage.TRISTATE, 0, 30));
-               addPin(rWPin = new Pin(this, "RW", 1, PinUsage.INPUT, 0, 50));
+               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;
        }