notsoyuzu
/
yuzu-mainline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4490 from lioncash/arbiter 

address_arbiter/scheduler: Resolve sign conversion warnings
This commit is contained in:
bunnei 2020-08-06 22:28:11 -04:00 committed by GitHub
parent 1cc0e4b4d8 9893da8e2c
commit 5cc2f99fab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/hle/kernel/address_arbiter.cpp
View File

@ -81,7 +81,7 @@ ResultCode AddressArbiter::IncrementAndSignalToAddressIfEqual(VAddr address, s32
do { do {
current_value = monitor.ExclusiveRead32(current_core, address); current_value = monitor.ExclusiveRead32(current_core, address);
if (current_value != value) { if (current_value != static_cast<u32>(value)) {
return ERR_INVALID_STATE; return ERR_INVALID_STATE;
} }
current_value++; current_value++;

3
src/core/hle/kernel/scheduler.cpp
View File

@ -131,7 +131,8 @@ u32 GlobalScheduler::SelectThreads() {
u32 cores_needing_context_switch{}; u32 cores_needing_context_switch{};
for (u32 core = 0; core < Core::Hardware::NUM_CPU_CORES; core++) { for (u32 core = 0; core < Core::Hardware::NUM_CPU_CORES; core++) {
Scheduler& sched = kernel.Scheduler(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)) { if (update_thread(top_threads[core], sched)) {
cores_needing_context_switch |= (1ul << core); cores_needing_context_switch |= (1ul << core);
} }