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/GP-0_Dan_testFixes20211201-1' into Ghidra_10.1

Browse Source
This commit is contained in:
ghidra1
2021-12-01 11:06:44 -05:00
parent cdb32a3128 a328ae29b9
commit 612d5b7ce0
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,6 +19,7 @@ import com.google.common.collect.RangeSet;
import com.google.common.primitives.UnsignedLong;
import ghidra.program.model.address.*;
import ghidra.program.model.lang.Language;
import ghidra.trace.model.Trace;
import ghidra.trace.model.memory.TraceMemorySpace;
import ghidra.trace.model.thread.TraceThread;
@@ -27,8 +28,9 @@ public abstract class AbstractCheckedTraceCachedWriteBytesPcodeExecutorState
extends TraceCachedWriteBytesPcodeExecutorState {
protected class CheckedCachedSpace extends CachedSpace {
public CheckedCachedSpace(AddressSpace space, TraceMemorySpace source, long snap) {
super(space, source, snap);
public CheckedCachedSpace(Language language, AddressSpace space, TraceMemorySpace source,
long snap) {
super(language, space, source, snap);
}
@Override
@@ -54,7 +56,7 @@ public abstract class AbstractCheckedTraceCachedWriteBytesPcodeExecutorState
@Override
protected CachedSpace newSpace(AddressSpace space, TraceMemorySpace source, long snap) {
return new CheckedCachedSpace(space, source, snap);
return new CheckedCachedSpace(language, space, source, snap);
}
protected abstract int checkUninitialized(TraceMemorySpace source, Address start, int size,

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

@@ -100,11 +100,14 @@ public class TraceCachedWriteBytesPcodeExecutorState
protected static class CachedSpace {
protected final SemisparseByteArray cache = new SemisparseByteArray();
protected final RangeSet<UnsignedLong> written = TreeRangeSet.create();
protected final Language language; // For logging diagnostic
protected final AddressSpace space;
protected final TraceMemorySpace source;
protected final long snap;
public CachedSpace(AddressSpace space, TraceMemorySpace source, long snap) {
public CachedSpace(Language language, AddressSpace space, TraceMemorySpace source,
long snap) {
this.language = language;
this.space = space;
this.source = source;
this.snap = snap;
@@ -166,8 +169,6 @@ public class TraceCachedWriteBytesPcodeExecutorState
}
protected Set<Register> getRegs(AddressSet set) {
// TODO: Should pass in language instead?
Language language = source.getTrace().getBaseLanguage();
Set<Register> regs = new TreeSet<>();
for (AddressRange rng : set) {
Register r = language.getRegister(rng.getMinAddress(), (int) rng.getLength());
@@ -297,7 +298,7 @@ public class TraceCachedWriteBytesPcodeExecutorState
}
protected CachedSpace newSpace(AddressSpace space, TraceMemorySpace source, long snap) {
return new CachedSpace(space, source, snap);
return new CachedSpace(language, space, source, snap);
}
@Override