Cleaned up memory stuff

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

diff --git a/plugins/net.mograsim.machine/src/net/mograsim/machine/standard/memory/ModelWordAddressableMemory.java b/plugins/net.mograsim.machine/src/net/mograsim/machine/standard/memory/ModelWordAddressableMemory.java
index 986dbe5..7490b36 100644 (file)
--- a/plugins/net.mograsim.machine/src/net/mograsim/machine/standard/memory/ModelWordAddressableMemory.java
+++ b/plugins/net.mograsim.machine/src/net/mograsim/machine/standard/memory/ModelWordAddressableMemory.java
@@ -3,11 +3,12 @@ package net.mograsim.machine.standard.memory;
 import net.mograsim.logic.model.model.LogicModelModifiable;
 import net.mograsim.logic.model.model.wires.Pin;
 import net.mograsim.logic.model.model.wires.PinUsage;
-import net.mograsim.machine.Machine;
+import net.mograsim.logic.model.modeladapter.LogicCoreAdapter;
+import net.mograsim.machine.MainMemory;
 import net.mograsim.machine.MainMemoryDefinition;
 import net.mograsim.machine.ModelMemory;
 
-public abstract class ModelWordAddressableMemory<M extends Machine> extends ModelMemory<M>
+public abstract class ModelWordAddressableMemory extends ModelMemory
 {
        private final Pin addrPin, dataPin, rWPin;
        private CoreWordAddressableMemory memory;
@@ -54,4 +55,26 @@ public abstract class ModelWordAddressableMemory<M extends Machine> extends Mode
        {
                return memory;
        }
-}
+
+       @Override
+       public void setHighLevelState(String stateID, Object newState)
+       {
+               if (stateID.equals("memory_binding"))
+                       memory.setMemory((MainMemory) newState);
+               else
+                       super.setHighLevelState(stateID, newState);
+       }
+
+       @Override
+       public Object getHighLevelState(String stateID)
+       {
+               if (stateID.equals("memory_binding"))
+                       return memory.getMemory();
+               return super.getHighLevelState(stateID);
+       }
+
+       static
+       {
+               LogicCoreAdapter.addComponentAdapter(new WordAddressableMemoryAdapter());
+       }
+}
\ No newline at end of file