summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2014-07-07 04:17:34 +0200
committerbunnei <bunneidev@gmail.com>2014-07-08 04:13:40 +0200
commit59f275048209fd18f9c8284d101c7f5baaa4762e (patch)
treea5b67837fba04a2162eedbcb3ff5831893970e78
parentSharedMemory: Updated MapSharedMemory to use an enum for permissions. (diff)
downloadyuzu-59f275048209fd18f9c8284d101c7f5baaa4762e.tar
yuzu-59f275048209fd18f9c8284d101c7f5baaa4762e.tar.gz
yuzu-59f275048209fd18f9c8284d101c7f5baaa4762e.tar.bz2
yuzu-59f275048209fd18f9c8284d101c7f5baaa4762e.tar.lz
yuzu-59f275048209fd18f9c8284d101c7f5baaa4762e.tar.xz
yuzu-59f275048209fd18f9c8284d101c7f5baaa4762e.tar.zst
yuzu-59f275048209fd18f9c8284d101c7f5baaa4762e.zip
-rw-r--r--src/core/hle/function_wrappers.h11
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() {
RETURN(retval);
}
-// TODO(bunnei): Is this correct? Probably not
+// TODO(bunnei): Is this correct? Probably not - Last parameter looks wrong for ArbitrateAddress
template<s32 func(u32, u32, u32, u32, s64)> void Wrap() {
- RETURN(func(PARAM(5), PARAM(1), PARAM(2), PARAM(3), (((s64)PARAM(4) << 32) | PARAM(0))));
+ RETURN(func(PARAM(0), PARAM(1), PARAM(2), PARAM(3), (((s64)PARAM(5) << 32) | PARAM(4))));
+}
+
+template<s32 func(u32*)> void Wrap(){
+ u32 param_1 = 0;
+ u32 retval = func(&param_1);
+ Core::g_app_core->SetReg(1, param_1);
+ RETURN(retval);
}
template<s32 func(u32, s64)> void Wrap() {