diff options
author | bunnei <bunneidev@gmail.com> | 2017-10-20 05:00:46 +0200 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2017-10-20 05:00:46 +0200 |
commit | dcd6bb82f7a5bc1daaa8570f710ffb062fa4c596 (patch) | |
tree | 95f6a5d5f816a9c8a6367889dd4d551deb625eb0 /src/core/hle/function_wrappers.h | |
parent | lm: Implement lm::Initialize and Logger::log. (diff) | |
download | yuzu-dcd6bb82f7a5bc1daaa8570f710ffb062fa4c596.tar yuzu-dcd6bb82f7a5bc1daaa8570f710ffb062fa4c596.tar.gz yuzu-dcd6bb82f7a5bc1daaa8570f710ffb062fa4c596.tar.bz2 yuzu-dcd6bb82f7a5bc1daaa8570f710ffb062fa4c596.tar.lz yuzu-dcd6bb82f7a5bc1daaa8570f710ffb062fa4c596.tar.xz yuzu-dcd6bb82f7a5bc1daaa8570f710ffb062fa4c596.tar.zst yuzu-dcd6bb82f7a5bc1daaa8570f710ffb062fa4c596.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/function_wrappers.h | 18 |
1 files changed, 3 insertions, 15 deletions
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 <ResultCode func(MemoryInfo*, PageInfo*, Kernel::Handle, u32)> -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 <ResultCode func(s32*, u32)> void Wrap() { s32 param_1 = 0; |