summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorSepalani <sepalani@hotmail.fr>2017-05-26 18:43:48 +0100
committerSepalani <sepalani@hotmail.fr>2017-06-03 21:05:13 +0100
commit2989c0cb615e91c8f8d4eda127611496487d973e (patch)
tree9ecab682dcf9c67be4a4086d646536d6fe32a46c /Source
parent9f6d6e6921488e0e0c4747afc9f267512096bdaf (diff)
HLE: Log (v)dprintf messages
Diffstat (limited to 'Source')
-rw-r--r--Source/Core/Core/HLE/HLE.cpp2
-rw-r--r--Source/Core/Core/HLE/HLE_OS.cpp26
-rw-r--r--Source/Core/Core/HLE/HLE_OS.h2
3 files changed, 30 insertions, 0 deletions
diff --git a/Source/Core/Core/HLE/HLE.cpp b/Source/Core/Core/HLE/HLE.cpp
index 610c747b15..c03fa54398 100644
--- a/Source/Core/Core/HLE/HLE.cpp
+++ b/Source/Core/Core/HLE/HLE.cpp
@@ -62,6 +62,8 @@ static const SPatch OSPatches[] = {
{"WUD_DEBUGPrint", HLE_OS::HLE_GeneralDebugPrint, HLE_HOOK_START, HLE_TYPE_DEBUG},
{"vprintf", HLE_OS::HLE_GeneralDebugVPrint, HLE_HOOK_START, HLE_TYPE_DEBUG},
{"printf", HLE_OS::HLE_GeneralDebugPrint, HLE_HOOK_START, HLE_TYPE_DEBUG},
+ {"vdprintf", HLE_OS::HLE_LogVDPrint, HLE_HOOK_START, HLE_TYPE_DEBUG},
+ {"dprintf", HLE_OS::HLE_LogDPrint, HLE_HOOK_START, HLE_TYPE_DEBUG},
{"nlPrintf", HLE_OS::HLE_GeneralDebugPrint, HLE_HOOK_START, HLE_TYPE_DEBUG},
{"puts", HLE_OS::HLE_GeneralDebugPrint, HLE_HOOK_START, HLE_TYPE_DEBUG}, // gcc-optimized printf?
{"___blank", HLE_OS::HLE_GeneralDebugPrint, HLE_HOOK_START, HLE_TYPE_DEBUG}, // used for early init things (normally)
diff --git a/Source/Core/Core/HLE/HLE_OS.cpp b/Source/Core/Core/HLE/HLE_OS.cpp
index c4c48ef07b..74d2a8ec4f 100644
--- a/Source/Core/Core/HLE/HLE_OS.cpp
+++ b/Source/Core/Core/HLE/HLE_OS.cpp
@@ -110,6 +110,32 @@ void HLE_write_console()
NOTICE_LOG(OSREPORT, "%08x->%08x| %s", LR, PC, SHIFTJISToUTF8(report_message).c_str());
}
+// Log (v)dprintf message if fd is 1 (stdout) or 2 (stderr)
+void HLE_LogDPrint(ParameterType parameter_type)
+{
+ NPC = LR;
+
+ if (GPR(3) != 1 && GPR(3) != 2)
+ return;
+
+ std::string report_message = GetStringVA(4, parameter_type);
+ NOTICE_LOG(OSREPORT, "%08x->%08x| %s", LR, PC, SHIFTJISToUTF8(report_message).c_str());
+}
+
+// Log dprintf message
+// -> int dprintf(int fd, const char* format, ...);
+void HLE_LogDPrint()
+{
+ HLE_LogDPrint(ParameterType::ParameterList);
+}
+
+// Log vdprintf message
+// -> int vdprintf(int fd, const char* format, va_list ap);
+void HLE_LogVDPrint()
+{
+ HLE_LogDPrint(ParameterType::VariableArgumentList);
+}
+
std::string GetStringVA(u32 str_reg, ParameterType parameter_type)
{
std::string ArgumentBuffer;
diff --git a/Source/Core/Core/HLE/HLE_OS.h b/Source/Core/Core/HLE/HLE_OS.h
index 1d8610909e..55f3687eb2 100644
--- a/Source/Core/Core/HLE/HLE_OS.h
+++ b/Source/Core/Core/HLE/HLE_OS.h
@@ -10,4 +10,6 @@ void HLE_GeneralDebugPrint();
void HLE_GeneralDebugVPrint();
void HLE_write_console();
void HLE_OSPanic();
+void HLE_LogDPrint();
+void HLE_LogVDPrint();
}