summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSubv <subv2112@gmail.com>2016-04-17 20:36:15 +0200
committerSubv <subv2112@gmail.com>2016-05-13 03:00:29 +0200
commit42a50da76b816fff95ae0e438d3e966f6f991b8a (patch)
treeb5363b4ffb961889379c4c1b5873f609d4ad1510 /src
parentMerge pull request #1766 from Subv/log_cpu (diff)
downloadyuzu-42a50da76b816fff95ae0e438d3e966f6f991b8a.tar
yuzu-42a50da76b816fff95ae0e438d3e966f6f991b8a.tar.gz
yuzu-42a50da76b816fff95ae0e438d3e966f6f991b8a.tar.bz2
yuzu-42a50da76b816fff95ae0e438d3e966f6f991b8a.tar.lz
yuzu-42a50da76b816fff95ae0e438d3e966f6f991b8a.tar.xz
yuzu-42a50da76b816fff95ae0e438d3e966f6f991b8a.tar.zst
yuzu-42a50da76b816fff95ae0e438d3e966f6f991b8a.zip
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/function_wrappers.h3
-rw-r--r--src/core/hle/kernel/process.cpp2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/core/hle/function_wrappers.h b/src/core/hle/function_wrappers.h
index 4d718b681..bf7f875b6 100644
--- a/src/core/hle/function_wrappers.h
+++ b/src/core/hle/function_wrappers.h
@@ -170,7 +170,8 @@ template<ResultCode func(s64*, u32, s32)> void Wrap() {
template<ResultCode func(u32*, u32, u32, u32, u32)> void Wrap() {
u32 param_1 = 0;
- u32 retval = func(&param_1, PARAM(1), PARAM(2), PARAM(3), PARAM(4)).raw;
+ // The last parameter is passed in R0 instead of R4
+ u32 retval = func(&param_1, PARAM(1), PARAM(2), PARAM(3), PARAM(0)).raw;
Core::g_app_core->SetReg(1, param_1);
FuncReturn(retval);
}
diff --git a/src/core/hle/kernel/process.cpp b/src/core/hle/kernel/process.cpp
index 0546f6e16..69302cc82 100644
--- a/src/core/hle/kernel/process.cpp
+++ b/src/core/hle/kernel/process.cpp
@@ -209,7 +209,7 @@ ResultVal<VAddr> Process::LinearAllocate(VAddr target, u32 size, VMAPermission p
return ERR_INVALID_ADDRESS;
}
- // Expansion of the linear heap is only allowed if you do an allocation immediatelly at its
+ // Expansion of the linear heap is only allowed if you do an allocation immediately at its
// end. It's possible to free gaps in the middle of the heap and then reallocate them later,
// but expansions are only allowed at the end.
if (target == heap_end) {