Merge branch threads into development

[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 f705e74..352ce12 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
@@ -1,11 +1,17 @@
 package net.mograsim.logic.model.am2900.machine;
 
+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Set;
+import java.util.function.Consumer;
 
 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.model.LogicModel;
 import net.mograsim.logic.model.model.LogicModelModifiable;
 import net.mograsim.logic.model.model.components.ModelComponent;
@@ -27,7 +33,7 @@ import net.mograsim.machine.standard.memory.WordAddressableMemory;
 
 public class Am2900Machine implements Machine
 {
-       private Am2900MachineDefinition machineDefinition;
+       private AbstractAm2900MachineDefinition machineDefinition;
        private LogicModelModifiable logicModel;
        private ModelComponent am2900;
        private Timeline timeline;
@@ -37,14 +43,16 @@ public class Am2900Machine implements Machine
        private long activeInstructionAddress;
 
        private final Set<ActiveMicroInstructionChangedListener> amicListeners;
+       private final Map<Register, Map<Consumer<BitVector>, Consumer<Object>>> modelListenersPerRegisterListenerPerRegister;
 
-       public Am2900Machine(LogicModelModifiable model, Am2900MachineDefinition am2900MachineDefinition)
+       public Am2900Machine(LogicModelModifiable model, AbstractAm2900MachineDefinition am2900MachineDefinition)
        {
                this.machineDefinition = am2900MachineDefinition;
                this.logicModel = model;
                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;
@@ -81,7 +89,13 @@ public class Am2900Machine implements Machine
                MicroInstructionParameter[] defaultParams = muiDef.createDefaultInstruction().getParameters();
                defaultParams[19] = paramClassifications[19].parse("JZ");
                MicroInstruction jzMI = MicroInstruction.create(defaultParams);
-               logicModel.getComponentByName("Am2900").setHighLevelState("muir_2.q", jzMI.toBitVector());
+               am2900.setHighLevelState("muir_2.q", jzMI.toBitVector());
+               if (!machineDefinition.strict)
+               {
+                       for (Register r : machineDefinition.getRegisters())
+                               setRegister(r, BitVector.of(Bit.ZERO, r.getWidth()));
+                       // TODO reset latches?
+               }
        }
 
        @Override
@@ -107,18 +121,75 @@ public class Am2900Machine implements Machine
                return clock;
        }
 
+       // TODO too much code duplication
+
        @Override
        public BitVector getRegister(Register r)
        {
-               // TODO Auto-generated method stub
-               return null;
+               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;
        }
 
        @Override
        public void setRegister(Register r, BitVector value)
        {
-               // TODO Auto-generated method stub
+               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));
+               }
+       }
+
+       @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);
+               }
+       }
+
+       @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);
+               }
+       }
+
+       private static String getAm2901CellSuffix(Register r)
+       {
+               if (r instanceof QRegister)
+                       return "qreg.q";
+               if (r instanceof NumberedRegister)
+                       return "regs.c" + ((NumberedRegister) r).getIndexAsBitstring() + ".q";
+               throw new IllegalArgumentException("Not a register of an Am2900Machine: " + r);
        }
 
        @Override
@@ -141,8 +212,7 @@ public class Am2900Machine implements Machine
 
        private long getCurrentMicroInstructionAddress()
        {
-               // TODO: replace with highlevelstate
-               BitVector vector = logicModel.getWireBySubmodelPath("Am2900.wire_mpm_address").getWireValues();
+               BitVector vector = (BitVector) am2900.getHighLevelState("mpm_address");
                return vector.isBinary() ? vector.getUnsignedValueLong() : -1;
        }