yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-03 17:59:46 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-5796_Dan_setEmuEventThread' into

Browse source 
patch (Closes #8293)
This commit is contained in:
Ryan Kurtz 2025-07-03 06:15:14 -04:00
commit f3a90f7887
3 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/time/SnapshotRow.java
View file

@ -182,7 +182,7 @@ public class SnapshotRow {
if (thread != null) { if (thread != null) {
return thread; return thread;
} }
return getTime().getEventThread(trace); return getTime().getLastThread(trace);
} }
public String getEventThreadName() { public String getEventThreadName() {

2
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/emulation/DebuggerEmulationServicePlugin.java
View file

@ -736,6 +736,8 @@ public class DebuggerEmulationServicePlugin extends Plugin implements DebuggerEm
destSnap.setDescription("Emulated"); destSnap.setDescription("Emulated");
try { try {
ce.emulator().writeDown(key.platform, destSnap.getKey(), key.time.getSnap()); ce.emulator().writeDown(key.platform, destSnap.getKey(), key.time.getSnap());
TraceThread lastThread = key.time.getLastThread(key.trace);
destSnap.setEventThread(lastThread);
} }
catch (Throwable e) { catch (Throwable e) {
Msg.showError(this, null, "Emulate", Msg.showError(this, null, "Emulate",

3
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/emulation/ProgramEmulationUtils.java
View file

@ -645,7 +645,8 @@ public class ProgramEmulationUtils {
pc.getAddressSpace().isOverlaySpace() ? List.of(pc.getAddressSpace()) pc.getAddressSpace().isOverlaySpace() ? List.of(pc.getAddressSpace())
: List.of(); : List.of();
loadExecutable(initial, program, overlays); loadExecutable(initial, program, overlays);
doLaunchEmulationThread(trace, snap, program, pc, pc); TraceThread thread = doLaunchEmulationThread(trace, snap, program, pc, pc);
initial.setEventThread(thread);
} }
trace.clearUndo(); trace.clearUndo();
success = true; success = true;