From 1a45b15a8c29421756524139845ff28a7f5b6e34 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 5 Aug 2020 15:07:17 -0400 Subject: [PATCH 1/2] address_arbiter: Resolve sign conversion warning Makes our type conversion explicit. --- src/core/hle/kernel/address_arbiter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/hle/kernel/address_arbiter.cpp b/src/core/hle/kernel/address_arbiter.cpp index df0debe1b..b882eaa0f 100644 --- a/src/core/hle/kernel/address_arbiter.cpp +++ b/src/core/hle/kernel/address_arbiter.cpp @@ -81,7 +81,7 @@ ResultCode AddressArbiter::IncrementAndSignalToAddressIfEqual(VAddr address, s32 do { current_value = monitor.ExclusiveRead32(current_core, address); - if (current_value != value) { + if (current_value != static_cast(value)) { return ERR_INVALID_STATE; } current_value++; From 9893da8e2c563e00005f0ad2fdaa86b6d7762d84 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 5 Aug 2020 15:12:29 -0400 Subject: [PATCH 2/2] scheduler: Resolve sign conversion warning --- src/core/hle/kernel/scheduler.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/core/hle/kernel/scheduler.cpp b/src/core/hle/kernel/scheduler.cpp index f93e5e4b0..fc656d613 100644 --- a/src/core/hle/kernel/scheduler.cpp +++ b/src/core/hle/kernel/scheduler.cpp @@ -131,7 +131,8 @@ u32 GlobalScheduler::SelectThreads() { u32 cores_needing_context_switch{}; for (u32 core = 0; core < Core::Hardware::NUM_CPU_CORES; core++) { Scheduler& sched = kernel.Scheduler(core); - ASSERT(top_threads[core] == nullptr || top_threads[core]->GetProcessorID() == core); + ASSERT(top_threads[core] == nullptr || + static_cast(top_threads[core]->GetProcessorID()) == core); if (update_thread(top_threads[core], sched)) { cores_needing_context_switch |= (1ul << core); }