Marked fields of Am2900Machine as final

[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 a7f7379..3d3d6c3 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,6 +16,7 @@ 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;
@@ -35,14 +36,15 @@ import net.mograsim.machine.registers.RegisterGroup;
 
 public class Am2900Machine implements Machine
 {
-       private AbstractAm2900MachineDefinition machineDefinition;
-       private LogicModelModifiable logicModel;
-       private ModelComponent am2900;
-       private Timeline timeline;
-       private AssignableMainMemory mainMemory;
-       private AssignableMicroInstructionMemory instMemory;
-       private AssignableMPROM mprom;
-       private CoreClock clock;
+       private final AbstractAm2900MachineDefinition machineDefinition;
+       private final LogicModelModifiable logicModel;
+       private final ModelComponent am2900;
+       private final Timeline timeline;
+       private final CoreModelParameters params;
+       private final AssignableMainMemory mainMemory;
+       private final AssignableMicroInstructionMemory instMemory;
+       private final AssignableMPROM mprom;
+       private final CoreClock clock;
        private long activeInstructionAddress;
 
        private final Set<ActiveMicroInstructionChangedListener> amicListeners;
@@ -55,10 +57,12 @@ 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;
+               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()));
@@ -133,6 +137,12 @@ public class Am2900Machine implements Machine
                return timeline;
        }
 
+       @Override
+       public CoreModelParameters getCoreModelParameters()
+       {
+               return params;
+       }
+
        @Override
        public CoreClock getClock()
        {