Skip to content

Ghidra is a software reverse engineering (SRE) framework

GP-5796: Write event thread down in emulated snapshots.

Danf74b783b3e2b
diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/time/SnapshotRow.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/time/SnapshotRow.java
index 87c389db13..7525014d7f 100644
--- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/time/SnapshotRow.java
+++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/time/SnapshotRow.java
@@ -182,7 +182,7 @@ public class SnapshotRow {
if (thread != null) {
return thread;
}
- return getTime().getEventThread(trace);
+ return getTime().getLastThread(trace);
}
public String getEventThreadName() {
diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/emulation/DebuggerEmulationServicePlugin.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/emulation/DebuggerEmulationServicePlugin.java
index 400a3d163b..4ffab140c4 100644
--- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/emulation/DebuggerEmulationServicePlugin.java
+++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/emulation/DebuggerEmulationServicePlugin.java
@@ -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",
diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/emulation/ProgramEmulationUtils.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/emulation/ProgramEmulationUtils.java
index 226873b399..07e7e7f5aa 100644
--- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/emulation/ProgramEmulationUtils.java
+++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/emulation/ProgramEmulationUtils.java
@@ -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;