diff options
| author | 2017-08-28 21:09:42 -0400 | |
|---|---|---|
| committer | 2017-09-30 14:28:53 -0400 | |
| commit | 3411883fe32786c08bbdb28fd35e0b39a420be41 (patch) | |
| tree | 5d041dd65fcc20f2b8226f70b718a9c72e0bae5a /src/core/hle | |
| parent | elf: Check if machine is ARM. (diff) | |
| download | yuzu-3411883fe32786c08bbdb28fd35e0b39a420be41.tar.gz yuzu-3411883fe32786c08bbdb28fd35e0b39a420be41.tar.xz yuzu-3411883fe32786c08bbdb28fd35e0b39a420be41.zip | |
arm: Use 64-bit addressing in a bunch of places.
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 { | |||
| 20 | * HLE a function return from the current ARM11 userland process | 20 | * HLE a function return from the current ARM11 userland process |
| 21 | * @param res Result to return | 21 | * @param res Result to return |
| 22 | */ | 22 | */ |
| 23 | static inline void FuncReturn(u32 res) { | 23 | static inline void FuncReturn(u64 res) { |
| 24 | Core::CPU().SetReg(0, res); | 24 | Core::CPU().SetReg(0, res); |
| 25 | } | 25 | } |
| 26 | 26 | ||
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_ | |||
| 274 | } | 274 | } |
| 275 | SetEntry(i, segment); | 275 | SetEntry(i, segment); |
| 276 | } | 276 | } |
| 277 | return MakeResult<u32>(prev_data_segment + module_address); | 277 | return MakeResult<VAddr>(prev_data_segment + module_address); |
| 278 | } | 278 | } |
| 279 | 279 | ||
| 280 | ResultCode CROHelper::RebaseExportNamedSymbolTable() { | 280 | ResultCode CROHelper::RebaseExportNamedSymbolTable() { |