From e65fd32de40e064b988707a25aeb8766976569dd Mon Sep 17 00:00:00 2001 From: zilmar Date: Tue, 10 Jan 2017 17:45:53 +1100 Subject: [PATCH] [Android] Add logging on display error --- Source/Android/Bridge/NotificationClass.cpp | 3 +++ Source/Project64-core/MemoryExceptionFilter.cpp | 6 ++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Source/Android/Bridge/NotificationClass.cpp b/Source/Android/Bridge/NotificationClass.cpp index 694fe9853..c5334ccfc 100644 --- a/Source/Android/Bridge/NotificationClass.cpp +++ b/Source/Android/Bridge/NotificationClass.cpp @@ -13,6 +13,7 @@ #include #include #include +#include #include "NotificationClass.h" #include "JavaBridge.h" #if defined(ANDROID) @@ -109,6 +110,8 @@ bool CNotificationImp::AskYesNoQuestion(const char * /*Question*/) const void CNotificationImp::BreakPoint(const char * FileName, int32_t LineNumber) { + Flush_Recompiler_Log(); + TraceFlushLog(); if (g_Settings->LoadBool(Debugger_Enabled)) { FatalError(stdstr_f("Break point found at\n%s\nLine: %d", FileName, LineNumber).c_str()); diff --git a/Source/Project64-core/MemoryExceptionFilter.cpp b/Source/Project64-core/MemoryExceptionFilter.cpp index e22ac98ff..2091f7304 100644 --- a/Source/Project64-core/MemoryExceptionFilter.cpp +++ b/Source/Project64-core/MemoryExceptionFilter.cpp @@ -401,8 +401,8 @@ bool CMipsMemoryVM::FilterArmException(uint32_t MemAddress, mcontext_t & context WriteTrace(TraceExceptionHandler, TraceError, "uc->uc_mcontext.arm_r8 = 0x%lx", context.arm_r8); WriteTrace(TraceExceptionHandler, TraceError, "uc->uc_mcontext.arm_r9 = 0x%lx", context.arm_r9); WriteTrace(TraceExceptionHandler, TraceError, "uc->uc_mcontext.arm_r10 = 0x%lx", context.arm_r10); - WriteTrace(TraceExceptionHandler, TraceError, "uc->uc_mcontext.arm_fp = 0x%lx", context.arm_fp); - WriteTrace(TraceExceptionHandler, TraceError, "uc->uc_mcontext.arm_ip = 0x%lx", context.arm_ip); + WriteTrace(TraceExceptionHandler, TraceError, "uc->uc_mcontext.arm_r11 = 0x%lx", context.arm_fp); + WriteTrace(TraceExceptionHandler, TraceError, "uc->uc_mcontext.arm_r12 = 0x%lx", context.arm_ip); WriteTrace(TraceExceptionHandler, TraceError, "uc->uc_mcontext.arm_sp = 0x%lx", context.arm_sp); WriteTrace(TraceExceptionHandler, TraceError, "uc->uc_mcontext.arm_lr = 0x%lx", context.arm_lr); WriteTrace(TraceExceptionHandler, TraceError, "uc->uc_mcontext.arm_pc = 0x%lx", context.arm_pc); @@ -434,8 +434,6 @@ bool CMipsMemoryVM::FilterArmException(uint32_t MemAddress, mcontext_t & context WriteTrace(TraceExceptionHandler, TraceError, "GPR[%s] 0x%08X%08X", CRegName::GPR[count], g_Reg->m_GPR[count].W[1], g_Reg->m_GPR[count].W[0]); } - Flush_Recompiler_Log(); - TraceFlushLog(); g_Notify->BreakPoint(__FILE__, __LINE__); return false; }