X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.plugin.core%2Fsrc%2Fnet%2Fmograsim%2Fplugin%2Flaunch%2FMachineDebugTarget.java;h=ad0441bfdae1be838cedf03df8a735f408c1ec17;hb=a5e96c79d684392d7fdcf149736c2d95200e6fda;hp=328c58907599f22bcd19b01434cec7c25623958b;hpb=0eb525202d3c871a2a20f789af1728248f3cff11;p=Mograsim.git

diff --git a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/launch/MachineDebugTarget.java b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/launch/MachineDebugTarget.java
index 328c5890..ad0441bf 100644
--- a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/launch/MachineDebugTarget.java
+++ b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/launch/MachineDebugTarget.java
@@ -1,5 +1,9 @@
 package net.mograsim.plugin.launch;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Consumer;
+
 import org.eclipse.core.resources.IMarkerDelta;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.PlatformObject;
@@ -23,26 +27,40 @@ import net.mograsim.logic.model.LogicExecuter;
 import net.mograsim.machine.Machine;
 import net.mograsim.machine.MachineDefinition;
 import net.mograsim.plugin.MograsimActivator;
+import net.mograsim.plugin.launch.MachineLaunchConfigType.MachineLaunchParams;
 
 public class MachineDebugTarget extends PlatformObject implements IDebugTarget, IMemoryBlockRetrievalExtension
 {
+	private final static boolean USE_PSEUDO_THREAD = true;
+
 	private final ILaunch launch;
 	private final Machine machine;
 	private final LogicExecuter exec;
+	private final MachineThread thread;
 
 	private boolean running;
 
-	public MachineDebugTarget(ILaunch launch, MachineDefinition machineDefinition)
+	private final List<Consumer<Double>> executionSpeedListeners;
+
+	private final MachineLaunchParams launchParams;
+
+	public MachineDebugTarget(ILaunch launch, MachineLaunchParams launchParams, MachineDefinition machineDefinition)
 	{
 		this.launch = launch;
 		this.machine = machineDefinition.createNew();
 		this.exec = new LogicExecuter(machine.getTimeline());
 
+		this.executionSpeedListeners = new ArrayList<>();
+		this.launchParams = launchParams;
+
 		exec.startLiveExecution();
 		running = true;
 
 		getLaunch().addDebugTarget(this);
 		fireCreationEvent();
+
+		// create after creating ourself
+		this.thread = USE_PSEUDO_THREAD ? new MachineThread(this) : null;
 	}
 
 	public Machine getMachine()
@@ -74,9 +92,23 @@ public class MachineDebugTarget extends PlatformObject implements IDebugTarget,
 		return launch;
 	}
 
+	public MachineLaunchParams getLaunchParams()
+	{
+		return launchParams;
+	}
+
+	public double getExecutionSpeed()
+	{
+		return exec.getSpeedFactor();
+	}
+
 	public void setExecutionSpeed(double speed)
 	{
-		exec.setSpeedFactor(speed);
+		if (getExecutionSpeed() != speed)
+		{
+			exec.setSpeedFactor(speed);
+			callExecutionSpeedListener(speed);
+		}
 	}
 
 	@Override
@@ -215,13 +247,28 @@ public class MachineDebugTarget extends PlatformObject implements IDebugTarget,
 	@Override
 	public boolean hasThreads() throws DebugException
 	{
-		return false;
+		return USE_PSEUDO_THREAD;
 	}
 
 	@Override
 	public IThread[] getThreads() throws DebugException
 	{
-		return new IThread[0];
+		return thread == null ? new IThread[0] : new IThread[] { thread };
+	}
+
+	public void addExecutionSpeedListener(Consumer<Double> executionSpeedListener)
+	{
+		executionSpeedListeners.add(executionSpeedListener);
+	}
+
+	public void removeExecutionSpeedListener(Consumer<Double> executionSpeedListener)
+	{
+		executionSpeedListeners.remove(executionSpeedListener);
+	}
+
+	private void callExecutionSpeedListener(double executionSpeed)
+	{
+		executionSpeedListeners.forEach(l -> l.accept(executionSpeed));
 	}
 
 	@SuppressWarnings("unchecked")