diff options
author | bunnei <bunneidev@gmail.com> | 2020-08-07 04:28:11 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-07 04:28:11 +0200 |
commit | 5cc2f99fab1ec590d415605ced4e02054ba22e46 (patch) | |
tree | af48ea350f1bf17dc4a88769e3d43c758eef6d7f /src/core | |
parent | Merge pull request #4489 from lioncash/typesafe (diff) | |
parent | scheduler: Resolve sign conversion warning (diff) | |
download | yuzu-5cc2f99fab1ec590d415605ced4e02054ba22e46.tar yuzu-5cc2f99fab1ec590d415605ced4e02054ba22e46.tar.gz yuzu-5cc2f99fab1ec590d415605ced4e02054ba22e46.tar.bz2 yuzu-5cc2f99fab1ec590d415605ced4e02054ba22e46.tar.lz yuzu-5cc2f99fab1ec590d415605ced4e02054ba22e46.tar.xz yuzu-5cc2f99fab1ec590d415605ced4e02054ba22e46.tar.zst yuzu-5cc2f99fab1ec590d415605ced4e02054ba22e46.zip |
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/hle/kernel/address_arbiter.cpp | 2 | ||||
-rw-r--r-- | src/core/hle/kernel/scheduler.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
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<u32>(value)) { return ERR_INVALID_STATE; } current_value++; 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<u32>(top_threads[core]->GetProcessorID()) == core); if (update_thread(top_threads[core], sched)) { cores_needing_context_switch |= (1ul << core); } |