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-909: Adjusting how GDB resumes/steps to assure interrupts work.

Browse Source
This commit is contained in:
Dan
2021-04-29 15:20:46 -04:00
parent c70496680d
commit b150c557fc
24 changed files with 210 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/DebuggerResources.java
View File

@@ -19,6 +19,7 @@ import java.awt.Color;
import java.awt.Component;
import java.awt.event.*;
import java.util.*;
import java.util.concurrent.CancellationException;
import java.util.function.Function;
import javax.swing.*;
@@ -45,11 +46,13 @@ import ghidra.app.plugin.core.debug.gui.watch.DebuggerWatchesPlugin;
import ghidra.app.plugin.core.debug.service.model.launch.DebuggerProgramLaunchOffer;
import ghidra.app.services.DebuggerTraceManagerService.BooleanChangeAdapter;
import ghidra.app.services.MarkerService;
import ghidra.async.AsyncUtils;
import ghidra.framework.plugintool.Plugin;
import ghidra.framework.plugintool.util.PluginUtils;
import ghidra.program.database.ProgramContentHandler;
import ghidra.trace.model.Trace;
import ghidra.util.*;
import ghidra.util.exception.CancelledException;
import resources.MultiIcon;
import resources.ResourceManager;
import resources.icons.RotateIcon;
@@ -1546,7 +1549,13 @@ public interface DebuggerResources {
static <T> Function<Throwable, T> showError(Component parent, String message) {
return e -> {
Msg.showError(parent, parent, DebuggerPluginPackage.NAME, message, e);
Throwable t = AsyncUtils.unwrapThrowable(e);
if (t instanceof CancelledException || t instanceof CancellationException) {
Msg.error(parent, "Cancelled: " + message);
}
else {
Msg.showError(parent, parent, DebuggerPluginPackage.NAME, message, e);
}
return null;
};
}