Merge remote-tracking branch 'origin/patch'

This commit is contained in:
Ryan Kurtz 2021-08-10 07:02:50 -04:00
commit 94a0c6c35a
2 changed files with 6 additions and 0 deletions

View file

@ -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;

View file

@ -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,