summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel/svc.cpp
diff options
context:
space:
mode:
authorGravatar Lioncash2018-07-19 14:36:22 -0400
committerGravatar Lioncash2018-07-19 15:46:17 -0400
commitb879fb84a22cbc098e9da1f27592b3c2790205e5 (patch)
tree03406880371a04075cfa3ebfc6f2912af476d39e /src/core/hle/kernel/svc.cpp
parentMerge pull request #709 from lioncash/thread-local (diff)
downloadyuzu-b879fb84a22cbc098e9da1f27592b3c2790205e5.tar.gz
yuzu-b879fb84a22cbc098e9da1f27592b3c2790205e5.tar.xz
yuzu-b879fb84a22cbc098e9da1f27592b3c2790205e5.zip
svc: Correct always true assertion case in SetThreadCoreMask
The reason this would never be true is that ideal_processor is a u8 and THREADPROCESSORID_DEFAULT is an s32. In this case, it boils down to how arithmetic conversions are performed before performing the comparison. If an unsigned value has a lesser conversion rank (aka smaller size) than the signed type being compared, then the unsigned value is promoted to the signed value (i.e. u8 -> s32 happens before the comparison). No sign-extension occurs here either. An alternative phrasing: Say we have a variable named core and it's given a value of -2. u8 core = -2; This becomes 254 due to the lack of sign. During integral promotion to the signed type, this still remains as 254, and therefore the condition will always be true, because no matter what value the u8 is given it will never be -2 in terms of 32 bits. Now, if one type was a s32 and one was a u32, this would be entirely different, since they have the same bit width (and the signed type would be converted to unsigned instead of the other way around) but would still have its representation preserved in terms of bits, allowing the comparison to be false in some cases, as opposed to being true all the time. --- We also get rid of two signed/unsigned comparison warnings while we're at it.
Diffstat (limited to 'src/core/hle/kernel/svc.cpp')
-rw-r--r--src/core/hle/kernel/svc.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp
index 5ad923fe7..c6b0bb442 100644
--- a/src/core/hle/kernel/svc.cpp
+++ b/src/core/hle/kernel/svc.cpp
@@ -795,8 +795,9 @@ static ResultCode SetThreadCoreMask(Handle thread_handle, u32 core, u64 mask) {
795 return ERR_INVALID_HANDLE; 795 return ERR_INVALID_HANDLE;
796 } 796 }
797 797
798 if (core == THREADPROCESSORID_DEFAULT) { 798 if (core == static_cast<u32>(THREADPROCESSORID_DEFAULT)) {
799 ASSERT(thread->owner_process->ideal_processor != THREADPROCESSORID_DEFAULT); 799 ASSERT(thread->owner_process->ideal_processor !=
800 static_cast<u8>(THREADPROCESSORID_DEFAULT));
800 // Set the target CPU to the one specified in the process' exheader. 801 // Set the target CPU to the one specified in the process' exheader.
801 core = thread->owner_process->ideal_processor; 802 core = thread->owner_process->ideal_processor;
802 mask = 1ull << core; 803 mask = 1ull << core;
@@ -811,7 +812,7 @@ static ResultCode SetThreadCoreMask(Handle thread_handle, u32 core, u64 mask) {
811 812
812 if (core == OnlyChangeMask) { 813 if (core == OnlyChangeMask) {
813 core = thread->ideal_core; 814 core = thread->ideal_core;
814 } else if (core >= Core::NUM_CPU_CORES && core != -1) { 815 } else if (core >= Core::NUM_CPU_CORES && core != static_cast<u32>(-1)) {
815 return ResultCode(ErrorModule::Kernel, ErrCodes::InvalidProcessorId); 816 return ResultCode(ErrorModule::Kernel, ErrCodes::InvalidProcessorId);
816 } 817 }
817 818