diff --git a/Core/Core.cpp b/Core/Core.cpp index e3c8273f9e..cf851e807e 100644 --- a/Core/Core.cpp +++ b/Core/Core.cpp @@ -45,7 +45,6 @@ #include "Windows/InputDevice.h" #endif - // Time until we stop considering the core active without user input. // Should this be configurable? 2 hours currently. static const double ACTIVITY_IDLE_TIMEOUT = 2.0 * 3600.0; @@ -385,6 +384,7 @@ const char *ExceptionTypeAsString(ExceptionType type) { switch (type) { case ExceptionType::MEMORY: return "Invalid Memory Access"; case ExceptionType::BREAK: return "Break"; + case ExceptionType::BAD_EXEC_ADDR: return "Bad Execution Address"; default: return "N/A"; } } diff --git a/Core/Core.h b/Core/Core.h index 6f210c739b..ef428595bd 100644 --- a/Core/Core.h +++ b/Core/Core.h @@ -93,6 +93,7 @@ enum class ExceptionType { NONE, MEMORY, BREAK, + BAD_EXEC_ADDR, }; struct ExceptionInfo { diff --git a/Core/MIPS/MIPSInt.cpp b/Core/MIPS/MIPSInt.cpp index 9ca3ee67b1..b8d99c078d 100644 --- a/Core/MIPS/MIPSInt.cpp +++ b/Core/MIPS/MIPSInt.cpp @@ -151,6 +151,7 @@ namespace MIPSInt void Int_Break(MIPSOpcode op) { + Reporting::ReportMessage("BREAK instruction hit"); Core_Break(); PC += 4; } diff --git a/Core/System.cpp b/Core/System.cpp index 9a6fcb1779..c8a8b4c769 100644 --- a/Core/System.cpp +++ b/Core/System.cpp @@ -97,7 +97,7 @@ bool coreCollectDebugStatsForced = false; // This can be read and written from ANYWHERE. volatile CoreState coreState = CORE_STEPPING; -// Note: intentionally not used for CORE_NEXTFRAME. << TODO: This comment is a lie, it is used! +// If true, core state has been changed, but JIT has probably not noticed yet. volatile bool coreStatePending = false; static volatile CPUThreadState cpuThreadState = CPU_THREAD_NOT_RUNNING;