From ba5cb50afc21f6dc6bb96c7ecf993e33818692f3 Mon Sep 17 00:00:00 2001 From: Sepalani Date: Sun, 4 Jun 2017 20:53:14 +0100 Subject: [PATCH] HLE: Improve HLE_GeneralDebugPrint detection --- Source/Core/Core/HLE/HLE_OS.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Core/Core/HLE/HLE_OS.cpp b/Source/Core/Core/HLE/HLE_OS.cpp index 74adaa148c..0135de898e 100644 --- a/Source/Core/Core/HLE/HLE_OS.cpp +++ b/Source/Core/Core/HLE/HLE_OS.cpp @@ -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();