mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/patch'

Browse Source
This commit is contained in:
Ryan Kurtz
2026-01-09 12:46:08 -05:00
parent 21e73383cf c1a088c69b
commit 478abffe5b
3 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/pcode/exec/trace/TraceEmulationIntegration.java
View File

@@ -795,6 +795,9 @@ public enum TraceEmulationIntegration {
return set;
}
AddressSpace space = set.getMinAddress().getAddressSpace();
if (space.isUniqueSpace()) {
return set;
}
PcodeTraceDataAccess acc = space.isRegisterSpace() ? getRegAccess(thread) : memAccess;
return handlerFor(piece).readUninitialized(acc, thread, piece, set);
}

5
Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/time/DBTraceTimeManager.java
View File

@@ -235,13 +235,14 @@ public class DBTraceTimeManager implements TraceTimeManager, DBTraceManager {
@Override
public TraceSnapshot findSnapshotWithNearestPrefix(TraceSchedule schedule) {
long version = trace.getEmulatorCacheVersion();
Optional<? extends TraceSnapshot> exists = getSnapshotsWithSchedule(schedule).stream()
TraceSchedule noPSteps = schedule.dropPSteps();
Optional<? extends TraceSnapshot> exists = getSnapshotsWithSchedule(noPSteps).stream()
.filter(s -> s.getVersion() >= version)
.findFirst();
if (exists.isPresent()) {
return exists.get();
}
return doFindNearest(schedule.dropPSteps(), version);
return doFindNearest(noPSteps, version);
}
@Override