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

Merge pull request #5537 from sepalani/hle-print-addr 

HLE: Improve HLE_GeneralDebugPrint detection
This commit is contained in:
shuffle2 2017-06-05 15:06:55 -07:00 committed by GitHub
parent 30918b71c5 ba5cb50afc
commit 95ef785b1f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/Core/HLE/HLE_OS.cpp
View File

@ -33,9 +33,9 @@ void HLE_GeneralDebugPrint()
std::string report_message;
// Is gpr3 pointing to a pointer rather than an ASCII string
if (PowerPC::HostRead_U32(GPR(3)) > 0x80000000)
if (PowerPC::HostIsRAMAddress(GPR(3)) && PowerPC::HostIsRAMAddress(PowerPC::HostRead_U32(GPR(3))))
{
if (GPR(4) > 0x80000000)
if (PowerPC::HostIsRAMAddress(GPR(4)))
{
// ___blank(void* this, const char* fmt, ...);
report_message = GetStringVA(4);
@ -48,7 +48,7 @@ void HLE_GeneralDebugPrint()
}
else
{
if (GPR(3) > 0x80000000)
if (PowerPC::HostIsRAMAddress(GPR(3)))
{
// ___blank(const char* fmt, ...);
report_message = GetStringVA();