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());
}