mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2026-06-02 01:47:02 +08:00
Merge remote-tracking branch 'origin/GP-4618_Dan_fixThreadsStackTrace' into Ghidra_11.1
This commit is contained in:
+3
-3
@@ -22,8 +22,7 @@ import ghidra.program.model.address.*;
|
|||||||
import ghidra.program.model.lang.Register;
|
import ghidra.program.model.lang.Register;
|
||||||
import ghidra.program.model.lang.RegisterValue;
|
import ghidra.program.model.lang.RegisterValue;
|
||||||
import ghidra.program.util.ProgramLocation;
|
import ghidra.program.util.ProgramLocation;
|
||||||
import ghidra.trace.model.Trace;
|
import ghidra.trace.model.*;
|
||||||
import ghidra.trace.model.TraceAddressSnapRange;
|
|
||||||
import ghidra.trace.model.guest.TracePlatform;
|
import ghidra.trace.model.guest.TracePlatform;
|
||||||
import ghidra.trace.model.memory.TraceMemorySpace;
|
import ghidra.trace.model.memory.TraceMemorySpace;
|
||||||
import ghidra.trace.model.memory.TraceMemoryState;
|
import ghidra.trace.model.memory.TraceMemoryState;
|
||||||
@@ -65,7 +64,8 @@ public interface RegisterLocationTrackingSpec extends LocationTrackingSpec, Loca
|
|||||||
if (reg == null) {
|
if (reg == null) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
if (!thread.getLifespan().contains(snap)) {
|
Lifespan lifespan = thread.getLifespan();
|
||||||
|
if (lifespan == null || !lifespan.contains(snap)) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
TraceMemorySpace regs = reg.getAddressSpace().isRegisterSpace()
|
TraceMemorySpace regs = reg.getAddressSpace().isRegisterSpace()
|
||||||
|
|||||||
Reference in New Issue
Block a user