ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Shawn Hoffman 2009-11-05 07:05:33 +00:00
parent 0d7d699710
commit 8ad15321f2
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/Core/Src/HLE/HLE_OS.cpp
View File

@ -31,11 +31,12 @@ void GetStringVA(std::string& _rOutBuffer, u32 strReg = 3);
void HLE_OSPanic() void HLE_OSPanic()
{ {
std::string Error; std::string Error, Msg;
GetStringVA(Error); GetStringVA(Error);
GetStringVA(Msg, 5);
PanicAlert("OSPanic: %s", Error.c_str()); PanicAlert("OSPanic: %s: %s", Error.c_str(), Msg.c_str());
ERROR_LOG(OSREPORT, "(PC=%08x), OSPanic: %s", LR, Error.c_str()); ERROR_LOG(OSREPORT, "%08x->%08x| OSPanic: %s: %s", LR, PC, Error.c_str(), Msg.c_str());
NPC = LR; NPC = LR;
} }

2
Source/Core/DebuggerWX/Src/CodeWindow.cpp
View File

@ -387,7 +387,7 @@ void CCodeWindow::UpdateLists()
void CCodeWindow::UpdateCallstack() void CCodeWindow::UpdateCallstack()
{ {
//if (PowerPC::GetState() == PowerPC::CPU_POWERDOWN) return; //if (PowerPC::GetState() == PowerPC::CPU_POWERDOWN) return;
//if (Core::GetState() == Core::CORE_STOPPING) return; if (Core::GetState() == Core::CORE_STOPPING) return;
callstack->Clear(); callstack->Clear();