development/ghidra
development/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra synced 2024-08-27 13:03:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-0_Dan_testFixes-2022-12-06-1'

Browse source
This commit is contained in:
Ryan Kurtz 2022-12-06 10:47:21 -05:00
parent 885df9f812 3aa34c032f
commit a9b9835f82
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Ghidra/Debug/Debugger/src/main/java/ghidra/app/services/TraceRecorder.java
View file

@ -554,6 +554,9 @@ public interface TraceRecorder {
TraceMemorySpace regs =
getTrace().getMemoryManager().getMemoryRegisterSpace(thread, frameLevel, false);
Register parent = isRegisterOnTarget(platform, thread, frameLevel, register);
if (parent == null) {
throw new IllegalArgumentException("Cannot find register " + register + " on target");
}
rv = TraceRegisterUtils.combineWithTraceParentRegisterValue(parent, rv, platform, getSnap(),
regs, true);
return writeThreadRegisters(platform, thread, frameLevel, Map.of(rv.getRegister(), rv));

2
Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/util/TraceRegisterUtils.java
View file

@ -154,7 +154,7 @@ public enum TraceRegisterUtils {
return rv.getRegisterValue(parent);
}
if (requireKnown) {
if (TraceMemoryState.KNOWN != regs.getState(platform, snap, reg.getBaseRegister())) {
if (TraceMemoryState.KNOWN != regs.getState(platform, snap, parent)) {
throw new IllegalStateException("Must fetch " + parent + " before setting " + reg);
}
}