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

GP-475: Completed the Debugger "Watches" plugin

Browse Source
This commit is contained in:
Dan
2020-12-10 11:35:28 -05:00
parent 29fe88b811
commit cd32ab60be
21 changed files with 1225 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,6 +41,7 @@ import ghidra.trace.model.TraceAddressSnapRange;
import ghidra.trace.model.memory.*;
import ghidra.trace.model.stack.TraceStackFrame;
import ghidra.trace.model.thread.TraceThread;
import ghidra.util.MathUtilities;
import ghidra.util.UnionAddressSetView;
import ghidra.util.database.DBOpenMode;
import ghidra.util.exception.DuplicateNameException;
@@ -258,7 +259,12 @@ public class DBTraceMemoryManager
@Override
public int getBytes(long snap, Address start, ByteBuffer buf) {
return delegateReadI(start.getAddressSpace(), m -> m.getBytes(snap, start, buf), 0);
return delegateReadI(start.getAddressSpace(), m -> m.getBytes(snap, start, buf), () -> {
Address max = start.getAddressSpace().getMaxAddress();
int len = MathUtilities.unsignedMin(buf.remaining(), max.subtract(start));
buf.position(buf.position() + len);
return len;
});
}
@Override

11
Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/space/DBTraceDelegatingManager.java
View File

@@ -105,6 +105,17 @@ public interface DBTraceDelegatingManager<M> {
}
}
default int delegateReadI(AddressSpace space, ToIntFunction<M> func, IntSupplier ifNull) {
checkIsInMemory(space);
try (LockHold hold = LockHold.lock(readLock())) {
M m = getForSpace(space, false);
if (m == null) {
return ifNull.getAsInt();
}
return func.applyAsInt(m);
}
}
default boolean delegateReadB(AddressSpace space, Predicate<M> func, boolean ifNull) {
checkIsInMemory(space);
try (LockHold hold = LockHold.lock(readLock())) {

9
Ghidra/Debug/Framework-TraceModeling/src/test/java/ghidra/trace/database/memory/AbstractDBTraceMemoryManagerTest.java
View File

@@ -831,8 +831,7 @@ public abstract class AbstractDBTraceMemoryManagerTest
assertEquals(expected, collectAsMap(memory.getStates(3, range(0x3000, 0x5000))));
ByteBuffer read = ByteBuffer.allocate(4);
// NOTE: 0 is returned because the space is no longer active....
assertEquals(0, memory.getBytes(3, addr(0x4000), read));
assertEquals(4, memory.getBytes(3, addr(0x4000), read));
assertArrayEquals(arr(0, 0, 0, 0), read.array());
}
@@ -860,8 +859,7 @@ public abstract class AbstractDBTraceMemoryManagerTest
assertEquals(expected, collectAsMap(memory.getStates(3, range(0x3000, 0x5000))));
ByteBuffer read = ByteBuffer.allocate(4);
// NOTE: 0 is returned because the space is no longer active....
assertEquals(0, memory.getBytes(3, addr(0x4000), read));
assertEquals(4, memory.getBytes(3, addr(0x4000), read));
assertArrayEquals(arr(0, 0, 0, 0), read.array());
}
@@ -889,8 +887,7 @@ public abstract class AbstractDBTraceMemoryManagerTest
assertEquals(expected, collectAsMap(memory.getStates(3, range(0x3000, 0x5000))));
ByteBuffer read = ByteBuffer.allocate(4);
// NOTE: 0 is returned because the space is no longer active....
assertEquals(0, memory.getBytes(3, addr(0x4000), read));
assertEquals(4, memory.getBytes(3, addr(0x4000), read));
assertArrayEquals(arr(0, 0, 0, 0), read.array());
trace.redo();