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

debugger: follow on to GP-601, fix for Threads

Browse source
This commit is contained in:
d-millar 2021-04-12 19:33:28 +00:00
parent 25170eced2
commit 2d0743b785
3 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/model/iface1/DbgModelTargetActiveScope.java
View file

@ -52,7 +52,7 @@ public interface DbgModelTargetActiveScope extends DbgModelTargetObject, TargetA
while (cur != null) { while (cur != null) {
if (cur instanceof DbgModelSelectableObject) { if (cur instanceof DbgModelSelectableObject) {
DbgModelSelectableObject sel = (DbgModelSelectableObject) cur; DbgModelSelectableObject sel = (DbgModelSelectableObject) cur;
System.err.println("requestActivation " + obj); //System.err.println("requestActivation " + obj);
return sel.setActive(); return sel.setActive();
} }
if (cur instanceof DbgModelTargetObject) { if (cur instanceof DbgModelTargetObject) {

2
Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/model/iface1/DbgModelTargetFocusScope.java
View file

@ -61,7 +61,7 @@ public interface DbgModelTargetFocusScope extends DbgModelTargetObject, TargetFo
while (cur != null) { while (cur != null) {
if (cur instanceof DbgModelSelectableObject) { if (cur instanceof DbgModelSelectableObject) {
DbgModelSelectableObject sel = (DbgModelSelectableObject) cur; DbgModelSelectableObject sel = (DbgModelSelectableObject) cur;
System.err.println("requestFocus " + obj); //System.err.println("requestFocus " + obj);
setFocus(sel); setFocus(sel);
return AsyncUtils.NIL; return AsyncUtils.NIL;
} }

14
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/model/TraceObjectManager.java
View file

@ -117,6 +117,7 @@ public class TraceObjectManager {
this::attributesChangedBreakpointLocation); this::attributesChangedBreakpointLocation);
putAttributesHandler(TargetRegister.class, this::attributesChangedRegister); putAttributesHandler(TargetRegister.class, this::attributesChangedRegister);
putAttributesHandler(TargetStackFrame.class, this::attributesChangedStackFrame); putAttributesHandler(TargetStackFrame.class, this::attributesChangedStackFrame);
putAttributesHandler(TargetThread.class, this::attributesChangedThread);
putRemHandler(TargetProcess.class, this::removeProcess); putRemHandler(TargetProcess.class, this::removeProcess);
putRemHandler(TargetThread.class, this::removeThread); putRemHandler(TargetThread.class, this::removeThread);
@ -515,6 +516,19 @@ public class TraceObjectManager {
} }
} }
public void attributesChangedThread(TargetObject thread, Map<String, ?> added) {
if (added.containsKey(TargetObject.DISPLAY_ATTRIBUTE_NAME)) {
ManagedThreadRecorder rec = recorder.getThreadRecorderForSuccessor(thread);
if (rec != null) {
String name = (String) added.get(TargetObject.DISPLAY_ATTRIBUTE_NAME);
try (UndoableTransaction tid =
UndoableTransaction.start(rec.getTrace(), "Renamed thread", true)) {
rec.getTraceThread().setName(name);
}
}
}
}
public void elementsChangedBreakpointLocationContainer(TargetObject locationContainer, public void elementsChangedBreakpointLocationContainer(TargetObject locationContainer,
Map<String, ?> added) { Map<String, ?> added) {
TargetObject x = findThreadOrProcess(locationContainer); TargetObject x = findThreadOrProcess(locationContainer);