summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar bunnei2017-04-02 22:41:10 -0400
committerGravatar GitHub2017-04-02 22:41:10 -0400
commita377fea90f829643c8efe3fa80abe6050d162c55 (patch)
tree4f76aa3c7fb04dff1a0aa983b6595068140afd19 /src
parentMerge pull request #2639 from wwylele/fix-ptm-fs (diff)
parentFix OutputDebugString syscall (diff)
downloadyuzu-a377fea90f829643c8efe3fa80abe6050d162c55.tar.gz
yuzu-a377fea90f829643c8efe3fa80abe6050d162c55.tar.xz
yuzu-a377fea90f829643c8efe3fa80abe6050d162c55.zip
Merge pull request #2648 from mtheall/master
Fix OutputDebugString syscall
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/function_wrappers.h4
-rw-r--r--src/core/hle/svc.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/core/hle/function_wrappers.h b/src/core/hle/function_wrappers.h
index 7875971ce..f6eb900f0 100644
--- a/src/core/hle/function_wrappers.h
+++ b/src/core/hle/function_wrappers.h
@@ -256,9 +256,9 @@ void Wrap() {
256 func(((s64)PARAM(1) << 32) | PARAM(0)); 256 func(((s64)PARAM(1) << 32) | PARAM(0));
257} 257}
258 258
259template <void func(const char*)> 259template <void func(const char*, int len)>
260void Wrap() { 260void Wrap() {
261 func((char*)Memory::GetPointer(PARAM(0))); 261 func((char*)Memory::GetPointer(PARAM(0)), PARAM(1));
262} 262}
263 263
264template <void func(u8)> 264template <void func(u8)>
diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp
index 4e0c3fb8b..2db823c61 100644
--- a/src/core/hle/svc.cpp
+++ b/src/core/hle/svc.cpp
@@ -467,8 +467,8 @@ static void Break(u8 break_reason) {
467} 467}
468 468
469/// Used to output a message on a debug hardware unit - does nothing on a retail unit 469/// Used to output a message on a debug hardware unit - does nothing on a retail unit
470static void OutputDebugString(const char* string) { 470static void OutputDebugString(const char* string, int len) {
471 LOG_DEBUG(Debug_Emulated, "%s", string); 471 LOG_DEBUG(Debug_Emulated, "%.*s", len, string);
472} 472}
473 473
474/// Get resource limit 474/// Get resource limit