Cleaned up memory stuff

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

diff --git a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/ModelAm2900MainMemory.java b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/ModelAm2900MainMemory.java
index 4450e07..c065598 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/ModelAm2900MainMemory.java
+++ b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/ModelAm2900MainMemory.java
@@ -1,18 +1,16 @@
 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.Am2900MainMemoryDefinition;
 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.standard.memory.ModelWordAddressableMemory;
 
-public class ModelAm2900MainMemory extends ModelWordAddressableMemory<Am2900Machine>
+public class ModelAm2900MainMemory extends ModelWordAddressableMemory
 {
        public ModelAm2900MainMemory(LogicModelModifiable model, String name)
        {
-               super(model, Am2900MachineDefinition.getInstance().getMainMemoryDefinition(), name);
+               super(model, Am2900MainMemoryDefinition.instance, name);
        }
 
        @Override
@@ -23,7 +21,6 @@ public class ModelAm2900MainMemory extends ModelWordAddressableMemory<Am2900Mach
 
        static
        {
-               LogicCoreAdapter.addComponentAdapter(new ModelAm2900MainMemoryAdapter());
                IndirectModelComponentCreator.setComponentSupplier(ModelAm2900MainMemory.class.getCanonicalName(), (m, p, n) ->
                {
                        return new ModelAm2900MainMemory(m, n);