diff options
| author | bunnei <ericbunnie@gmail.com> | 2014-05-29 03:20:00 +0200 |
|---|---|---|
| committer | bunnei <ericbunnie@gmail.com> | 2014-05-29 03:20:00 +0200 |
| commit | 9fd5d6c7d81053e05b3b4218bdee2575cd1f3fd0 (patch) | |
| tree | dfaf077de27b4061756887b2e16359ed2be2401d /src/core | |
| parent | lcd: moved kFrameTicks to lcd.h for use in other modules (diff) | |
| download | yuzu-9fd5d6c7d81053e05b3b4218bdee2575cd1f3fd0.tar yuzu-9fd5d6c7d81053e05b3b4218bdee2575cd1f3fd0.tar.gz yuzu-9fd5d6c7d81053e05b3b4218bdee2575cd1f3fd0.tar.bz2 yuzu-9fd5d6c7d81053e05b3b4218bdee2575cd1f3fd0.tar.lz yuzu-9fd5d6c7d81053e05b3b4218bdee2575cd1f3fd0.tar.xz yuzu-9fd5d6c7d81053e05b3b4218bdee2575cd1f3fd0.tar.zst yuzu-9fd5d6c7d81053e05b3b4218bdee2575cd1f3fd0.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/hle/function_wrappers.h | 4 | ||||
| -rw-r--r-- | src/core/hle/hle.h | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/core/hle/function_wrappers.h b/src/core/hle/function_wrappers.h index 24cc74fc6..d31fab298 100644 --- a/src/core/hle/function_wrappers.h +++ b/src/core/hle/function_wrappers.h @@ -750,11 +750,11 @@ template<int func(void*, u32, u32, u32, u32, u32)> void WrapI_VUUUUU(){ } template<int func(u32, s64)> void WrapI_US64() { - int retval = func(PARAM(0), PARAM64(1)); + int retval = func(PARAM(0), ((PARAM(3) << 32) | PARAM(2))); 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)); + int retval = func(Memory::GetPointer(PARAM(5)), Memory::GetPointer(PARAM(1)), PARAM(2), PARAM(3), ((PARAM(4) << 32) | PARAM(0))); RETURN(retval); } diff --git a/src/core/hle/hle.h b/src/core/hle/hle.h index c075147c3..c31e273b5 100644 --- a/src/core/hle/hle.h +++ b/src/core/hle/hle.h @@ -10,7 +10,6 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// #define PARAM(n) Core::g_app_core->GetReg(n) -#define PARAM64(n) (Core::g_app_core->GetReg(n) | ((u64)Core::g_app_core->GetReg(n + 1) << 32)) #define RETURN(n) Core::g_app_core->SetReg(0, n) //////////////////////////////////////////////////////////////////////////////////////////////////// |