projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MemoryEditor's Amount field defaults to 100
[Mograsim.git]
/
plugins
/
net.mograsim.plugin.core
/
src
/
net
/
mograsim
/
plugin
/
views
/
SimulationView.java
diff --git
a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/views/SimulationView.java
b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/views/SimulationView.java
index
4d118a9
..
f801fb8
100644
(file)
--- a/
plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/views/SimulationView.java
+++ b/
plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/views/SimulationView.java
@@
-47,6
+47,7
@@
public class SimulationView extends ViewPart
private static final double SIM_SPEED_SCALE_STEP_FACTOR_LOG = Math.log(SIM_SPEED_SCALE_STEP_FACTOR);
private final Set<Control> controlsToDisableWhenNoMachinePresent;
private static final double SIM_SPEED_SCALE_STEP_FACTOR_LOG = Math.log(SIM_SPEED_SCALE_STEP_FACTOR);
private final Set<Control> controlsToDisableWhenNoMachinePresent;
+ private Button sbseButton;
private Scale simSpeedScale;
private DoubleInput simSpeedInput;
private Composite contextDependentControlsParent;
private Scale simSpeedScale;
private DoubleInput simSpeedInput;
private Composite contextDependentControlsParent;
@@
-116,7
+117,7
@@
public class SimulationView extends ViewPart
c.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
c.setLayout(new GridLayout(7, false));
c.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
c.setLayout(new GridLayout(7, false));
-
Button
sbseButton = new Button(c, SWT.CHECK);
+ sbseButton = new Button(c, SWT.CHECK);
controlsToDisableWhenNoMachinePresent.add(sbseButton);
sbseButton.setText("Step by step execution");
controlsToDisableWhenNoMachinePresent.add(sbseButton);
sbseButton.setText("Step by step execution");
@@
-282,6
+283,8
@@
public class SimulationView extends ViewPart
debugTarget.removeExecutionSpeedListener(executionSpeedListener);
debugTarget.getMachine().getMicroInstructionMemory().deregisterCellModifiedListener(memCellListener);
debugTarget.getMachine().getClock().deregisterObserver(clockObserver);
debugTarget.removeExecutionSpeedListener(executionSpeedListener);
debugTarget.getMachine().getMicroInstructionMemory().deregisterCellModifiedListener(memCellListener);
debugTarget.getMachine().getClock().deregisterObserver(clockObserver);
+ if (sbseButton != null && !sbseButton.isDisposed())
+ sbseButton.setSelection(false);
}
}
}
}
@@
-296,6
+299,7
@@
public class SimulationView extends ViewPart
public void dispose()
{
deregisterMachineDependentListeners();
public void dispose()
{
deregisterMachineDependentListeners();
+ contentProvider.setMachine(null);
DebugUITools.getDebugContextManager().removeDebugContextListener(debugContextListener);
super.dispose();
}
DebugUITools.getDebugContextManager().removeDebugContextListener(debugContextListener);
super.dispose();
}