Fixed a bug in Am2900; created dlatch8/80; relayouted some components

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

diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/ModelAm2900MainMemory.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/ModelAm2900MainMemory.java
index a673bc4..4450e07 100644 (file)
--- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/ModelAm2900MainMemory.java
+++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/ModelAm2900MainMemory.java
@@ -1,5 +1,6 @@
 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.model.LogicModelModifiable;
 import net.mograsim.logic.model.modeladapter.LogicCoreAdapter;
@@ -7,26 +8,25 @@ 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
+public class ModelAm2900MainMemory extends ModelWordAddressableMemory<Am2900Machine>
 {
        public ModelAm2900MainMemory(LogicModelModifiable model, String name)
        {
                super(model, Am2900MachineDefinition.getInstance().getMainMemoryDefinition(), name);
        }
 
+       @Override
+       public String getIDForSerializing(IdentifyParams idParams)
+       {
+               return "Am2900MainMemory";
+       }
+
        static
        {
-               LogicCoreAdapter.addComponentAdapter(new ModelAm2900MicroInstructionMemoryAdapter());
+               LogicCoreAdapter.addComponentAdapter(new ModelAm2900MainMemoryAdapter());
                IndirectModelComponentCreator.setComponentSupplier(ModelAm2900MainMemory.class.getCanonicalName(), (m, p, n) ->
                {
                        return new ModelAm2900MainMemory(m, n);
                });
        }
-
-       @Override
-       public String getIDForSerializing(IdentifyParams idParams)
-       {
-               return "Am2900MainMemory";
-       }
-
-}
+}
\ No newline at end of file