From 8ad15321f22ec1e0fcfa08e626df40266c8c2ebd Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Thu, 5 Nov 2009 07:05:33 +0000 Subject: [PATCH] Make the HLE'd OSPanic print out the associated message. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4498 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Core/Src/HLE/HLE_OS.cpp | 7 ++++--- Source/Core/DebuggerWX/Src/CodeWindow.cpp | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Source/Core/Core/Src/HLE/HLE_OS.cpp b/Source/Core/Core/Src/HLE/HLE_OS.cpp index 7dcac00927..f0b5c8e9d6 100644 --- a/Source/Core/Core/Src/HLE/HLE_OS.cpp +++ b/Source/Core/Core/Src/HLE/HLE_OS.cpp @@ -31,11 +31,12 @@ void GetStringVA(std::string& _rOutBuffer, u32 strReg = 3); void HLE_OSPanic() { - std::string Error; + std::string Error, Msg; GetStringVA(Error); + GetStringVA(Msg, 5); - PanicAlert("OSPanic: %s", Error.c_str()); - ERROR_LOG(OSREPORT, "(PC=%08x), OSPanic: %s", LR, Error.c_str()); + PanicAlert("OSPanic: %s: %s", Error.c_str(), Msg.c_str()); + ERROR_LOG(OSREPORT, "%08x->%08x| OSPanic: %s: %s", LR, PC, Error.c_str(), Msg.c_str()); NPC = LR; } diff --git a/Source/Core/DebuggerWX/Src/CodeWindow.cpp b/Source/Core/DebuggerWX/Src/CodeWindow.cpp index b9bbfe65c8..25b521a937 100644 --- a/Source/Core/DebuggerWX/Src/CodeWindow.cpp +++ b/Source/Core/DebuggerWX/Src/CodeWindow.cpp @@ -387,7 +387,7 @@ void CCodeWindow::UpdateLists() void CCodeWindow::UpdateCallstack() { //if (PowerPC::GetState() == PowerPC::CPU_POWERDOWN) return; - //if (Core::GetState() == Core::CORE_STOPPING) return; + if (Core::GetState() == Core::CORE_STOPPING) return; callstack->Clear();