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=f705e74ee41bb102e2bea0d4022799a81bde50bf;hb=ff24f544796d5cc8898c6353d479b7eb3662e86f;hp=fc0ec2bd9f46c134717bbc9e13dfabb6c65a4894;hpb=f30643a40e01919e4544891bb8bd92fa37a5b5a7;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 fc0ec2bd..f705e74e 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,8 +1,10 @@
 package net.mograsim.logic.model.am2900.machine;
 
+import java.util.HashSet;
+import java.util.Set;
+
 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.model.LogicModel;
 import net.mograsim.logic.model.model.LogicModelModifiable;
@@ -13,7 +15,6 @@ import net.mograsim.logic.model.modeladapter.LogicCoreAdapter;
 import net.mograsim.logic.model.serializing.IndirectModelComponentCreator;
 import net.mograsim.machine.Machine;
 import net.mograsim.machine.MachineDefinition;
-import net.mograsim.machine.MainMemory;
 import net.mograsim.machine.Register;
 import net.mograsim.machine.mi.AssignableMicroInstructionMemory;
 import net.mograsim.machine.mi.MicroInstruction;
@@ -21,6 +22,7 @@ import net.mograsim.machine.mi.MicroInstructionDefinition;
 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;
 
 public class Am2900Machine implements Machine
@@ -29,9 +31,12 @@ public class Am2900Machine implements Machine
 	private LogicModelModifiable logicModel;
 	private ModelComponent am2900;
 	private Timeline timeline;
-	private MainMemory mainMemory;
+	private AssignableMainMemory mainMemory;
 	private AssignableMicroInstructionMemory instMemory;
 	private CoreClock clock;
+	private long activeInstructionAddress;
+
+	private final Set<ActiveMicroInstructionChangedListener> amicListeners;
 
 	public Am2900Machine(LogicModelModifiable model, Am2900MachineDefinition am2900MachineDefinition)
 	{
@@ -39,16 +44,27 @@ public class Am2900Machine implements Machine
 		this.logicModel = model;
 		this.am2900 = IndirectModelComponentCreator.createComponent(logicModel,
 				"resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/Am2900.json", "Am2900");
+		this.amicListeners = new HashSet<>();
+
 		CoreModelParameters params = new CoreModelParameters();
 		params.gateProcessTime = 50;
 		params.wireTravelTime = 10;
-		mainMemory = new WordAddressableMemory(am2900MachineDefinition.getMainMemoryDefinition());
+		mainMemory = new AssignableMainMemory(new WordAddressableMemory(am2900MachineDefinition.getMainMemoryDefinition()));
 		instMemory = new AssignableMicroInstructionMemory(
 				new StandardMicroInstructionMemory(am2900MachineDefinition.getMicroInstructionMemoryDefinition()));
 		timeline = LogicCoreAdapter.convert(logicModel, params);
 		am2900.setHighLevelState("ram.memory_binding", mainMemory);
 		am2900.setHighLevelState("mpm.memory_binding", instMemory);
 		clock = logicModel.getComponentBySubmodelPath("Am2900.Clock#0", ModelClock.class).getClock();
+		clock.registerObserver(c ->
+		{
+			if (clock.isOn())
+			{
+				long oldAddress = activeInstructionAddress;
+				activeInstructionAddress = getCurrentMicroInstructionAddress();
+				notifyActiveMicroInstructionChangedListeners(oldAddress, activeInstructionAddress);
+			}
+		});
 	}
 
 	@Override
@@ -60,7 +76,6 @@ public class Am2900Machine implements Machine
 	@Override
 	public void reset()
 	{
-		logicModel.getComponentByName("Am2900").setHighLevelState("c.out", BitVector.of(Bit.ZERO));
 		MicroInstructionDefinition muiDef = getDefinition().getMicroInstructionMemoryDefinition().getMicroInstructionDefinition();
 		ParameterClassification[] paramClassifications = muiDef.getParameterClassifications();
 		MicroInstructionParameter[] defaultParams = muiDef.createDefaultInstruction().getParameters();
@@ -107,7 +122,7 @@ public class Am2900Machine implements Machine
 	}
 
 	@Override
-	public MainMemory getMainMemory()
+	public AssignableMainMemory getMainMemory()
 	{
 		return mainMemory;
 	}
@@ -117,4 +132,34 @@ public class Am2900Machine implements Machine
 	{
 		return instMemory;
 	}
+
+	@Override
+	public long getActiveMicroInstructionAddress()
+	{
+		return activeInstructionAddress;
+	}
+
+	private long getCurrentMicroInstructionAddress()
+	{
+		// TODO: replace with highlevelstate
+		BitVector vector = logicModel.getWireBySubmodelPath("Am2900.wire_mpm_address").getWireValues();
+		return vector.isBinary() ? vector.getUnsignedValueLong() : -1;
+	}
+
+	@Override
+	public void addActiveMicroInstructionChangedListener(ActiveMicroInstructionChangedListener listener)
+	{
+		amicListeners.add(listener);
+	}
+
+	@Override
+	public void removeActiveMicroInstructionChangedListener(ActiveMicroInstructionChangedListener listener)
+	{
+		amicListeners.remove(listener);
+	}
+
+	private void notifyActiveMicroInstructionChangedListeners(long oldAddress, long newAddress)
+	{
+		amicListeners.forEach(l -> l.instructionChanged(oldAddress, newAddress));
+	}
 }
\ No newline at end of file