Made MemoryView to an Editor

[Mograsim.git] / plugins / net.mograsim.logic.model.am2900 / src / net / mograsim / logic / model / am2900 / machine / Am2900Machine.java

diff --git a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900Machine.java b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900Machine.java
index 5683b8e..ac1b237 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900Machine.java
+++ b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900Machine.java
@@ -2,26 +2,24 @@ package net.mograsim.logic.model.am2900.machine;
 
 import net.mograsim.logic.core.components.CoreClock;
 import net.mograsim.logic.core.timeline.Timeline;
-import net.mograsim.logic.core.types.Bit;
 import net.mograsim.logic.core.types.BitVector;
-import net.mograsim.logic.model.am2900.components.ModelAm2900MainMemory;
-import net.mograsim.logic.model.am2900.components.ModelAm2900MicroInstructionMemory;
 import net.mograsim.logic.model.model.LogicModel;
 import net.mograsim.logic.model.model.LogicModelModifiable;
 import net.mograsim.logic.model.model.components.ModelComponent;
+import net.mograsim.logic.model.model.components.atomic.ModelClock;
 import net.mograsim.logic.model.modeladapter.CoreModelParameters;
 import net.mograsim.logic.model.modeladapter.LogicCoreAdapter;
 import net.mograsim.logic.model.serializing.IndirectModelComponentCreator;
 import net.mograsim.machine.Machine;
 import net.mograsim.machine.MachineDefinition;
-import net.mograsim.machine.MainMemory;
 import net.mograsim.machine.Register;
+import net.mograsim.machine.mi.AssignableMicroInstructionMemory;
 import net.mograsim.machine.mi.MicroInstruction;
 import net.mograsim.machine.mi.MicroInstructionDefinition;
-import net.mograsim.machine.mi.MicroInstructionMemory;
 import net.mograsim.machine.mi.StandardMicroInstructionMemory;
 import net.mograsim.machine.mi.parameters.MicroInstructionParameter;
 import net.mograsim.machine.mi.parameters.ParameterClassification;
+import net.mograsim.machine.standard.memory.AssignableMainMemory;
 import net.mograsim.machine.standard.memory.WordAddressableMemory;
 
 public class Am2900Machine implements Machine
@@ -30,8 +28,8 @@ public class Am2900Machine implements Machine
        private LogicModelModifiable logicModel;
        private ModelComponent am2900;
        private Timeline timeline;
-       private MainMemory mainMemory;
-       private MicroInstructionMemory instMemory;
+       private AssignableMainMemory mainMemory;
+       private AssignableMicroInstructionMemory instMemory;
        private CoreClock clock;
 
        public Am2900Machine(LogicModelModifiable model, Am2900MachineDefinition am2900MachineDefinition)
@@ -43,12 +41,13 @@ public class Am2900Machine implements Machine
                CoreModelParameters params = new CoreModelParameters();
                params.gateProcessTime = 50;
                params.wireTravelTime = 10;
-               mainMemory = new WordAddressableMemory(am2900MachineDefinition.getMainMemoryDefinition());
-               instMemory = new StandardMicroInstructionMemory(am2900MachineDefinition.getMicroInstructionMemoryDefinition());
-               logicModel.getComponentBySubmodelPath("Am2900.Am2900MainMemory#0", ModelAm2900MainMemory.class).setMachine(this);
-               logicModel.getComponentBySubmodelPath("Am2900.Am2900MicroInstructionMemory#0", ModelAm2900MicroInstructionMemory.class)
-                               .setMachine(this);
+               mainMemory = new AssignableMainMemory(new WordAddressableMemory(am2900MachineDefinition.getMainMemoryDefinition()));
+               instMemory = new AssignableMicroInstructionMemory(
+                               new StandardMicroInstructionMemory(am2900MachineDefinition.getMicroInstructionMemoryDefinition()));
                timeline = LogicCoreAdapter.convert(logicModel, params);
+               am2900.setHighLevelState("ram.memory_binding", mainMemory);
+               am2900.setHighLevelState("mpm.memory_binding", instMemory);
+               clock = logicModel.getComponentBySubmodelPath("Am2900.Clock#0", ModelClock.class).getClock();
        }
 
        @Override
@@ -60,7 +59,6 @@ public class Am2900Machine implements Machine
        @Override
        public void reset()
        {
-               logicModel.getComponentByName("Am2900").setHighLevelState("c.out", BitVector.of(Bit.ZERO));
                MicroInstructionDefinition muiDef = getDefinition().getMicroInstructionMemoryDefinition().getMicroInstructionDefinition();
                ParameterClassification[] paramClassifications = muiDef.getParameterClassifications();
                MicroInstructionParameter[] defaultParams = muiDef.createDefaultInstruction().getParameters();
@@ -107,13 +105,13 @@ public class Am2900Machine implements Machine
        }
 
        @Override
-       public MainMemory getMainMemory()
+       public AssignableMainMemory getMainMemory()
        {
                return mainMemory;
        }
 
        @Override
-       public MicroInstructionMemory getMicroInstructionMemory()
+       public AssignableMicroInstructionMemory getMicroInstructionMemory()
        {
                return instMemory;
        }