From a49cfc5a9177a0457cd2a93c2f7e3d4cc7a23bad Mon Sep 17 00:00:00 2001 From: Megamouse Date: Sat, 28 Dec 2024 18:14:57 +0100 Subject: [PATCH] Simplify some ternaries --- rpcs3/Emu/Cell/Modules/cellSpursSpu.cpp | 12 ++++++------ rpcs3/rpcs3qt/gui_settings.cpp | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/rpcs3/Emu/Cell/Modules/cellSpursSpu.cpp b/rpcs3/Emu/Cell/Modules/cellSpursSpu.cpp index f559aeebff..435fa1636d 100644 --- a/rpcs3/Emu/Cell/Modules/cellSpursSpu.cpp +++ b/rpcs3/Emu/Cell/Modules/cellSpursSpu.cpp @@ -622,7 +622,7 @@ bool spursKernel2SelectWorkload(spu_thread& spu) void spursKernelDispatchWorkload(spu_thread& spu, u64 widAndPollStatus) { const auto ctxt = spu._ptr(0x100); - auto isKernel2 = ctxt->spurs->flags1 & SF1_32_WORKLOADS ? true : false; + const bool isKernel2 = ctxt->spurs->flags1 & SF1_32_WORKLOADS ? true : false; auto pollStatus = static_cast(widAndPollStatus); auto wid = static_cast(widAndPollStatus >> 32); @@ -674,7 +674,7 @@ void spursKernelDispatchWorkload(spu_thread& spu, u64 widAndPollStatus) bool spursKernelWorkloadExit(spu_thread& spu) { const auto ctxt = spu._ptr(0x100); - auto isKernel2 = ctxt->spurs->flags1 & SF1_32_WORKLOADS ? true : false; + const bool isKernel2 = ctxt->spurs->flags1 & SF1_32_WORKLOADS ? true : false; // Select next workload to run spu.gpr[3].clear(); @@ -701,7 +701,7 @@ bool spursKernelEntry(spu_thread& spu) ctxt->spuNum = spu.gpr[3]._u32[3]; ctxt->spurs.set(spu.gpr[4]._u64[1]); - auto isKernel2 = ctxt->spurs->flags1 & SF1_32_WORKLOADS ? true : false; + const bool isKernel2 = ctxt->spurs->flags1 & SF1_32_WORKLOADS ? true : false; // Initialise the SPURS context to its initial values ctxt->dmaTagId = CELL_SPURS_KERNEL_DMA_TAG_ID; @@ -785,8 +785,8 @@ void spursSysServiceIdleHandler(spu_thread& spu, SpursKernelContext* ctxt) } } - bool allSpusIdle = nIdlingSpus == spurs->nSpus ? true : false; - bool exitIfNoWork = spurs->flags1 & SF1_EXIT_IF_NO_WORK ? true : false; + const bool allSpusIdle = nIdlingSpus == spurs->nSpus; + const bool exitIfNoWork = spurs->flags1 & SF1_EXIT_IF_NO_WORK ? true : false; shouldExit = allSpusIdle && exitIfNoWork; // Check if any workloads can be scheduled @@ -843,7 +843,7 @@ void spursSysServiceIdleHandler(spu_thread& spu, SpursKernelContext* ctxt) } } - bool spuIdling = spurs->spuIdling & (1 << ctxt->spuNum) ? true : false; + const bool spuIdling = spurs->spuIdling & (1 << ctxt->spuNum) ? true : false; if (foundReadyWorkload && shouldExit == false) { spurs->spuIdling &= ~(1 << ctxt->spuNum); diff --git a/rpcs3/rpcs3qt/gui_settings.cpp b/rpcs3/rpcs3qt/gui_settings.cpp index 8b14e490f8..a79f9d9db7 100644 --- a/rpcs3/rpcs3qt/gui_settings.cpp +++ b/rpcs3/rpcs3qt/gui_settings.cpp @@ -206,7 +206,7 @@ bool gui_settings::GetBootConfirmation(QWidget* parent, const gui_save& gui_save { if (Emu.GetStatus(false) != system_state::stopping) { - ensure(info == Emu.GetEmulationIdentifier(old_status == system_state::stopping ? true : false)); + ensure(info == Emu.GetEmulationIdentifier(old_status == system_state::stopping)); return true; }