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-923: Capturing relevant snap and stack before passing off to

Browse Source 
tx.exe
This commit is contained in:
Dan
2021-05-05 20:44:54 +00:00
parent 61c47a7663
commit a2b7fbfef2
3 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/model/DefaultStackRecorder.java
View File

@@ -16,6 +16,7 @@
package ghidra.app.plugin.core.debug.service.model;
import java.util.*;
import java.util.stream.Collectors;
import ghidra.app.plugin.core.debug.mapping.DebuggerMemoryMapper;
import ghidra.app.plugin.core.debug.service.model.interfaces.ManagedStackRecorder;
@@ -57,13 +58,17 @@ public class DefaultStackRecorder implements ManagedStackRecorder {
@Override
public void recordStack() {
long snap = recorder.getSnap();
Map<Integer, Address> pcsByLevel = stack.entrySet()
.stream()
.collect(Collectors.toMap(e -> e.getKey(), e -> {
return recorder.getMemoryMapper()
.targetToTrace(e.getValue().getProgramCounter());
}));
recorder.parTx.execute("Stack changed", () -> {
TraceStack traceStack = stackManager.getStack(thread, snap, true);
traceStack.setDepth(stackDepth(), false);
for (Map.Entry<Integer, TargetStackFrame> ent : stack.entrySet()) {
Address tracePc =
recorder.getMemoryMapper().targetToTrace(ent.getValue().getProgramCounter());
doRecordFrame(traceStack, ent.getKey(), tracePc);
for (Map.Entry<Integer, Address> ent : pcsByLevel.entrySet()) {
doRecordFrame(traceStack, ent.getKey(), ent.getValue());
}
}, thread.getPath());
}
@@ -82,6 +87,7 @@ public class DefaultStackRecorder implements ManagedStackRecorder {
}
public void recordFrame(TargetStackFrame frame) {
long snap = recorder.getSnap();
stack.put(getFrameLevel(frame), frame);
recorder.parTx.execute("Stack frame added", () -> {
DebuggerMemoryMapper memoryMapper = recorder.getMemoryMapper();
@@ -90,7 +96,7 @@ public class DefaultStackRecorder implements ManagedStackRecorder {
}
Address pc = frame.getProgramCounter();
Address tracePc = pc == null ? null : memoryMapper.targetToTrace(pc);
TraceStack traceStack = stackManager.getStack(thread, recorder.getSnap(), true);
TraceStack traceStack = stackManager.getStack(thread, snap, true);
doRecordFrame(traceStack, getFrameLevel(frame), tracePc);
}, thread.getPath());
}

10
Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/stack/DBTraceStack.java
View File

@@ -99,7 +99,10 @@ public class DBTraceStack extends DBAnnotatedObject implements TraceStack {
}
}
@DBAnnotatedField(column = THREAD_SNAP_COLUMN_NAME, indexed = true, codec = ThreadSnapDBFieldCodec.class)
@DBAnnotatedField(
column = THREAD_SNAP_COLUMN_NAME,
indexed = true,
codec = ThreadSnapDBFieldCodec.class)
private ThreadSnap threadSnap;
@DBAnnotatedField(column = FRAMES_COLUMN_NAME)
private long[] frameKeys;
@@ -109,7 +112,8 @@ public class DBTraceStack extends DBAnnotatedObject implements TraceStack {
private DBTraceThread thread;
private final List<DBTraceStackFrame> frames = new ArrayList<>();
public DBTraceStack(DBTraceStackManager manager, DBCachedObjectStore<?> store, DBRecord record) {
public DBTraceStack(DBTraceStackManager manager, DBCachedObjectStore<?> store,
DBRecord record) {
super(store, record);
this.manager = manager;
}
@@ -170,6 +174,8 @@ public class DBTraceStack extends DBAnnotatedObject implements TraceStack {
@Override
public void setDepth(int depth, boolean atInner) {
//System.err.println("setDepth(threadKey=" + thread.getKey() + "snap=" + getSnap() +
// ",depth=" + depth + ",inner=" + atInner + ");");
int curDepth = frameKeys == null ? 0 : frameKeys.length;
if (depth == curDepth) {
return;

2
Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/stack/DBTraceStackFrame.java
View File

@@ -103,6 +103,8 @@ public class DBTraceStackFrame extends DBAnnotatedObject
@Override
public void setProgramCounter(Address pc) {
//System.err.println("setPC(threadKey=" + stack.getThread().getKey() + ",snap=" +
// stack.getSnap() + ",level=" + level + ",pc=" + pc + ");");
manager.trace.assertValidAddress(pc);
try (LockHold hold = LockHold.lock(manager.lock.writeLock())) {
if (Objects.equals(this.pc, pc)) {