Merge pull request #2648 from mtheall/master

Fix OutputDebugString syscall
master
bunnei 2017-04-02 22:41:10 +07:00 committed by GitHub
commit a377fea90f
2 changed files with 4 additions and 4 deletions

@ -256,9 +256,9 @@ void Wrap() {
func(((s64)PARAM(1) << 32) | PARAM(0)); func(((s64)PARAM(1) << 32) | PARAM(0));
} }
template <void func(const char*)> template <void func(const char*, int len)>
void Wrap() { void Wrap() {
func((char*)Memory::GetPointer(PARAM(0))); func((char*)Memory::GetPointer(PARAM(0)), PARAM(1));
} }
template <void func(u8)> template <void func(u8)>

@ -467,8 +467,8 @@ static void Break(u8 break_reason) {
} }
/// Used to output a message on a debug hardware unit - does nothing on a retail unit /// Used to output a message on a debug hardware unit - does nothing on a retail unit
static void OutputDebugString(const char* string) { static void OutputDebugString(const char* string, int len) {
LOG_DEBUG(Debug_Emulated, "%s", string); LOG_DEBUG(Debug_Emulated, "%.*s", len, string);
} }
/// Get resource limit /// Get resource limit