mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2025-10-03 09:49:23 +02:00
Merge remote-tracking branch 'origin/GP-5796_Dan_setEmuEventThread' into
patch (Closes #8293)
This commit is contained in:
commit
f3a90f7887
3 changed files with 5 additions and 2 deletions
|
@ -182,7 +182,7 @@ public class SnapshotRow {
|
|||
if (thread != null) {
|
||||
return thread;
|
||||
}
|
||||
return getTime().getEventThread(trace);
|
||||
return getTime().getLastThread(trace);
|
||||
}
|
||||
|
||||
public String getEventThreadName() {
|
||||
|
|
|
@ -736,6 +736,8 @@ public class DebuggerEmulationServicePlugin extends Plugin implements DebuggerEm
|
|||
destSnap.setDescription("Emulated");
|
||||
try {
|
||||
ce.emulator().writeDown(key.platform, destSnap.getKey(), key.time.getSnap());
|
||||
TraceThread lastThread = key.time.getLastThread(key.trace);
|
||||
destSnap.setEventThread(lastThread);
|
||||
}
|
||||
catch (Throwable e) {
|
||||
Msg.showError(this, null, "Emulate",
|
||||
|
|
|
@ -645,7 +645,8 @@ public class ProgramEmulationUtils {
|
|||
pc.getAddressSpace().isOverlaySpace() ? List.of(pc.getAddressSpace())
|
||||
: List.of();
|
||||
loadExecutable(initial, program, overlays);
|
||||
doLaunchEmulationThread(trace, snap, program, pc, pc);
|
||||
TraceThread thread = doLaunchEmulationThread(trace, snap, program, pc, pc);
|
||||
initial.setEventThread(thread);
|
||||
}
|
||||
trace.clearUndo();
|
||||
success = true;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue