X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.plugin.core%2Fsrc%2Fnet%2Fmograsim%2Fplugin%2Flaunch%2FMachineDebugTarget.java;h=e1efb5538cb81a8989324c0be7c9b93be4a8dc20;hb=79fe4ef5f67bdf3b7a9d8002d1759ce87b3f90be;hp=a060bd5dfa9262cdc512c9b1ff1290c2ddd133bf;hpb=90562c65d0eb70c77a3447e4186f0b848b00d6ec;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 a060bd5d..e1efb553 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; @@ -26,23 +30,33 @@ import net.mograsim.plugin.MograsimActivator; 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; + private final List> executionSpeedListeners; + public MachineDebugTarget(ILaunch launch, MachineDefinition machineDefinition) { this.launch = launch; this.machine = machineDefinition.createNew(); this.exec = new LogicExecuter(machine.getTimeline()); + this.executionSpeedListeners = new ArrayList<>(); + exec.startLiveExecution(); running = true; getLaunch().addDebugTarget(this); fireCreationEvent(); + + // create after creating ourself + this.thread = USE_PSEUDO_THREAD ? new MachineThread(this) : null; } public Machine getMachine() @@ -82,7 +96,10 @@ public class MachineDebugTarget extends PlatformObject implements IDebugTarget, public void setExecutionSpeed(double speed) { if (getExecutionSpeed() != speed) + { exec.setSpeedFactor(speed); + callExecutionSpeedListener(speed); + } } @Override @@ -221,13 +238,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 executionSpeedListener) + { + executionSpeedListeners.add(executionSpeedListener); + } + + public void removeExecutionSpeedListener(Consumer executionSpeedListener) + { + executionSpeedListeners.remove(executionSpeedListener); + } + + private void callExecutionSpeedListener(double executionSpeed) + { + executionSpeedListeners.forEach(l -> l.accept(executionSpeed)); } @SuppressWarnings("unchecked")