From dcd6bb82f7a5bc1daaa8570f710ffb062fa4c596 Mon Sep 17 00:00:00 2001 From: bunnei Date: Thu, 19 Oct 2017 23:00:46 -0400 Subject: hle: Fix QueryMemory response for MemoryInfo. --- src/core/hle/function_wrappers.h | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) (limited to 'src/core/hle/function_wrappers.h') diff --git a/src/core/hle/function_wrappers.h b/src/core/hle/function_wrappers.h index 31fda6db3..3e886fdba 100644 --- a/src/core/hle/function_wrappers.h +++ b/src/core/hle/function_wrappers.h @@ -133,25 +133,13 @@ void Wrap() { Memory::Write64(PARAM(0), memory_info.base_address); Memory::Write64(PARAM(0) + 8, memory_info.size); - Memory::Write64(PARAM(0) + 16, memory_info.permission); - Memory::Write64(PARAM(0) + 24, memory_info.state); + Memory::Write32(PARAM(0) + 16, memory_info.type); + Memory::Write32(PARAM(0) + 20, memory_info.attributes); + Memory::Write32(PARAM(0) + 24, memory_info.permission); FuncReturn(retval); } -template -void Wrap() { - MemoryInfo memory_info = {}; - PageInfo page_info = {}; - u32 retval = func(&memory_info, &page_info, PARAM(2), PARAM(3)).raw; - Core::CPU().SetReg(1, memory_info.base_address); - Core::CPU().SetReg(2, memory_info.size); - Core::CPU().SetReg(3, memory_info.permission); - Core::CPU().SetReg(4, memory_info.state); - Core::CPU().SetReg(5, page_info.flags); - FuncReturn(retval); -} - template void Wrap() { s32 param_1 = 0; -- cgit v1.2.3