mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2025-10-05 19:42:36 +02:00
Merge remote-tracking branch 'origin/patch'
This commit is contained in:
commit
94a0c6c35a
2 changed files with 6 additions and 0 deletions
|
@ -511,6 +511,9 @@ public class EmulatorHelper implements MemoryFaultHandler, EmulatorConfiguration
|
|||
catch (Throwable t) {
|
||||
// TODO: need to enumerate errors better !!
|
||||
lastError = t.getMessage();
|
||||
if (lastError == null) {
|
||||
lastError = t.toString();
|
||||
}
|
||||
emulator.setHalt(true); // force execution to stop
|
||||
if (t instanceof CancelledException) {
|
||||
throw (CancelledException) t;
|
||||
|
|
|
@ -377,6 +377,9 @@ public class Emulate {
|
|||
/// completes.
|
||||
public void executeInstruction(boolean stopAtBreakpoint, TaskMonitor monitor)
|
||||
throws CancelledException, LowlevelError, InstructionDecodeException {
|
||||
if (monitor == null) {
|
||||
monitor = TaskMonitor.DUMMY;
|
||||
}
|
||||
if (executionState == EmulateExecutionState.STOPPED) {
|
||||
if (last_execute_address == null && instructionStateModifier != null) {
|
||||
instructionStateModifier.initialExecuteCallback(this, current_address,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue