X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.machine%2Fsrc%2Fnet%2Fmograsim%2Fmachine%2FMachine.java;h=66408ced7be6c1f6d998d1f05049ff272a5ecb3f;hb=0c404f876557865fb7361ca458ac90caf41afe19;hp=f9d851dca6a2894bf12e9efb19d4fc3523416d34;hpb=6c32f347005a369359a68c09b7e9ac2f4a1eab0f;p=Mograsim.git

diff --git a/plugins/net.mograsim.machine/src/net/mograsim/machine/Machine.java b/plugins/net.mograsim.machine/src/net/mograsim/machine/Machine.java
index f9d851dc..66408ced 100644
--- a/plugins/net.mograsim.machine/src/net/mograsim/machine/Machine.java
+++ b/plugins/net.mograsim.machine/src/net/mograsim/machine/Machine.java
@@ -1,10 +1,14 @@
 package net.mograsim.machine;
 
+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.BitVector;
 import net.mograsim.logic.model.model.LogicModel;
 import net.mograsim.machine.mi.AssignableMicroInstructionMemory;
+import net.mograsim.machine.registers.Register;
+import net.mograsim.machine.standard.memory.AssignableMainMemory;
 
 public interface Machine
 {
@@ -14,16 +18,31 @@ public interface Machine
 
 	LogicModel getModel();
 
+	// TODO replace with HLS references
 	CoreClock getClock();
 
 	BitVector getRegister(Register r);
 
 	void setRegister(Register r, BitVector value);
 
+	void addRegisterListener(Register r, Consumer<BitVector> listener);
+
+	void removeRegisterListener(Register r, Consumer<BitVector> listener);
+
 	Timeline getTimeline();
 
-	MainMemory getMainMemory();
+	AssignableMainMemory getMainMemory();
 
 	AssignableMicroInstructionMemory getMicroInstructionMemory();
 
-}
+	void addActiveMicroInstructionChangedListener(ActiveMicroInstructionChangedListener listener);
+
+	void removeActiveMicroInstructionChangedListener(ActiveMicroInstructionChangedListener listener);
+
+	long getActiveMicroInstructionAddress();
+
+	public interface ActiveMicroInstructionChangedListener
+	{
+		public void instructionChanged(long oldAddress, long newAddress);
+	}
+}
\ No newline at end of file