Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-06-01 07:35:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

GP-0: Fix event thread recording (found in Z3 test)

Browse Source
This commit is contained in:
Dan
2025-07-03 12:27:58 +00:00
parent 3e50533187
commit 980a80beb9
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/time/schedule/TraceSchedule.java
+15 -2
View File
@@ -526,9 +526,22 @@ public class TraceSchedule implements Comparable<TraceSchedule> {
* Get the last thread stepped by this schedule in the context of the given trace * Get the last thread stepped by this schedule in the context of the given trace
* *
* @param trace the trace containing the source snapshot and threads * @param trace the trace containing the source snapshot and threads
* @return the thread last stepped, or the "event thread" when no steps are taken * @return the thread last stepped, or the "event thread" when no steps are taken, or null
*/ */
public TraceThread getLastThread(Trace trace) { public TraceThread getLastThread(Trace trace) {
long lastKey = getLastThreadKey();
return lastKey == -1 ? getEventThread(trace) : trace.getThreadManager().getThread(lastKey);
}
/**
* Get the last thread stepped by this schedule in the context of the given trace
*
* @param trace the trace containing the source snapshot and threads
* @return the thread last stepped, or the "event thread" when no steps are taken
* @throws IllegalArgumentException if the last thread cannot be determined from this schedule
* and the given trace.
*/
public TraceThread requireLastThread(Trace trace) {
long lastKey = getLastThreadKey(); long lastKey = getLastThreadKey();
return Step.requireThread( return Step.requireThread(
lastKey == -1 ? getEventThread(trace) : trace.getThreadManager().getThread(lastKey), lastKey == -1 ? getEventThread(trace) : trace.getThreadManager().getThread(lastKey),
@@ -650,7 +663,7 @@ public class TraceSchedule implements Comparable<TraceSchedule> {
*/ */
public void finish(Trace trace, TraceSchedule position, PcodeMachine<?> machine, public void finish(Trace trace, TraceSchedule position, PcodeMachine<?> machine,
TaskMonitor monitor) throws CancelledException { TaskMonitor monitor) throws CancelledException {
TraceThread lastThread = position.getLastThread(trace); TraceThread lastThread = position.requireLastThread(trace);
Sequence remains = steps.relativize(position.steps); Sequence remains = steps.relativize(position.steps);
machine.setSoftwareInterruptMode(SwiMode.IGNORE_ALL); machine.setSoftwareInterruptMode(SwiMode.IGNORE_ALL);
if (remains.isNop()) { if (remains.isNop()) {