Cleaned up memory stuff

[Mograsim.git] / plugins / net.mograsim.logic.model.am2900 / src / net / mograsim / logic / model / am2900 / components / ModelAm2900MicroInstructionMemory.java

diff --git a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/ModelAm2900MicroInstructionMemory.java b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/ModelAm2900MicroInstructionMemory.java
index cfd54c5..0f2825b 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/ModelAm2900MicroInstructionMemory.java
+++ b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/ModelAm2900MicroInstructionMemory.java
@@ -1,32 +1,29 @@
 package net.mograsim.logic.model.am2900.components;
 
-import net.mograsim.logic.model.am2900.machine.Am2900Machine;
-import net.mograsim.logic.model.am2900.machine.Am2900MachineDefinition;
+import net.mograsim.logic.model.am2900.machine.Am2900MicroInstructionMemoryDefinition;
 import net.mograsim.logic.model.model.LogicModelModifiable;
-import net.mograsim.logic.model.modeladapter.LogicCoreAdapter;
 import net.mograsim.logic.model.serializing.IdentifyParams;
 import net.mograsim.logic.model.serializing.IndirectModelComponentCreator;
 import net.mograsim.machine.mi.components.ModelMicroInstructionMemory;
 
-public class ModelAm2900MicroInstructionMemory extends ModelMicroInstructionMemory<Am2900Machine>
+public class ModelAm2900MicroInstructionMemory extends ModelMicroInstructionMemory
 {
        public ModelAm2900MicroInstructionMemory(LogicModelModifiable model, String name)
        {
-               super(model, Am2900MachineDefinition.getInstance().getMicroInstructionMemoryDefinition(), name);
+               super(model, Am2900MicroInstructionMemoryDefinition.instance, name);
+       }
+
+       @Override
+       public String getIDForSerializing(IdentifyParams idParams)
+       {
+               return "Am2900MicroInstructionMemory";
        }
 
        static
        {
-               LogicCoreAdapter.addComponentAdapter(new ModelAm2900MicroInstructionMemoryAdapter());
                IndirectModelComponentCreator.setComponentSupplier(ModelAm2900MicroInstructionMemory.class.getCanonicalName(), (m, p, n) ->
                {
                        return new ModelAm2900MicroInstructionMemory(m, n);
                });
        }
-
-       @Override
-       public String getIDForSerializing(IdentifyParams idParams)
-       {
-               return "Am2900MicroInstructionMemory";
-       }
-}
+}
\ No newline at end of file