X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.logic.model.am2900%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fmachine%2FAm2900Machine.java;h=352ce123d7d0bab0f34c894a437933b656593403;hb=2d1f3e4780616f3b638133a243fcdb7a6738baf9;hp=ab0643f1fb790448537ce8c171d86910ff0c0670;hpb=c356c613955c3ea57d2379fb76f9bd07f1e30170;p=Mograsim.git

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 ab0643f1..352ce123 100644
--- 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,10 +1,14 @@
 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;
@@ -29,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;
@@ -39,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;
@@ -84,6 +90,12 @@ 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)
+		{
+			for (Register r : machineDefinition.getRegisters())
+				setRegister(r, BitVector.of(Bit.ZERO, r.getWidth()));
+			// TODO reset latches?
+		}
 	}
 
 	@Override
@@ -109,16 +121,12 @@ public class Am2900Machine implements Machine
 		return clock;
 	}
 
+	// TODO too much code duplication
+
 	@Override
 	public BitVector getRegister(Register r)
 	{
-		String am2901CellSuffix;
-		if (r instanceof QRegister)
-			am2901CellSuffix = "qreg.q";
-		else if (r instanceof NumberedRegister)
-			am2901CellSuffix = "regs.c" + ((NumberedRegister) r).getIndexAsBitstring() + ".q";
-		else
-			throw new IllegalArgumentException("Not a register of an Am2900Machine: " + r);
+		String am2901CellSuffix = getAm2901CellSuffix(r);
 		BitVector result = BitVector.of();
 		for (int i = 0; i < 16; i += 4)
 		{
@@ -131,13 +139,7 @@ public class Am2900Machine implements Machine
 	@Override
 	public void setRegister(Register r, BitVector value)
 	{
-		String am2901CellSuffix;
-		if (r instanceof QRegister)
-			am2901CellSuffix = "qreg.q";
-		else if (r instanceof NumberedRegister)
-			am2901CellSuffix = "regs.c" + ((NumberedRegister) r).getIndexAsBitstring() + ".q";
-		else
-			throw new IllegalArgumentException("Not a register of an Am2900Machine: " + 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);
@@ -145,6 +147,51 @@ public class Am2900Machine implements Machine
 		}
 	}
 
+	@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
 	public AssignableMainMemory getMainMemory()
 	{