diff options
| author | 2014-07-06 22:17:34 -0400 | |
|---|---|---|
| committer | 2014-07-07 22:13:40 -0400 | |
| commit | 59f275048209fd18f9c8284d101c7f5baaa4762e (patch) | |
| tree | a5b67837fba04a2162eedbcb3ff5831893970e78 /src/core/hle/function_wrappers.h | |
| parent | SharedMemory: Updated MapSharedMemory to use an enum for permissions. (diff) | |
| download | yuzu-59f275048209fd18f9c8284d101c7f5baaa4762e.tar.gz yuzu-59f275048209fd18f9c8284d101c7f5baaa4762e.tar.xz yuzu-59f275048209fd18f9c8284d101c7f5baaa4762e.zip | |
function_wrappers: Fixed incorrect wrapper, added another.
Diffstat (limited to 'src/core/hle/function_wrappers.h')
| -rw-r--r-- | src/core/hle/function_wrappers.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/core/hle/function_wrappers.h b/src/core/hle/function_wrappers.h index 0bed78653..ea603a1bb 100644 --- a/src/core/hle/function_wrappers.h +++ b/src/core/hle/function_wrappers.h | |||
| @@ -39,9 +39,16 @@ template<s32 func(s32*, u32*, s32, bool, s64)> void Wrap() { | |||
| 39 | RETURN(retval); | 39 | RETURN(retval); |
| 40 | } | 40 | } |
| 41 | 41 | ||
| 42 | // TODO(bunnei): Is this correct? Probably not | 42 | // TODO(bunnei): Is this correct? Probably not - Last parameter looks wrong for ArbitrateAddress |
| 43 | template<s32 func(u32, u32, u32, u32, s64)> void Wrap() { | 43 | template<s32 func(u32, u32, u32, u32, s64)> void Wrap() { |
| 44 | RETURN(func(PARAM(5), PARAM(1), PARAM(2), PARAM(3), (((s64)PARAM(4) << 32) | PARAM(0)))); | 44 | RETURN(func(PARAM(0), PARAM(1), PARAM(2), PARAM(3), (((s64)PARAM(5) << 32) | PARAM(4)))); |
| 45 | } | ||
| 46 | |||
| 47 | template<s32 func(u32*)> void Wrap(){ | ||
| 48 | u32 param_1 = 0; | ||
| 49 | u32 retval = func(¶m_1); | ||
| 50 | Core::g_app_core->SetReg(1, param_1); | ||
| 51 | RETURN(retval); | ||
| 45 | } | 52 | } |
| 46 | 53 | ||
| 47 | template<s32 func(u32, s64)> void Wrap() { | 54 | template<s32 func(u32, s64)> void Wrap() { |