diff options
author | bunnei <bunneidev@gmail.com> | 2017-08-29 03:09:42 +0200 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2017-09-30 20:28:53 +0200 |
commit | 3411883fe32786c08bbdb28fd35e0b39a420be41 (patch) | |
tree | 5d041dd65fcc20f2b8226f70b718a9c72e0bae5a /src/core/hle | |
parent | elf: Check if machine is ARM. (diff) | |
download | yuzu-3411883fe32786c08bbdb28fd35e0b39a420be41.tar yuzu-3411883fe32786c08bbdb28fd35e0b39a420be41.tar.gz yuzu-3411883fe32786c08bbdb28fd35e0b39a420be41.tar.bz2 yuzu-3411883fe32786c08bbdb28fd35e0b39a420be41.tar.lz yuzu-3411883fe32786c08bbdb28fd35e0b39a420be41.tar.xz yuzu-3411883fe32786c08bbdb28fd35e0b39a420be41.tar.zst yuzu-3411883fe32786c08bbdb28fd35e0b39a420be41.zip |
Diffstat (limited to 'src/core/hle')
-rw-r--r-- | src/core/hle/function_wrappers.h | 2 | ||||
-rw-r--r-- | src/core/hle/service/ldr_ro/cro_helper.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/function_wrappers.h b/src/core/hle/function_wrappers.h index 5e6002f4e..bc81c06b4 100644 --- a/src/core/hle/function_wrappers.h +++ b/src/core/hle/function_wrappers.h @@ -20,7 +20,7 @@ namespace HLE { * HLE a function return from the current ARM11 userland process * @param res Result to return */ -static inline void FuncReturn(u32 res) { +static inline void FuncReturn(u64 res) { Core::CPU().SetReg(0, res); } diff --git a/src/core/hle/service/ldr_ro/cro_helper.cpp b/src/core/hle/service/ldr_ro/cro_helper.cpp index f78545f37..6128f8a6c 100644 --- a/src/core/hle/service/ldr_ro/cro_helper.cpp +++ b/src/core/hle/service/ldr_ro/cro_helper.cpp @@ -274,7 +274,7 @@ ResultVal<VAddr> CROHelper::RebaseSegmentTable(u32 cro_size, VAddr data_segment_ } SetEntry(i, segment); } - return MakeResult<u32>(prev_data_segment + module_address); + return MakeResult<VAddr>(prev_data_segment + module_address); } ResultCode CROHelper::RebaseExportNamedSymbolTable() { |