X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.plugin.core%2Fsrc%2Fnet%2Fmograsim%2Fplugin%2Flaunch%2FMachineDebugTarget.java;h=03fe7fdd5424671571eda8ae51ecc108ab065081;hb=d031a0434011f1e8577de35ba1a5c0b6649beef4;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..03fe7fdd 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,6 +27,7 @@ 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 { @@ -32,12 +37,19 @@ public class MachineDebugTarget extends PlatformObject implements IDebugTarget, private boolean running; - public MachineDebugTarget(ILaunch launch, MachineDefinition machineDefinition) + private final List> 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; @@ -74,9 +86,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 @@ -224,6 +250,21 @@ public class MachineDebugTarget extends PlatformObject implements IDebugTarget, return new IThread[0]; } + 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") @Override public T getAdapter(Class adapter)