diff options
| author | 2023-02-21 18:58:04 -0500 | |
|---|---|---|
| committer | 2023-02-21 18:58:04 -0500 | |
| commit | 11f6bb153251462bf55afa59ba99b98f9c9ecaa1 (patch) | |
| tree | 22a1c190d8ce59d7cb7599c1a8cf6dfbdfe53eea /src/core/hle/kernel/svc.cpp | |
| parent | Merge pull request #9841 from abouvier/httplib-update (diff) | |
| parent | svc: Fix type consistency (exposed on macOS) (diff) | |
| download | yuzu-11f6bb153251462bf55afa59ba99b98f9c9ecaa1.tar.gz yuzu-11f6bb153251462bf55afa59ba99b98f9c9ecaa1.tar.xz yuzu-11f6bb153251462bf55afa59ba99b98f9c9ecaa1.zip | |
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); | |||
| 82 | static void SvcWrap_SetHeapSize64From32(Core::System& system) { | 82 | static void SvcWrap_SetHeapSize64From32(Core::System& system) { |
| 83 | Result ret{}; | 83 | Result ret{}; |
| 84 | 84 | ||
| 85 | uintptr_t out_address{}; | 85 | uint64_t out_address{}; |
| 86 | uint32_t size{}; | 86 | uint32_t size{}; |
| 87 | 87 | ||
| 88 | size = Convert<uint32_t>(GetReg32(system, 1)); | 88 | size = Convert<uint32_t>(GetReg32(system, 1)); |
| @@ -729,7 +729,7 @@ static void SvcWrap_GetLastThreadInfo64From32(Core::System& system) { | |||
| 729 | Result ret{}; | 729 | Result ret{}; |
| 730 | 730 | ||
| 731 | ilp32::LastThreadContext out_context{}; | 731 | ilp32::LastThreadContext out_context{}; |
| 732 | uintptr_t out_tls_address{}; | 732 | uint64_t out_tls_address{}; |
| 733 | uint32_t out_flags{}; | 733 | uint32_t out_flags{}; |
| 734 | 734 | ||
| 735 | ret = GetLastThreadInfo64From32(system, &out_context, &out_tls_address, &out_flags); | 735 | ret = GetLastThreadInfo64From32(system, &out_context, &out_tls_address, &out_flags); |
| @@ -1278,8 +1278,8 @@ static void SvcWrap_QueryPhysicalAddress64From32(Core::System& system) { | |||
| 1278 | static void SvcWrap_QueryIoMapping64From32(Core::System& system) { | 1278 | static void SvcWrap_QueryIoMapping64From32(Core::System& system) { |
| 1279 | Result ret{}; | 1279 | Result ret{}; |
| 1280 | 1280 | ||
| 1281 | uintptr_t out_address{}; | 1281 | uint64_t out_address{}; |
| 1282 | uintptr_t out_size{}; | 1282 | uint64_t out_size{}; |
| 1283 | uint64_t physical_address{}; | 1283 | uint64_t physical_address{}; |
| 1284 | uint32_t size{}; | 1284 | uint32_t size{}; |
| 1285 | 1285 | ||
| @@ -2088,7 +2088,7 @@ static void SvcWrap_UnmapInsecureMemory64From32(Core::System& system) { | |||
| 2088 | static void SvcWrap_SetHeapSize64(Core::System& system) { | 2088 | static void SvcWrap_SetHeapSize64(Core::System& system) { |
| 2089 | Result ret{}; | 2089 | Result ret{}; |
| 2090 | 2090 | ||
| 2091 | uintptr_t out_address{}; | 2091 | uint64_t out_address{}; |
| 2092 | uint64_t size{}; | 2092 | uint64_t size{}; |
| 2093 | 2093 | ||
| 2094 | size = Convert<uint64_t>(GetReg64(system, 1)); | 2094 | size = Convert<uint64_t>(GetReg64(system, 1)); |
| @@ -2705,7 +2705,7 @@ static void SvcWrap_GetLastThreadInfo64(Core::System& system) { | |||
| 2705 | Result ret{}; | 2705 | Result ret{}; |
| 2706 | 2706 | ||
| 2707 | lp64::LastThreadContext out_context{}; | 2707 | lp64::LastThreadContext out_context{}; |
| 2708 | uintptr_t out_tls_address{}; | 2708 | uint64_t out_tls_address{}; |
| 2709 | uint32_t out_flags{}; | 2709 | uint32_t out_flags{}; |
| 2710 | 2710 | ||
| 2711 | ret = GetLastThreadInfo64(system, &out_context, &out_tls_address, &out_flags); | 2711 | ret = GetLastThreadInfo64(system, &out_context, &out_tls_address, &out_flags); |
| @@ -3217,8 +3217,8 @@ static void SvcWrap_QueryPhysicalAddress64(Core::System& system) { | |||
| 3217 | static void SvcWrap_QueryIoMapping64(Core::System& system) { | 3217 | static void SvcWrap_QueryIoMapping64(Core::System& system) { |
| 3218 | Result ret{}; | 3218 | Result ret{}; |
| 3219 | 3219 | ||
| 3220 | uintptr_t out_address{}; | 3220 | uint64_t out_address{}; |
| 3221 | uintptr_t out_size{}; | 3221 | uint64_t out_size{}; |
| 3222 | uint64_t physical_address{}; | 3222 | uint64_t physical_address{}; |
| 3223 | uint64_t size{}; | 3223 | uint64_t size{}; |
| 3224 | 3224 | ||