Introduced Machine.getCoreModelParameters

[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 00c4d6d..4abe8dc 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
@@ -16,10 +16,13 @@ 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.CoreModelParameters.CoreModelParametersBuilder;
 import net.mograsim.logic.model.modeladapter.LogicCoreAdapter;
 import net.mograsim.logic.model.serializing.IndirectModelComponentCreator;
+import net.mograsim.machine.AssignableMainMemory;
 import net.mograsim.machine.Machine;
 import net.mograsim.machine.MachineDefinition;
+import net.mograsim.machine.StandardMainMemory;
 import net.mograsim.machine.mi.AssignableMPROM;
 import net.mograsim.machine.mi.AssignableMicroInstructionMemory;
 import net.mograsim.machine.mi.MicroInstruction;
@@ -30,8 +33,6 @@ import net.mograsim.machine.mi.parameters.MicroInstructionParameter;
 import net.mograsim.machine.mi.parameters.ParameterClassification;
 import net.mograsim.machine.registers.Register;
 import net.mograsim.machine.registers.RegisterGroup;
-import net.mograsim.machine.standard.memory.AssignableMainMemory;
-import net.mograsim.machine.standard.memory.WordAddressableMemory;
 
 public class Am2900Machine implements Machine
 {
@@ -39,6 +40,7 @@ public class Am2900Machine implements Machine
        private LogicModelModifiable logicModel;
        private ModelComponent am2900;
        private Timeline timeline;
+       private CoreModelParameters params;
        private AssignableMainMemory mainMemory;
        private AssignableMicroInstructionMemory instMemory;
        private AssignableMPROM mprom;
@@ -55,11 +57,13 @@ public class Am2900Machine implements Machine
                                "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/Am2900.json", "Am2900");
                this.amicListeners = new HashSet<>();
 
-               CoreModelParameters params = new CoreModelParameters();
-               params.gateProcessTime = 50;
-               params.hardcodedComponentProcessTime = params.gateProcessTime * 5;
-               params.wireTravelTime = 10;
-               mainMemory = new AssignableMainMemory(new WordAddressableMemory(am2900MachineDefinition.getMainMemoryDefinition()));
+               CoreModelParametersBuilder paramsBuilder = new CoreModelParametersBuilder();
+               paramsBuilder.gateProcessTime = 50;
+               paramsBuilder.hardcodedComponentProcessTime = paramsBuilder.gateProcessTime * 5;
+               paramsBuilder.wireTravelTime = 10;
+               params = paramsBuilder.build();
+
+               mainMemory = new AssignableMainMemory(new StandardMainMemory(am2900MachineDefinition.getMainMemoryDefinition()));
                instMemory = new AssignableMicroInstructionMemory(
                                new StandardMicroInstructionMemory(am2900MachineDefinition.getMicroInstructionMemoryDefinition()));
                mprom = new AssignableMPROM(new StandardMPROM(am2900MachineDefinition.getMPROMDefinition()));
@@ -133,6 +137,12 @@ public class Am2900Machine implements Machine
                return timeline;
        }
 
+       @Override
+       public CoreModelParameters getCoreModelParameters()
+       {
+               return params;
+       }
+
        @Override
        public CoreClock getClock()
        {