Finished MPROM support. Fixes #10

[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
deleted file mode 100644 (file)
index a1112e6..0000000
--- a/plugins/net.mograsim.machine/src/net/mograsim/machine/standard/memory/ModelWordAddressableMemory.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package net.mograsim.machine.standard.memory;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.function.Consumer;
-
-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.logic.model.modeladapter.LogicCoreAdapter;
-import net.mograsim.logic.model.serializing.IdentifyParams;
-import net.mograsim.logic.model.snippets.HighLevelStateHandler;
-import net.mograsim.machine.MainMemory;
-import net.mograsim.machine.MainMemoryDefinition;
-import net.mograsim.machine.ModelMemory;
-
-public abstract class ModelWordAddressableMemory extends ModelMemory
-{
-       private final Pin addrPin, dataPin, rWPin;
-       private CoreWordAddressableMemory memory;
-       private MainMemoryDefinition definition;
-
-       private final List<Consumer<Object>> memoryBindingListeners;
-
-       public ModelWordAddressableMemory(LogicModelModifiable model, MainMemoryDefinition definition, String name)
-       {
-               super(model, 120, 150, name, "RAM", false);
-               this.definition = definition;
-
-               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));
-
-               memoryBindingListeners = new ArrayList<>();
-
-               setHighLevelStateHandler(new HighLevelStateHandler()
-               {
-                       @Override
-                       public Object get(String stateID)
-                       {
-                               if (stateID.equals("memory_binding"))
-                                       return memory.getMemory();
-                               throw new IllegalArgumentException("No high level state with ID " + stateID);
-                       }
-
-                       @Override
-                       public void set(String stateID, Object newState)
-                       {
-                               if (stateID.equals("memory_binding"))
-                               {
-                                       memory.setMemory((MainMemory) newState);
-                                       memoryBindingListeners.forEach(l -> l.accept(newState));
-                               } else
-                                       throw new IllegalArgumentException("No high level state with ID " + stateID);
-                       }
-
-                       @Override
-                       public void addListener(String stateID, Consumer<Object> stateChanged)
-                       {
-                               if (stateID.equals("memory_binding"))
-                                       memoryBindingListeners.add(stateChanged);
-                               else
-                                       throw new IllegalArgumentException("No high level state with ID " + stateID);
-                       }
-
-                       @Override
-                       public void removeListener(String stateID, Consumer<Object> stateChanged)
-                       {
-                               if (stateID.equals("memory_binding"))
-                                       memoryBindingListeners.remove(stateChanged);
-                               else
-                                       throw new IllegalArgumentException("No high level state with ID " + stateID);
-                       }
-
-                       @Override
-                       public String getIDForSerializing(IdentifyParams idParams)
-                       {
-                               return null;
-                       }
-
-                       @Override
-                       public Object getParamsForSerializing(IdentifyParams idParams)
-                       {
-                               return null;
-                       }
-               });
-
-               init();
-       }
-
-       public MainMemoryDefinition getDefinition()
-       {
-               return definition;
-       }
-
-       public Pin getAddressPin()
-       {
-               return addrPin;
-       }
-
-       public Pin getDataPin()
-       {
-               return dataPin;
-       }
-
-       public Pin getReadWritePin()
-       {
-               return rWPin;
-       }
-
-       public void setCoreModelBinding(CoreWordAddressableMemory memory)
-       {
-               this.memory = memory;
-       }
-
-       public CoreWordAddressableMemory getCoreMemory()
-       {
-               return memory;
-       }
-
-       static
-       {
-               LogicCoreAdapter.addComponentAdapter(new WordAddressableMemoryAdapter());
-       }
-}
\ No newline at end of file