diff options
author | bunnei <ericbunnie@gmail.com> | 2014-05-23 04:57:45 +0200 |
---|---|---|
committer | bunnei <ericbunnie@gmail.com> | 2014-05-23 04:57:45 +0200 |
commit | 32c314c99290a52f1f870ecf8c677e3792ed09c4 (patch) | |
tree | 1cea62bc320d51ebb217e7c361ae10b65b71dd45 /src/core/hle/function_wrappers.h | |
parent | Merge branch 'master' of https://github.com/citra-emu/citra (diff) | |
parent | core: added Kernel::Reschedule() call to check for thread changes, shortened delay time to 100 instructions (diff) | |
download | yuzu-32c314c99290a52f1f870ecf8c677e3792ed09c4.tar yuzu-32c314c99290a52f1f870ecf8c677e3792ed09c4.tar.gz yuzu-32c314c99290a52f1f870ecf8c677e3792ed09c4.tar.bz2 yuzu-32c314c99290a52f1f870ecf8c677e3792ed09c4.tar.lz yuzu-32c314c99290a52f1f870ecf8c677e3792ed09c4.tar.xz yuzu-32c314c99290a52f1f870ecf8c677e3792ed09c4.tar.zst yuzu-32c314c99290a52f1f870ecf8c677e3792ed09c4.zip |
Diffstat (limited to 'src/core/hle/function_wrappers.h')
-rw-r--r-- | src/core/hle/function_wrappers.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/core/hle/function_wrappers.h b/src/core/hle/function_wrappers.h index d934eafb4..801865d49 100644 --- a/src/core/hle/function_wrappers.h +++ b/src/core/hle/function_wrappers.h @@ -719,17 +719,27 @@ template<int func(void*, u32)> void WrapI_VU(){ RETURN(retval); } +template<int func(void*, void*, u32)> void WrapI_VVU(){ + u32 retval = func(Memory::GetPointer(PARAM(0)), Memory::GetPointer(PARAM(1)), PARAM(2)); + RETURN(retval); +} + template<int func(void*, u32, void*, int)> void WrapI_VUVI(){ u32 retval = func(Memory::GetPointer(PARAM(0)), PARAM(1), Memory::GetPointer(PARAM(2)), PARAM(3)); RETURN(retval); } template<int func(void*, u32, u32, u32, u32, u32)> void WrapI_VUUUUU(){ - u32 retval = func(Memory::GetPointer(PARAM(0)), PARAM(1), PARAM(2), PARAM(3), PARAM(4), PARAM(5)); + u32 retval = func(NULL, PARAM(0), PARAM(1), PARAM(2), PARAM(3), PARAM(4)); RETURN(retval); } template<int func(u32, s64)> void WrapI_US64() { - int retval = func(PARAM(0), PARAM64(2)); + int retval = func(PARAM(0), PARAM64(1)); + RETURN(retval); +} + +template<int func(void*, void*, u32, u32, s64)> void WrapI_VVUUS64() { + int retval = func(Memory::GetPointer(PARAM(0)), Memory::GetPointer(PARAM(1)), PARAM(2), PARAM(3), PARAM(4)); RETURN(retval); } |