From d3fedffa6affeb31e6c5416e3122fd744ac0ed20 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Sat, 28 Dec 2024 18:14:08 +0100 Subject: [PATCH 1/3] VS: Add sysinfo_darwin.mm to filters --- rpcs3/rpcs3.vcxproj | 1 + rpcs3/rpcs3.vcxproj.filters | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/rpcs3/rpcs3.vcxproj b/rpcs3/rpcs3.vcxproj index 1973831ab3..755370a4c7 100644 --- a/rpcs3/rpcs3.vcxproj +++ b/rpcs3/rpcs3.vcxproj @@ -2069,6 +2069,7 @@ + diff --git a/rpcs3/rpcs3.vcxproj.filters b/rpcs3/rpcs3.vcxproj.filters index 0e2eae3a00..4cdbcedc2e 100644 --- a/rpcs3/rpcs3.vcxproj.filters +++ b/rpcs3/rpcs3.vcxproj.filters @@ -190,6 +190,9 @@ {f8a98f7b-dc23-47c0-8a5f-d0b76eaf0df5} + + {f6b701aa-7f4a-4816-b05f-80d24cb70e13} + @@ -1806,5 +1809,8 @@ CI + + Darwin + \ No newline at end of file From a49cfc5a9177a0457cd2a93c2f7e3d4cc7a23bad Mon Sep 17 00:00:00 2001 From: Megamouse Date: Sat, 28 Dec 2024 18:14:57 +0100 Subject: [PATCH 2/3] 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; } From 5e176a390fa7c049640612f4a62ee50e129b0222 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Sat, 28 Dec 2024 18:15:19 +0100 Subject: [PATCH 3/3] MacOS: silence some warnings --- darwin/util/sysinfo_darwin.mm | 2 ++ rpcs3/Input/gui_pad_thread.cpp | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/darwin/util/sysinfo_darwin.mm b/darwin/util/sysinfo_darwin.mm index e1ffe458f3..0be5eec7f0 100644 --- a/darwin/util/sysinfo_darwin.mm +++ b/darwin/util/sysinfo_darwin.mm @@ -1,5 +1,7 @@ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wold-style-cast" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wmissing-declarations" #import #pragma GCC diagnostic pop diff --git a/rpcs3/Input/gui_pad_thread.cpp b/rpcs3/Input/gui_pad_thread.cpp index ff179f644e..87fa0999f3 100644 --- a/rpcs3/Input/gui_pad_thread.cpp +++ b/rpcs3/Input/gui_pad_thread.cpp @@ -27,6 +27,10 @@ #elif defined(__APPLE__) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wold-style-cast" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wmissing-declarations" +#pragma GCC diagnostic ignored "-Wnullability-completeness" +#pragma GCC diagnostic ignored "-Wdeprecated-anon-enum-enum-conversion" #include #include #pragma GCC diagnostic pop