Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-21 19:42:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

GP-3706: updated review changes

Browse Source 
GP-3706: Fixed emulator resume button after Pcode step
This commit is contained in:
GhidraHamster 2023-09-28 19:46:52 +00:00
parent ebaaed7d53
commit 73fa8e19d9
3 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/control/DebuggerControlPlugin.java
View File

@ -56,6 +56,7 @@ import ghidra.trace.model.Trace.TraceObjectChangeType;
import ghidra.trace.model.target.TraceObject; import ghidra.trace.model.target.TraceObject;
import ghidra.trace.model.target.TraceObjectValue; import ghidra.trace.model.target.TraceObjectValue;
import ghidra.trace.model.time.schedule.Scheduler; import ghidra.trace.model.time.schedule.Scheduler;
import ghidra.trace.model.time.schedule.TraceSchedule;
import ghidra.util.*; import ghidra.util.*;
@PluginInfo( @PluginInfo(
@ -875,7 +876,8 @@ public class DebuggerControlPlugin extends AbstractDebuggerPlugin
return; return;
} }
DebuggerCoordinates current = this.current; DebuggerCoordinates current = this.current;
emulationService.backgroundRun(current.getPlatform(), current.getTime(), TraceSchedule time = current.getTime();
emulationService.backgroundRun(current.getPlatform(), time.steppedForward(null, 0),
Scheduler.oneThread(current.getThread())).thenAcceptAsync(r -> { Scheduler.oneThread(current.getThread())).thenAcceptAsync(r -> {
traceManager.activate(current.time(r.schedule()), ActivationCause.USER); traceManager.activate(current.time(r.schedule()), ActivationCause.USER);
}, AsyncUtils.SWING_EXECUTOR).exceptionally(ex -> { }, AsyncUtils.SWING_EXECUTOR).exceptionally(ex -> {

22
Ghidra/Debug/Debugger/src/test/java/ghidra/app/plugin/core/debug/gui/control/DebuggerControlPluginTest.java
View File

@ -306,6 +306,28 @@ public class DebuggerControlPluginTest extends AbstractGhidraHeadedDebuggerGUITe
assertTrue(controlPlugin.actionEmulateResume.isEnabled()); assertTrue(controlPlugin.actionEmulateResume.isEnabled());
} }
/**
* Tests the UI so it does not error when the user presses resume
* after already stepped into a pcode instruction.
*/
@Test
public void testEmulateResumeActionAfterPcodeStep() throws Throwable {
TraceThread thread = createToyLoopTrace();
controlService.setCurrentMode(tb.trace, ControlMode.RW_EMULATOR);
traceManager.activateThread(thread);
traceManager.activateTime(TraceSchedule.parse("0:.t0-2"));
waitForSwing();
performEnabledAction(null, controlPlugin.actionEmulateResume, true);
waitForPass(() -> assertFalse(controlPlugin.actionEmulateResume.isEnabled()));
CachedEmulator ce = Unique.assertOne(emulationService.getBusyEmulators());
ce.emulator().setSuspended(true);
waitForTasks();
assertTrue(controlPlugin.actionEmulateResume.isEnabled());
}
@Test @Test
public void testEmulateInterruptAction() throws Throwable { public void testEmulateInterruptAction() throws Throwable {
TraceThread thread = createToyLoopTrace(); TraceThread thread = createToyLoopTrace();

1
certification.local.manifest
View File

@ -7,4 +7,5 @@ DevGuide.md||GHIDRA||||END|
LICENSE||GHIDRA||||END| LICENSE||GHIDRA||||END|
NOTICE||GHIDRA||||END| NOTICE||GHIDRA||||END|
README.md||GHIDRA||||END| README.md||GHIDRA||||END|
ghidra.repos.config||GHIDRA||||END|
gradle.properties||GHIDRA||||END| gradle.properties||GHIDRA||||END|