diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2023-02-21 18:58:04 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-21 18:58:04 -0500 |
| commit | 11f6bb153251462bf55afa59ba99b98f9c9ecaa1 (patch) | |
| tree | 22a1c190d8ce59d7cb7599c1a8cf6dfbdfe53eea /src/core/hle/kernel/svc.cpp | |
| parent | ba05301e1b91086d9286bd6cef99423ef409f0e6 (diff) | |
| parent | c9678bda2440423ec55d420aedd9a11d79834649 (diff) | |
Merge pull request #9846 from merryhime/type-const
svc: Fix type consistency (exposed on macOS)
Diffstat (limited to 'src/core/hle/kernel/svc.cpp')
| -rw-r--r-- | src/core/hle/kernel/svc.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index 1072da8cc..a0bfd6bbc 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp @@ -82,7 +82,7 @@ static_assert(sizeof(uint64_t) == 8); static void SvcWrap_SetHeapSize64From32(Core::System& system) { Result ret{}; - uintptr_t out_address{}; + uint64_t out_address{}; uint32_t size{}; size = Convert<uint32_t>(GetReg32(system, 1)); @@ -729,7 +729,7 @@ static void SvcWrap_GetLastThreadInfo64From32(Core::System& system) { Result ret{}; ilp32::LastThreadContext out_context{}; - uintptr_t out_tls_address{}; + uint64_t out_tls_address{}; uint32_t out_flags{}; ret = GetLastThreadInfo64From32(system, &out_context, &out_tls_address, &out_flags); @@ -1278,8 +1278,8 @@ static void SvcWrap_QueryPhysicalAddress64From32(Core::System& system) { static void SvcWrap_QueryIoMapping64From32(Core::System& system) { Result ret{}; - uintptr_t out_address{}; - uintptr_t out_size{}; + uint64_t out_address{}; + uint64_t out_size{}; uint64_t physical_address{}; uint32_t size{}; @@ -2088,7 +2088,7 @@ static void SvcWrap_UnmapInsecureMemory64From32(Core::System& system) { static void SvcWrap_SetHeapSize64(Core::System& system) { Result ret{}; - uintptr_t out_address{}; + uint64_t out_address{}; uint64_t size{}; size = Convert<uint64_t>(GetReg64(system, 1)); @@ -2705,7 +2705,7 @@ static void SvcWrap_GetLastThreadInfo64(Core::System& system) { Result ret{}; lp64::LastThreadContext out_context{}; - uintptr_t out_tls_address{}; + uint64_t out_tls_address{}; uint32_t out_flags{}; ret = GetLastThreadInfo64(system, &out_context, &out_tls_address, &out_flags); @@ -3217,8 +3217,8 @@ static void SvcWrap_QueryPhysicalAddress64(Core::System& system) { static void SvcWrap_QueryIoMapping64(Core::System& system) { Result ret{}; - uintptr_t out_address{}; - uintptr_t out_size{}; + uint64_t out_address{}; + uint64_t out_size{}; uint64_t physical_address{}; uint64_t size{}; |