Introduced Machine.getCoreModelParameters
[Mograsim.git] / plugins / net.mograsim.logic.model.am2900 / src / net / mograsim / logic / model / am2900 / machine / Am2900Machine.java
index 352ce12..4abe8dc 100644 (file)
@@ -1,8 +1,7 @@
 package net.mograsim.logic.model.am2900.machine;
 
-import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Map;
+import java.util.List;
 import java.util.Set;
 import java.util.function.Consumer;
 
@@ -10,26 +9,30 @@ 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.machine.registers.NumberedRegister;
-import net.mograsim.logic.model.am2900.machine.registers.QRegister;
+import net.mograsim.logic.model.am2900.machine.registers.Am2900Register;
+import net.mograsim.logic.model.am2900.machine.registers.muInstrRegister;
 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.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.Register;
+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.standard.memory.AssignableMainMemory;
-import net.mograsim.machine.standard.memory.WordAddressableMemory;
+import net.mograsim.machine.registers.Register;
+import net.mograsim.machine.registers.RegisterGroup;
 
 public class Am2900Machine implements Machine
 {
@@ -37,13 +40,14 @@ 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;
 
        private final Set<ActiveMicroInstructionChangedListener> amicListeners;
-       private final Map<Register, Map<Consumer<BitVector>, Consumer<Object>>> modelListenersPerRegisterListenerPerRegister;
 
        public Am2900Machine(LogicModelModifiable model, AbstractAm2900MachineDefinition am2900MachineDefinition)
        {
@@ -52,17 +56,21 @@ public class Am2900Machine implements Machine
                this.am2900 = IndirectModelComponentCreator.createComponent(logicModel,
                                "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/Am2900.json", "Am2900");
                this.amicListeners = new HashSet<>();
-               this.modelListenersPerRegisterListenerPerRegister = new HashMap<>();
 
-               CoreModelParameters params = new CoreModelParameters();
-               params.gateProcessTime = 50;
-               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 ->
                {
@@ -90,11 +98,25 @@ public class Am2900Machine implements Machine
                defaultParams[19] = paramClassifications[19].parse("JZ");
                MicroInstruction jzMI = MicroInstruction.create(defaultParams);
                am2900.setHighLevelState("muir_2.q", jzMI.toBitVector());
-               if (!machineDefinition.strict)
+               Bit regsValue = machineDefinition.expert ? Bit.U : Bit.ZERO;
+               setRegistersTo(machineDefinition.getUnsortedRegisters(), regsValue);
+               setRegisterGroupTo(machineDefinition.getRegisterGroups(), regsValue);
+               // TODO reset latches?
+       }
+
+       private void setRegistersTo(List<Register> registers, Bit value)
+       {
+               for (Register r : registers)
+                       if (r != muInstrRegister.instance)// don't reset; sometimes causes a glitch
+                               setRegister(r, BitVector.of(value, r.getWidth()));
+       }
+
+       private void setRegisterGroupTo(List<RegisterGroup> registerGroups, Bit value)
+       {
+               for (RegisterGroup rg : registerGroups)
                {
-                       for (Register r : machineDefinition.getRegisters())
-                               setRegister(r, BitVector.of(Bit.ZERO, r.getWidth()));
-                       // TODO reset latches?
+                       setRegistersTo(rg.getRegisters(), value);
+                       setRegisterGroupTo(rg.getSubGroups(), value);
                }
        }
 
@@ -115,80 +137,46 @@ public class Am2900Machine implements Machine
                return timeline;
        }
 
+       @Override
+       public CoreModelParameters getCoreModelParameters()
+       {
+               return params;
+       }
+
        @Override
        public CoreClock getClock()
        {
                return clock;
        }
 
-       // TODO too much code duplication
-
        @Override
        public BitVector getRegister(Register r)
        {
-               String am2901CellSuffix = getAm2901CellSuffix(r);
-               BitVector result = BitVector.of();
-               for (int i = 0; i < 16; i += 4)
-               {
-                       String hlsID = String.format("am2901_%d-%d.%s", (i + 3), i, am2901CellSuffix);
-                       result = result.concat((BitVector) am2900.getHighLevelState(hlsID));
-               }
-               return result;
+               return castAm2900Register(r).read(am2900);
        }
 
        @Override
        public void setRegister(Register r, BitVector value)
        {
-               String am2901CellSuffix = getAm2901CellSuffix(r);
-               for (int i = 0; i < 16; i += 4)
-               {
-                       String hlsID = String.format("am2901_%d-%d.%s", (i + 3), i, am2901CellSuffix);
-                       am2900.setHighLevelState(hlsID, value.subVector(i, i + 4));
-               }
+               castAm2900Register(r).write(am2900, value);
        }
 
        @Override
        public void addRegisterListener(Register r, Consumer<BitVector> listener)
        {
-               Map<Consumer<BitVector>, Consumer<Object>> modelListenersPerRegisterListener = modelListenersPerRegisterListenerPerRegister
-                               .computeIfAbsent(r, k -> new HashMap<>());
-               if (modelListenersPerRegisterListener.containsKey(listener))
-                       return;
-
-               Consumer<Object> modelListener = v -> listener.accept(getRegister(r));
-               String am2901CellSuffix = getAm2901CellSuffix(r);
-               for (int i = 0; i < 16; i += 4)
-               {
-                       String hlsID = String.format("am2901_%d-%d.%s", (i + 3), i, am2901CellSuffix);
-                       am2900.addHighLevelStateListener(hlsID, modelListener);
-               }
+               castAm2900Register(r).addListener(am2900, listener);
        }
 
        @Override
        public void removeRegisterListener(Register r, Consumer<BitVector> listener)
        {
-               Map<Consumer<BitVector>, Consumer<Object>> modelListenersPerRegisterListener = modelListenersPerRegisterListenerPerRegister.get(r);
-               if (modelListenersPerRegisterListener == null)
-                       return;
-
-               Consumer<Object> modelListener = modelListenersPerRegisterListener.get(listener);
-               if (modelListener == null)
-                       return;
-
-               String am2901CellSuffix = getAm2901CellSuffix(r);
-               for (int i = 0; i < 16; i += 4)
-               {
-                       String hlsID = String.format("am2901_%d-%d.%s", (i + 3), i, am2901CellSuffix);
-                       am2900.removeHighLevelStateListener(hlsID, modelListener);
-               }
+               castAm2900Register(r).removeListener(am2900, listener);
        }
 
-       private static String getAm2901CellSuffix(Register r)
+       private static Am2900Register castAm2900Register(Register r)
        {
-               if (r instanceof QRegister)
-                       return "qreg.q";
-               if (r instanceof NumberedRegister)
-                       return "regs.c" + ((NumberedRegister) r).getIndexAsBitstring() + ".q";
+               if (r instanceof Am2900Register)
+                       return (Am2900Register) r;
                throw new IllegalArgumentException("Not a register of an Am2900Machine: " + r);
        }
 
@@ -204,6 +192,12 @@ public class Am2900Machine implements Machine
                return instMemory;
        }
 
+       @Override
+       public AssignableMPROM getMPROM()
+       {
+               return mprom;
+       }
+
        @Override
        public long getActiveMicroInstructionAddress()
        {