mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-19 16:40:38 -09:00
Code Issues Packages Projects Releases Wiki Activity

GP-2815: Fix watch read loop from incorrect state-changed events

Browse Source
This commit is contained in:
Dan
2022-11-14 15:31:56 -05:00
parent e19ac547c5
commit 96747a5108
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/DBTraceUtils.java
View File

@@ -495,26 +495,30 @@ public enum DBTraceUtils {
Map<R, V> toPut = new HashMap<>();
for (E entry : getIntersecting(prev, next)) {
R r = getRange(entry);
boolean precedesMin = getLower(r).compareTo(lower) < 0;
boolean succeedsMax = getUpper(r).compareTo(upper) > 0;
int cmpMin = getLower(r).compareTo(lower);
int cmpMax = getUpper(r).compareTo(upper);
boolean sameVal = Objects.equals(getValue(entry), value);
if (precedesMin && succeedsMax && sameVal) {
if (cmpMin <= 0 && cmpMax >= 0 && sameVal) {
return entry; // The value in this range is already set as specified
}
remove(entry);
if (precedesMin) {
if (cmpMin < 0) {
if (sameVal) {
// Expand the new entry to cover the one we just removed
lower = getLower(r);
}
else {
// Create a truncated entry to replace the one we just removed
toPut.put(toRange(getLower(r), prev), getValue(entry));
}
}
if (succeedsMax) {
if (cmpMax > 0) {
if (sameVal) {
// Expand the new entry to cover the one we just removed
upper = getUpper(r);
}
else {
// Create a truncated entry to replace the one we just removed
toPut.put(toRange(next, getUpper(r)), getValue(entry));
}
}

12
Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/memory/DBTraceMemorySpace.java
View File

@@ -295,7 +295,9 @@ public class DBTraceMemorySpace
if (state == null) {
throw new NullPointerException();
}
var l = new Object() {
boolean changed;
};
new AddressRangeMapSetter<Entry<TraceAddressSnapRange, TraceMemoryState>, TraceMemoryState>() {
@Override
protected AddressRange getRange(Entry<TraceAddressSnapRange, TraceMemoryState> entry) {
@@ -324,6 +326,8 @@ public class DBTraceMemorySpace
@Override
protected Entry<TraceAddressSnapRange, TraceMemoryState> put(AddressRange range,
TraceMemoryState value) {
// This should not get called if the range is already the desired state
l.changed = true;
if (value != TraceMemoryState.UNKNOWN) {
stateMapSpace.put(new ImmutableTraceAddressSnapRange(range, snap), value);
}
@@ -331,8 +335,10 @@ public class DBTraceMemorySpace
}
}.set(start, end, state);
trace.setChanged(new TraceChangeRecord<>(TraceMemoryStateChangeType.CHANGED, this,
new ImmutableTraceAddressSnapRange(start, end, snap, snap), state));
if (l.changed) {
trace.setChanged(new TraceChangeRecord<>(TraceMemoryStateChangeType.CHANGED, this,
new ImmutableTraceAddressSnapRange(start, end, snap, snap), state));
}
}
protected void checkState(TraceMemoryState state) {