mirror of
https://github.com/NationalSecurityAgency/ghidra
synced 2024-08-27 13:03:12 +00:00
GP-0: Fix watch test
This commit is contained in:
parent
a5c26f49ca
commit
3aa34c032f
|
@ -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));
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue