Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-26 02:17:11 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/debugger'

Browse Source
This commit is contained in:
ghidra1
2021-04-30 10:44:27 -04:00
parent a40370ab7a c70496680d
commit f19811622b
15 changed files with 131 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/model/impl/DbgModelTargetMemoryRegionImpl.java
+5
View File
@@ -90,6 +90,7 @@ public class DbgModelTargetMemoryRegionImpl extends DbgModelTargetObjectImpl
isExec = region.isExec();
this.changeAttributes(List.of(), List.of(), Map.of( //
DISPLAY_ATTRIBUTE_NAME, computeDisplay(region), //
MEMORY_ATTRIBUTE_NAME, memory, //
RANGE_ATTRIBUTE_NAME, doGetRange(section), //
READABLE_ATTRIBUTE_NAME, isReadable(), //
@@ -110,6 +111,10 @@ public class DbgModelTargetMemoryRegionImpl extends DbgModelTargetObjectImpl
), "Initialized");
}
protected String computeDisplay(DbgModuleMemory region) {
return region.getType() + " " + getName(); // NB. Name will contain []s
}
protected AddressRange doGetRange(DbgModuleMemory s) {
AddressSpace addressSpace = getModel().getAddressSpace("ram");
Address min = addressSpace.getAddress(s.getVmaStart());
Ghidra/Debug/Debugger-agent-gdb/src/main/java/agent/gdb/manager/impl/GdbManagerImpl.java
+4 -4
View File
@@ -15,7 +15,7 @@
*/
package agent.gdb.manager.impl;
import static ghidra.async.AsyncUtils.*;
import static ghidra.async.AsyncUtils.loop;
import java.io.*;
import java.util.*;
@@ -654,6 +654,9 @@ public class GdbManagerImpl implements GdbManager {
if (gdbWaiter != null) {
gdbWaiter.interrupt();
}
if (gdb != null) {
gdb.destroyForcibly();
}
try {
if (cliThread != null) {
cliThread.interrupt();
@@ -667,9 +670,6 @@ public class GdbManagerImpl implements GdbManager {
catch (IOException e) {
Msg.error(this, "Problem closing PTYs to GDB.");
}
if (gdb != null) {
gdb.destroyForcibly();
}
DebuggerModelTerminatingException reason =
new DebuggerModelTerminatingException(GDB_IS_TERMINATING);
cmdLock.dispose(reason);
Ghidra/Debug/Debugger-agent-gdb/src/main/java/agent/gdb/model/impl/GdbModelTargetMemoryRegion.java
+3 -3
View File
@@ -52,10 +52,10 @@ public class GdbModelTargetMemoryRegion
protected static String computeDisplay(GdbMemoryMapping mapping) {
// NOTE: This deviates from GDB's table display, as it'd be confusing in isolation
if (mapping.getObjfile() == null || mapping.getObjfile().length() == 0) {
return String.format("[0x%x-0x%x] (no file)", mapping.getStart(), mapping.getEnd());
return String.format("?? [0x%x-0x%x]", mapping.getStart(), mapping.getEnd());
}
return String.format("[0x%x-0x%x] %s(0x%x)", mapping.getStart(), mapping.getEnd(),
mapping.getObjfile(), mapping.getOffset());
return String.format("%s [0x%x-0x%x] (0x%x)", mapping.getObjfile(), mapping.getStart(),
mapping.getEnd(), mapping.getOffset());
}
protected AddressRangeImpl range;
Ghidra/Debug/Debugger-agent-gdb/src/main/java/agent/gdb/pty/local/LocalProcessPtySession.java
+2
View File
@@ -16,6 +16,7 @@
package agent.gdb.pty.local;
import agent.gdb.pty.PtySession;
import ghidra.util.Msg;
/**
* A pty session consisting of a local process and its descendants
@@ -25,6 +26,7 @@ public class LocalProcessPtySession implements PtySession {
public LocalProcessPtySession(Process process) {
this.process = process;
Msg.info(this, "local Pty session. PID = " + process.pid());
}
@Override
Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbInferiorAttacherTest.java
+8
View File
@@ -15,6 +15,8 @@
*/
package agent.gdb.model.invm;
import org.junit.Ignore;
import agent.gdb.model.AbstractModelForGdbInferiorAttacherTest;
public class InVmModelForGdbInferiorAttacherTest extends AbstractModelForGdbInferiorAttacherTest {
@@ -22,4 +24,10 @@ public class InVmModelForGdbInferiorAttacherTest extends AbstractModelForGdbInfe
public ModelHost modelHost() throws Throwable {
return new InVmGdbModelHost();
}
@Override
@Ignore("Some hang. I don't know why")
public void testAttachableContainerIsWhereExpected() throws Throwable {
// nop
}
}
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/breakpoint/DebuggerBreakpointMarkerPlugin.java
+14 -9
View File
@@ -173,7 +173,8 @@ public class DebuggerBreakpointMarkerPlugin extends Plugin
protected static long computeDefaultLength(ActionContext context,
Collection<TraceBreakpointKind> selected) {
if (selected.contains(TraceBreakpointKind.HW_EXECUTE) ||
if (selected.isEmpty() ||
selected.contains(TraceBreakpointKind.HW_EXECUTE) ||
selected.contains(TraceBreakpointKind.SW_EXECUTE)) {
return 1;
}
@@ -529,11 +530,13 @@ public class DebuggerBreakpointMarkerPlugin extends Plugin
}
Set<LogicalBreakpoint> bs = breakpointService.getBreakpointsAt(loc);
if (bs == null || bs.isEmpty()) {
Set<TraceBreakpointKind> kinds = getApplicableKindsFromContext(context);
if (kinds.isEmpty()) {
Msg.showError(this, null, NAME, "Cannot determine appropriate breakpoint kind");
Set<TraceBreakpointKind> supported = getSupportedKindsFromContext(context);
if (supported.isEmpty()) {
Msg.showError(this, null, NAME,
"It seems this target does not support breakpoints.");
return;
}
Set<TraceBreakpointKind> kinds = computeDefaultKinds(context, supported);
long length = computeDefaultLength(context, kinds);
placeBreakpointDialog.prompt(tool, breakpointService, NAME, loc, length, kinds);
return;
@@ -939,14 +942,13 @@ public class DebuggerBreakpointMarkerPlugin extends Plugin
return true;
}
protected Set<TraceBreakpointKind> getApplicableKindsFromContext(ActionContext context) {
protected Set<TraceBreakpointKind> getSupportedKindsFromContext(ActionContext context) {
Set<TraceRecorder> recorders = getRecordersFromContext(context);
if (recorders.isEmpty()) {
return computeDefaultKinds(context, EnumSet.allOf(TraceBreakpointKind.class));
return EnumSet.allOf(TraceBreakpointKind.class);
}
return recorders.stream()
.flatMap(rec -> computeDefaultKinds(context,
rec.getSupportedBreakpointKinds()).stream())
.flatMap(rec -> rec.getSupportedBreakpointKinds().stream())
.collect(Collectors.toSet());
}
@@ -978,7 +980,10 @@ public class DebuggerBreakpointMarkerPlugin extends Plugin
Address start = bEnt.getKey();
for (Map.Entry<Long, Enablement> eEnt : en.entrySet()) {
Address end = start.add(eEnt.getKey() - 1);
marks.get(eEnt.getValue()).add(start, end);
MarkerSet set = marks.get(eEnt.getValue());
if (set != null) {
set.add(start, end);
}
}
}
}
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/breakpoint/DebuggerPlaceBreakpointDialog.java
+1 -2
View File
@@ -87,12 +87,11 @@ public class DebuggerPlaceBreakpointDialog extends DialogComponentProvider {
addCancelButton();
}
@SuppressWarnings("hiding")
public void prompt(PluginTool tool, DebuggerLogicalBreakpointService service, String title,
ProgramLocation loc, long length, Collection<TraceBreakpointKind> kinds) {
this.service = service;
this.program = loc.getProgram();
this.address = loc.getAddress();
this.address = loc.getAddress(); // byte address can be confusing here.
this.length = length;
this.kinds = Set.copyOf(kinds);
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/listing/DebuggerListingProvider.java
+43 -12
View File
@@ -30,6 +30,7 @@ import javax.swing.JLabel;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import org.apache.commons.collections4.ComparatorUtils;
import org.apache.commons.lang3.StringUtils;
import org.jdom.Element;
@@ -72,7 +73,6 @@ import ghidra.pcode.utils.Utils;
import ghidra.program.model.address.*;
import ghidra.program.model.lang.Language;
import ghidra.program.model.listing.Program;
import ghidra.program.model.mem.MemoryBlock;
import ghidra.program.util.ProgramLocation;
import ghidra.program.util.ProgramSelection;
import ghidra.trace.model.*;
@@ -656,7 +656,7 @@ public class DebuggerListingProvider extends CodeViewerProvider implements Listi
setSubTitle(computeSubTitle());
}
protected TraceSection getSmallestSectionAt(Address address) {
protected TraceSection getNearestSectionContaining(Address address) {
if (current.getView() == null) {
return null;
}
@@ -666,8 +666,36 @@ public class DebuggerListingProvider extends CodeViewerProvider implements Listi
if (sections.isEmpty()) {
return null;
}
sections.sort(Comparator.comparing(s -> s.getRange().getLength()));
return sections.get(0);
// TODO: DB's R-Tree could probably do this natively
sections.sort(ComparatorUtils.chainedComparator(List.of(
Comparator.comparing(s -> s.getRange().getMinAddress()),
Comparator.comparing(s -> -s.getRange().getLength()))));
return sections.get(sections.size() - 1);
}
protected TraceModule getNearestModuleContaining(Address address) {
if (current.getView() == null) {
return null;
}
Trace trace = current.getTrace();
List<TraceModule> modules =
new ArrayList<>(trace.getModuleManager().getModulesAt(current.getSnap(), address));
if (modules.isEmpty()) {
return null;
}
// TODO: DB's R-Tree could probably do this natively
modules.sort(ComparatorUtils.chainedComparator(List.of(
Comparator.comparing(m -> m.getRange().getMinAddress()),
Comparator.comparing(m -> -m.getRange().getLength()))));
return modules.get(modules.size() - 1);
}
protected TraceMemoryRegion getRegionContaining(Address address) {
if (current.getView() == null) {
return null;
}
Trace trace = current.getTrace();
return trace.getMemoryManager().getRegionContaining(current.getSnap(), address);
}
protected String computeLocationString() {
@@ -677,19 +705,22 @@ public class DebuggerListingProvider extends CodeViewerProvider implements Listi
}
ProgramLocation location = getListingPanel().getProgramLocation();
if (location == null) {
return view.getDomainFile().getName();
return "(nowhere)";
}
Address address = location.getAddress();
TraceSection section = getSmallestSectionAt(address);
TraceSection section = getNearestSectionContaining(address);
if (section != null) {
return view.getDomainFile().getName() + " (" + section.getModule().getName() + ":" +
section.getName() + ")";
return section.getModule().getName() + ":" + section.getName();
}
MemoryBlock block = view.getMemory().getBlock(address);
if (block == null) {
return view.getDomainFile().getName();
TraceModule module = getNearestModuleContaining(address);
if (module != null) {
return module.getName();
}
return view.getDomainFile().getName() + " (" + block.getName() + ")";
TraceMemoryRegion region = getRegionContaining(address);
if (region != null) {
return region.getName();
}
return "(unknown)";
}
protected void updateLocationLabel() {
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/breakpoint/DebuggerLogicalBreakpointServicePlugin.java
+3 -3
View File
@@ -558,7 +558,7 @@ public class DebuggerLogicalBreakpointServicePlugin extends Plugin
if (progLoc != null) {
InfoPerProgram progInfo = programInfos.get(progLoc.getProgram());
lb = progInfo
.getOrCreateLogicalBreakpointFor(progLoc.getAddress(), breakpoint, c);
.getOrCreateLogicalBreakpointFor(progLoc.getByteAddress(), breakpoint, c);
}
else {
lb = getOrCreateLogicalBreakpointFor(traceAddr, breakpoint, c);
@@ -712,7 +712,7 @@ public class DebuggerLogicalBreakpointServicePlugin extends Plugin
forgetProgramBreakpoint(bm, r);
continue;
}
if (!lb.getProgramLocation().getAddress().equals(bm.getAddress())) {
if (!lb.getProgramLocation().getByteAddress().equals(bm.getAddress())) {
forgetProgramBreakpoint(bm, r);
continue;
}
@@ -786,7 +786,7 @@ public class DebuggerLogicalBreakpointServicePlugin extends Plugin
if (pLoc != null) {
InfoPerProgram info = programInfos.get(pLoc.getProgram());
if (info != null) { // Maybe the program was just closed
info.removeLogicalBreakpoint(pLoc.getAddress(), lb);
info.removeLogicalBreakpoint(pLoc.getByteAddress(), lb);
}
}
for (Trace t : lb.getMappedTraces()) {
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/breakpoint/MappedLogicalBreakpoint.java
+1 -1
View File
@@ -278,7 +278,7 @@ public class MappedLogicalBreakpoint implements LogicalBreakpointInternal {
@Override
public Address getAddress() {
return progBreak.getLocation().getAddress();
return progBreak.getLocation().getByteAddress();
}
@Override
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/model/DefaultMemoryRecorder.java
+16 -5
View File
@@ -25,7 +25,6 @@ import ghidra.async.AsyncUtils;
import ghidra.async.TypeSpec;
import ghidra.dbg.target.TargetMemory;
import ghidra.dbg.target.TargetMemoryRegion;
import ghidra.dbg.util.PathUtils;
import ghidra.program.model.address.*;
import ghidra.trace.model.Trace;
import ghidra.trace.model.memory.*;
@@ -101,7 +100,7 @@ public class DefaultMemoryRecorder implements ManagedMemoryRecorder {
TargetMemory mem = region.getMemory();
recorder.getProcessMemory().addRegion(region, mem);
//recorder.objectManager.addMemory(mem);
String path = PathUtils.toString(region.getPath());
String path = region.getJoinedPath(".");
long snap = recorder.getSnap();
recorder.parTx.execute("Memory region " + path + " added", () -> {
try {
@@ -114,7 +113,7 @@ public class DefaultMemoryRecorder implements ManagedMemoryRecorder {
traceRegion = memoryManager.addRegion(path, Range.atLeast(snap),
recorder.getMemoryMapper().targetToTrace(region.getRange()),
getTraceFlags(region));
traceRegion.setName(region.getName());
traceRegion.setName(region.getDisplay());
}
catch (TraceOverlappedRegionException e) {
Msg.error(this, "Failed to create region due to overlap: " + e);
@@ -128,7 +127,7 @@ public class DefaultMemoryRecorder implements ManagedMemoryRecorder {
@Override
public void removeProcessRegion(TargetMemoryRegion region) {
// Already removed from processMemory. That's how we knew to go here.
String path = PathUtils.toString(region.getPath());
String path = region.getJoinedPath(".");
long snap = recorder.getSnap();
recorder.parTx.execute("Memory region " + path + " removed", () -> {
try {
@@ -148,7 +147,7 @@ public class DefaultMemoryRecorder implements ManagedMemoryRecorder {
@Override
public TraceMemoryRegion getTraceMemoryRegion(TargetMemoryRegion region) {
String path = PathUtils.toString(region.getPath());
String path = region.getJoinedPath(".");
return memoryManager.getLiveRegionByPath(recorder.getSnap(), path);
}
@@ -167,4 +166,16 @@ public class DefaultMemoryRecorder implements ManagedMemoryRecorder {
return flags;
}
public void regionChanged(TargetMemoryRegion region, String display) {
String path = region.getJoinedPath(".");
long snap = recorder.getSnap();
recorder.parTx.execute("Memory region " + path + " changed display", () -> {
TraceMemoryRegion traceRegion = memoryManager.getLiveRegionByPath(snap, path);
if (traceRegion == null) {
Msg.warn(this, "Could not find region " + path + " in trace to rename");
return;
}
traceRegion.setName(display);
}, path);
}
}
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/model/TraceObjectManager.java
+7
View File
@@ -117,6 +117,7 @@ public class TraceObjectManager {
putAttributesHandler(TargetBreakpointSpec.class, this::attributesChangedBreakpointSpec);
putAttributesHandler(TargetBreakpointLocation.class,
this::attributesChangedBreakpointLocation);
putAttributesHandler(TargetMemoryRegion.class, this::attributesChangedMemoryRegion);
putAttributesHandler(TargetRegister.class, this::attributesChangedRegister);
putAttributesHandler(TargetStackFrame.class, this::attributesChangedStackFrame);
putAttributesHandler(TargetThread.class, this::attributesChangedThread);
@@ -494,6 +495,12 @@ public class TraceObjectManager {
}
}
public void attributesChangedMemoryRegion(TargetObject region, Map<String, ?> added) {
if (added.containsKey(TargetObject.DISPLAY_ATTRIBUTE_NAME)) {
recorder.memoryRecorder.regionChanged((TargetMemoryRegion) region, region.getDisplay());
}
}
public void attributesChangedRegister(TargetObject parent, Map<String, ?> added) {
if (added.containsKey(TargetRegister.CONTAINER_ATTRIBUTE_NAME)) {
TargetRegister register = (TargetRegister) parent;
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/modules/DebuggerStaticMappingServicePlugin.java
+6 -5
View File
@@ -944,7 +944,7 @@ public class DebuggerStaticMappingServicePlugin extends Plugin
Address start = from.getAddress();
Address end = start.addNoWrap(length - 1);
// Also check end in the destination
Address toAddress = to.getAddress();
Address toAddress = to.getByteAddress();
toAddress.addNoWrap(length - 1); // Anticipate possible AddressOverflow
AddressRangeImpl range = new AddressRangeImpl(start, end);
if (truncateExisting) {
@@ -1117,12 +1117,13 @@ public class DebuggerStaticMappingServicePlugin extends Plugin
TraceProgramView view = (TraceProgramView) loc.getProgram();
Trace trace = view.getTrace();
TraceLocation tloc = new DefaultTraceLocation(trace, null,
Range.singleton(getNonScratchSnap(view)), loc.getAddress());
Range.singleton(getNonScratchSnap(view)), loc.getByteAddress());
ProgramLocation mapped = getOpenMappedLocation(tloc);
if (mapped == null) {
return null;
}
return ProgramLocationUtils.replaceAddress(loc, mapped.getProgram(), mapped.getAddress());
return ProgramLocationUtils.replaceAddress(loc, mapped.getProgram(),
mapped.getByteAddress());
}
@Override
@@ -1131,7 +1132,7 @@ public class DebuggerStaticMappingServicePlugin extends Plugin
if (info == null) {
return null;
}
return info.getOpenMappedTraceLocations(loc.getAddress());
return info.getOpenMappedTraceLocations(loc.getByteAddress());
}
@Override
@@ -1140,7 +1141,7 @@ public class DebuggerStaticMappingServicePlugin extends Plugin
if (info == null) {
return null;
}
return info.getOpenMappedTraceLocation(trace, loc.getAddress(), snap);
return info.getOpenMappedTraceLocation(trace, loc.getByteAddress(), snap);
}
@Override
Ghidra/Debug/Debugger/src/main/java/ghidra/app/services/DebuggerLogicalBreakpointService.java
+2 -2
View File
@@ -141,9 +141,9 @@ public interface DebuggerLogicalBreakpointService {
Program progOrView = loc.getProgram();
if (progOrView instanceof TraceProgramView) {
TraceProgramView view = (TraceProgramView) progOrView;
return traceFunc.apply(view.getTrace(), loc.getAddress());
return traceFunc.apply(view.getTrace(), loc.getByteAddress());
}
return progFunc.apply(progOrView, loc.getAddress());
return progFunc.apply(progOrView, loc.getByteAddress());
}
default Enablement computeEnablement(Collection<LogicalBreakpoint> col) {
Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/agent/DefaultTargetObject.java
+16 -16
View File
@@ -321,10 +321,10 @@ public class DefaultTargetObject<E extends TargetObject, P extends TargetObject>
delta = Delta.computeAndSet(this.elements, elements, Delta.SAME);
getSchema().validateElementDelta(getPath(), delta, enforcesStrictSchema());
doInvalidateElements(delta.removed, reason);
}
if (!delta.isEmpty()) {
updateCallbackElements(delta);
listeners.fire.elementsChanged(getProxy(), delta.getKeysRemoved(), delta.added);
if (!delta.isEmpty()) {
updateCallbackElements(delta);
listeners.fire.elementsChanged(getProxy(), delta.getKeysRemoved(), delta.added);
}
}
return delta;
}
@@ -363,10 +363,10 @@ public class DefaultTargetObject<E extends TargetObject, P extends TargetObject>
delta = Delta.apply(this.elements, remove, add, Delta.SAME);
getSchema().validateElementDelta(getPath(), delta, enforcesStrictSchema());
doInvalidateElements(delta.removed, reason);
}
if (!delta.isEmpty()) {
updateCallbackElements(delta);
listeners.fire.elementsChanged(getProxy(), delta.getKeysRemoved(), delta.added);
if (!delta.isEmpty()) {
updateCallbackElements(delta);
listeners.fire.elementsChanged(getProxy(), delta.getKeysRemoved(), delta.added);
}
}
return delta;
}
@@ -499,10 +499,10 @@ public class DefaultTargetObject<E extends TargetObject, P extends TargetObject>
delta = Delta.computeAndSet(this.attributes, attributes, Delta.EQUAL);
getSchema().validateAttributeDelta(getPath(), delta, enforcesStrictSchema());
doInvalidateAttributes(delta.removed, reason);
}
if (!delta.isEmpty()) {
updateCallbackAttributes(delta);
listeners.fire.attributesChanged(getProxy(), delta.getKeysRemoved(), delta.added);
if (!delta.isEmpty()) {
updateCallbackAttributes(delta);
listeners.fire.attributesChanged(getProxy(), delta.getKeysRemoved(), delta.added);
}
}
return delta;
}
@@ -558,10 +558,10 @@ public class DefaultTargetObject<E extends TargetObject, P extends TargetObject>
delta = Delta.apply(this.attributes, remove, add, Delta.EQUAL);
getSchema().validateAttributeDelta(getPath(), delta, enforcesStrictSchema());
doInvalidateAttributes(delta.removed, reason);
}
if (!delta.isEmpty()/* && !reason.equals("Default")*/) {
updateCallbackAttributes(delta);
listeners.fire.attributesChanged(getProxy(), delta.getKeysRemoved(), delta.added);
if (!delta.isEmpty()/* && !reason.equals("Default")*/) {
updateCallbackAttributes(delta);
listeners.fire.attributesChanged(getProxy(), delta.getKeysRemoved(), delta.added);
}
}
return delta;
}