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 33c29f0..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,20 +16,23 @@ 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;
 import net.mograsim.machine.mi.MicroInstructionDefinition;
+import net.mograsim.machine.mi.StandardMPROM;
 import net.mograsim.machine.mi.StandardMicroInstructionMemory;
 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
 {
@@ -37,8 +40,10 @@ 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;
        private CoreClock clock;
        private long activeInstructionAddress;
 
@@ -52,16 +57,20 @@ 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()));
                timeline = LogicCoreAdapter.convert(logicModel, params);
                am2900.setHighLevelState("ram.memory_binding", mainMemory);
                am2900.setHighLevelState("mpm.memory_binding", instMemory);
+               am2900.setHighLevelState("mprom.memory_binding", mprom);
                clock = logicModel.getComponentBySubmodelPath("Am2900.Clock#0", ModelClock.class).getClock();
                clock.registerObserver(c ->
                {
@@ -89,7 +98,7 @@ public class Am2900Machine implements Machine
                defaultParams[19] = paramClassifications[19].parse("JZ");
                MicroInstruction jzMI = MicroInstruction.create(defaultParams);
                am2900.setHighLevelState("muir_2.q", jzMI.toBitVector());
-               Bit regsValue = machineDefinition.strict ? Bit.U : Bit.ZERO;
+               Bit regsValue = machineDefinition.expert ? Bit.U : Bit.ZERO;
                setRegistersTo(machineDefinition.getUnsortedRegisters(), regsValue);
                setRegisterGroupTo(machineDefinition.getRegisterGroups(), regsValue);
                // TODO reset latches?
@@ -128,6 +137,12 @@ public class Am2900Machine implements Machine
                return timeline;
        }
 
+       @Override
+       public CoreModelParameters getCoreModelParameters()
+       {
+               return params;
+       }
+
        @Override
        public CoreClock getClock()
        {
@@ -177,6 +192,12 @@ public class Am2900Machine implements Machine
                return instMemory;
        }
 
+       @Override
+       public AssignableMPROM getMPROM()
+       {
+               return mprom;
+       }
+
        @Override
        public long getActiveMicroInstructionAddress()
        {