From 3411883fe32786c08bbdb28fd35e0b39a420be41 Mon Sep 17 00:00:00 2001
From: bunnei
Date: Mon, 28 Aug 2017 21:09:42 -0400
Subject: arm: Use 64-bit addressing in a bunch of places.

---
 src/core/hle/function_wrappers.h           | 2 +-
 src/core/hle/service/ldr_ro/cro_helper.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/core/hle')

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() {
-- 
cgit v1.2.3