N-archive/suyu
1
0
Fork 0
mirror of https://git.suyu.dev/suyu/suyu.git synced 2024-11-23 15:22:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #721 from lioncash/svc

Browse source 
svc: Correct always true assertion case in SetThreadCoreMask
This commit is contained in:
bunnei 2018-07-19 16:11:40 -07:00 committed by GitHub
commit 2194308245
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/core/hle/kernel/svc.cpp
View file

@ -795,8 +795,9 @@ static ResultCode SetThreadCoreMask(Handle thread_handle, u32 core, u64 mask) {
return ERR_INVALID_HANDLE; return ERR_INVALID_HANDLE;
} }
if (core == THREADPROCESSORID_DEFAULT) { if (core == static_cast<u32>(THREADPROCESSORID_DEFAULT)) {
ASSERT(thread->owner_process->ideal_processor != THREADPROCESSORID_DEFAULT); ASSERT(thread->owner_process->ideal_processor !=
static_cast<u8>(THREADPROCESSORID_DEFAULT));
// Set the target CPU to the one specified in the process' exheader. // Set the target CPU to the one specified in the process' exheader.
core = thread->owner_process->ideal_processor; core = thread->owner_process->ideal_processor;
mask = 1ull << core; mask = 1ull << core;
@ -811,7 +812,7 @@ static ResultCode SetThreadCoreMask(Handle thread_handle, u32 core, u64 mask) {
if (core == OnlyChangeMask) { if (core == OnlyChangeMask) {
core = thread->ideal_core; core = thread->ideal_core;
} else if (core >= Core::NUM_CPU_CORES && core != -1) { } else if (core >= Core::NUM_CPU_CORES && core != static_cast<u32>(-1)) {
return ResultCode(ErrorModule::Kernel, ErrCodes::InvalidProcessorId); return ResultCode(ErrorModule::Kernel, ErrCodes::InvalidProcessorId);
} }