yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-05 02:39:44 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/patch'

Browse source 
Conflicts:
	Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/DBTraceUtils.java
This commit is contained in:
Ryan Kurtz 2022-11-16 02:32:34 -05:00
commit 045efef45c
3 changed files with 20 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/DBTraceUtils.java
View file

@ -19,7 +19,8 @@ import java.lang.reflect.Field;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.URL; import java.net.URL;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.*; import java.util.Iterator;
import java.util.Objects;
import java.util.function.BiConsumer; import java.util.function.BiConsumer;
import java.util.function.Consumer; import java.util.function.Consumer;

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

14
Ghidra/Debug/ProposedUtils/src/main/java/generic/RangeMapSetter.java
View file

@ -188,26 +188,30 @@ public abstract class RangeMapSetter<E, D, R, V> {
Map<R, V> toPut = new HashMap<>(); Map<R, V> toPut = new HashMap<>();
for (E entry : getIntersecting(prev, next)) { for (E entry : getIntersecting(prev, next)) {
R r = getRange(entry); R r = getRange(entry);
boolean precedesMin = compare(getLower(r), lower) < 0; int cmpMin = compare(getLower(r), lower);
boolean succeedsMax = compare(getUpper(r), upper) > 0; int cmpMax = compare(getUpper(r), upper);
boolean sameVal = Objects.equals(getValue(entry), value); 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 return entry; // The value in this range is already set as specified
} }
toRemove.add(entry); toRemove.add(entry);
if (precedesMin) { if (cmpMin < 0) {
if (sameVal) { if (sameVal) {
// Expand the new entry to cover the one we just removed
lower = getLower(r); lower = getLower(r);
} }
else { else {
// Create a truncated entry to replace the one we just removed
toPut.put(toSpan(getLower(r), prev), getValue(entry)); toPut.put(toSpan(getLower(r), prev), getValue(entry));
} }
} }
if (succeedsMax) { if (cmpMax > 0) {
if (sameVal) { if (sameVal) {
// Expand the new entry to cover the one we just removed
upper = getUpper(r); upper = getUpper(r);
} }
else { else {
// Create a truncated entry to replace the one we just removed
toPut.put(toSpan(next, getUpper(r)), getValue(entry)); toPut.put(toSpan(next, getUpper(r)), getValue(entry));
} }
} }