X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.plugin.core%2Fsrc%2Fnet%2Fmograsim%2Fplugin%2Flaunch%2FMachineDebugTarget.java;h=328c58907599f22bcd19b01434cec7c25623958b;hb=0eb525202d3c871a2a20f789af1728248f3cff11;hp=5270c767195b8cc024e17fc30338a0fbb34673ec;hpb=a873ef940ba160f284ba6fa3fee1b9704bf68858;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 5270c767..328c5890 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,7 +1,5 @@
 package net.mograsim.plugin.launch;
 
-import java.util.Arrays;
-
 import org.eclipse.core.resources.IMarkerDelta;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.PlatformObject;
@@ -15,38 +13,33 @@ import org.eclipse.debug.core.model.IBreakpoint;
 import org.eclipse.debug.core.model.IDebugElement;
 import org.eclipse.debug.core.model.IDebugTarget;
 import org.eclipse.debug.core.model.IMemoryBlock;
+import org.eclipse.debug.core.model.IMemoryBlockExtension;
+import org.eclipse.debug.core.model.IMemoryBlockRetrievalExtension;
 import org.eclipse.debug.core.model.IProcess;
 import org.eclipse.debug.core.model.IStepFilters;
 import org.eclipse.debug.core.model.IThread;
 
+import net.mograsim.logic.model.LogicExecuter;
 import net.mograsim.machine.Machine;
+import net.mograsim.machine.MachineDefinition;
 import net.mograsim.plugin.MograsimActivator;
 
-public class MachineDebugTarget extends PlatformObject implements IDebugTarget
+public class MachineDebugTarget extends PlatformObject implements IDebugTarget, IMemoryBlockRetrievalExtension
 {
-	private final MachineProcess process;
-
-	public MachineDebugTarget(MachineProcess process)
-	{
-		this.process = process;
-
-		DebugPlugin.getDefault().addDebugEventListener(es -> Arrays.stream(es).filter(e -> e.getSource() == process).forEach(e ->
-		{
-			switch (e.getKind())
-			{
-			case DebugEvent.RESUME:
-				fireResumeEvent(e.getDetail());
-				break;
-			case DebugEvent.SUSPEND:
-				fireSuspendEvent(e.getDetail());
-				break;
-			case DebugEvent.TERMINATE:
-				fireTerminateEvent();
-				break;
-			default:
-				// ignore
-			}
-		}));
+	private final ILaunch launch;
+	private final Machine machine;
+	private final LogicExecuter exec;
+
+	private boolean running;
+
+	public MachineDebugTarget(ILaunch launch, MachineDefinition machineDefinition)
+	{
+		this.launch = launch;
+		this.machine = machineDefinition.createNew();
+		this.exec = new LogicExecuter(machine.getTimeline());
+
+		exec.startLiveExecution();
+		running = true;
 
 		getLaunch().addDebugTarget(this);
 		fireCreationEvent();
@@ -54,13 +47,13 @@ public class MachineDebugTarget extends PlatformObject implements IDebugTarget
 
 	public Machine getMachine()
 	{
-		return process.getMachine();
+		return machine;
 	}
 
 	@Override
 	public String getName() throws DebugException
 	{
-		return process.getName();
+		return "Mograsim machine \"" + machine.getDefinition().getId() + '"';
 	}
 
 	@Override
@@ -78,60 +71,77 @@ public class MachineDebugTarget extends PlatformObject implements IDebugTarget
 	@Override
 	public ILaunch getLaunch()
 	{
-		return process.getLaunch();
+		return launch;
 	}
 
 	public void setExecutionSpeed(double speed)
 	{
-		process.setExecutionSpeed(speed);
+		exec.setSpeedFactor(speed);
 	}
 
 	@Override
 	public boolean isSuspended()
 	{
-		return process.isSuspended();
+		return exec.isPaused();
 	}
 
 	@Override
 	public boolean canSuspend()
 	{
-		return process.canSuspend();
+		return !isTerminated() && !isSuspended();
 	}
 
 	@Override
 	public void suspend() throws DebugException
 	{
-		process.suspend();
+		if (isTerminated())
+			throwDebugException("Can't suspend a terminated MachineProcess");
+		if (isSuspended())
+			throwDebugException("Can't suspend a suspended MachineProcess");
+
+		exec.pauseLiveExecution();
+		fireSuspendEvent(DebugEvent.CLIENT_REQUEST);
 	}
 
 	@Override
 	public boolean canResume()
 	{
-		return process.canResume();
+		return !isTerminated() && isSuspended();
 	}
 
 	@Override
 	public void resume() throws DebugException
 	{
-		process.resume();
+		if (isTerminated())
+			throwDebugException("Can't resume a terminated MachineProcess");
+		if (!isSuspended())
+			throwDebugException("Can't resume a non-suspended MachineProcess");
+
+		exec.unpauseLiveExecution();
+		fireResumeEvent(DebugEvent.CLIENT_REQUEST);
 	}
 
 	@Override
 	public boolean isTerminated()
 	{
-		return process.isTerminated();
+		return !running;
 	}
 
 	@Override
 	public boolean canTerminate()
 	{
-		return process.canTerminate();
+		return !isTerminated();
 	}
 
 	@Override
 	public void terminate() throws DebugException
 	{
-		process.terminate();
+		if (isTerminated())
+			return;
+
+		exec.stopLiveExecution();
+		running = false;
+		fireTerminateEvent();
 	}
 
 	@Override
@@ -183,6 +193,7 @@ public class MachineDebugTarget extends PlatformObject implements IDebugTarget
 		return true;
 	}
 
+	@SuppressWarnings("deprecation") // TODO can we throw a DebugException instead?
 	@Override
 	public IMemoryBlock getMemoryBlock(long startAddress, long length) throws DebugException
 	{
@@ -190,9 +201,15 @@ public class MachineDebugTarget extends PlatformObject implements IDebugTarget
 	}
 
 	@Override
-	public MachineProcess getProcess()
+	public IMemoryBlockExtension getExtendedMemoryBlock(String expression, Object context) throws DebugException
 	{
-		return process;
+		return new MainMemoryBlockExtension(this, expression, context);
+	}
+
+	@Override
+	public IProcess getProcess()
+	{
+		return null;
 	}
 
 	@Override
@@ -225,9 +242,6 @@ public class MachineDebugTarget extends PlatformObject implements IDebugTarget
 		if (adapter == ILaunch.class)
 			return (T) getLaunch();
 
-		if (adapter == IProcess.class)
-			return (T) getProcess();
-
 		// CONTEXTLAUNCHING
 		if (adapter == ILaunchConfiguration.class)
 			return (T) getLaunch().getLaunchConfiguration();
@@ -280,4 +294,10 @@ public class MachineDebugTarget extends PlatformObject implements IDebugTarget
 	{
 		DebugPlugin.getDefault().fireDebugEventSet(new DebugEvent[] { event });
 	}
+
+	private static void throwDebugException(String message) throws DebugException
+	{
+		throw new DebugException(
+				new Status(IStatus.ERROR, MograsimActivator.PLUGIN_ID, DebugException.TARGET_REQUEST_FAILED, message, null));
+	}
 }
\ No newline at end of file