From 1b05c744e7976045c745552bfa695b75b6741d08 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Mon, 31 Mar 2025 09:44:38 +0200 Subject: [PATCH] Review fixes + warning fixes --- rpcs3/Emu/Cell/Modules/cellAudio.h | 2 +- rpcs3/Emu/Cell/PPUThread.cpp | 8 ++++---- rpcs3/Emu/Cell/SPUThread.cpp | 4 ++-- rpcs3/Emu/RSX/Overlays/overlay_controls.h | 5 ++++- rpcs3/Emu/RSX/Overlays/overlay_video.h | 5 ++++- rpcs3/Emu/RSX/Program/ProgramStateCache.cpp | 4 ---- rpcs3/Emu/RSX/VK/VKOverlays.cpp | 3 ++- rpcs3/rpcs3qt/qt_video_source.h | 2 +- rpcs3/util/types.hpp | 2 +- 9 files changed, 19 insertions(+), 16 deletions(-) diff --git a/rpcs3/Emu/Cell/Modules/cellAudio.h b/rpcs3/Emu/Cell/Modules/cellAudio.h index 939b7f994c..a88ac6edad 100644 --- a/rpcs3/Emu/Cell/Modules/cellAudio.h +++ b/rpcs3/Emu/Cell/Modules/cellAudio.h @@ -195,7 +195,7 @@ struct audio_port // Handle copy ctor of atomic var audio_port(const audio_port& r) { - std::memcpy(this, &r, sizeof(r)); + std::memcpy(static_cast(this), &r, sizeof(r)); } ENABLE_BITWISE_SERIALIZATION; diff --git a/rpcs3/Emu/Cell/PPUThread.cpp b/rpcs3/Emu/Cell/PPUThread.cpp index bdd6eeae84..47a4784104 100644 --- a/rpcs3/Emu/Cell/PPUThread.cpp +++ b/rpcs3/Emu/Cell/PPUThread.cpp @@ -4956,9 +4956,9 @@ bool ppu_initialize(const ppu_module& info, bool check_only, u64 file_s return +code_ptr; } - constexpr auto abs_diff = [](u64 a, u64 b) { return a <= b ? b - a : a - b; }; + [[maybe_unused]] constexpr auto abs_diff = [](u64 a, u64 b) { return a <= b ? b - a : a - b; }; - auto write_le = [](u8*& code, auto value) + [[maybe_unused]] auto write_le = [](u8*& code, auto value) { write_to_ptr>>(code, value); code += sizeof(value); @@ -5823,7 +5823,7 @@ static void ppu_initialize2(jit_compiler& jit, const ppu_module& module min_addr = std::min(min_addr, mod_func.addr); // Translate - if (const auto func = translator.Translate(mod_func)) + if ([[maybe_unused]] const auto func = translator.Translate(mod_func)) { #ifdef ARCH_X64 // TODO // Run optimization passes @@ -5841,7 +5841,7 @@ static void ppu_initialize2(jit_compiler& jit, const ppu_module& module // Run this only in one module for all functions compiled if (module_part.jit_bounds) { - if (const auto func = translator.GetSymbolResolver(module_part)) + if ([[maybe_unused]] const auto func = translator.GetSymbolResolver(module_part)) { #ifdef ARCH_X64 // TODO // Run optimization passes diff --git a/rpcs3/Emu/Cell/SPUThread.cpp b/rpcs3/Emu/Cell/SPUThread.cpp index 6a8c3aeceb..db53a22f61 100644 --- a/rpcs3/Emu/Cell/SPUThread.cpp +++ b/rpcs3/Emu/Cell/SPUThread.cpp @@ -1237,7 +1237,7 @@ void spu_thread::dump_regs(std::string& ret, std::any& /*custom_data*/) const if (const_value != r) { - // Expectation of pretictable code path has not been met (such as a branch directly to the instruction) + // Expectation of predictable code path has not been met (such as a branch directly to the instruction) is_const = false; } @@ -1447,7 +1447,7 @@ std::vector> spu_thread::dump_callstack_list() const if (v != v128::from32r(addr)) { // 1) Non-zero lower words are invalid (because BRSL-like instructions generate only zeroes) - // 2) Bits normally masked out by indirect braches are considered invalid + // 2) Bits normally masked out by indirect branches are considered invalid return true; } diff --git a/rpcs3/Emu/RSX/Overlays/overlay_controls.h b/rpcs3/Emu/RSX/Overlays/overlay_controls.h index b6dd2b84da..f39a25f2a4 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_controls.h +++ b/rpcs3/Emu/RSX/Overlays/overlay_controls.h @@ -36,6 +36,8 @@ namespace rsx int bpp = 0; bool dirty = false; + image_info_base() {} + virtual ~image_info_base() {} virtual const u8* get_data() const = 0; }; @@ -46,10 +48,11 @@ namespace rsx std::vector data_grey; public: + using image_info_base::image_info_base; image_info(image_info&) = delete; image_info(const std::string& filename, bool grayscaled = false); image_info(const std::vector& bytes, bool grayscaled = false); - ~image_info(); + virtual ~image_info(); void load_data(const std::vector& bytes, bool grayscaled = false); const u8* get_data() const override { return channels == 4 ? data : data_grey.empty() ? nullptr : data_grey.data(); } diff --git a/rpcs3/Emu/RSX/Overlays/overlay_video.h b/rpcs3/Emu/RSX/Overlays/overlay_video.h index bdff580f0e..92297dee42 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_video.h +++ b/rpcs3/Emu/RSX/Overlays/overlay_video.h @@ -9,8 +9,11 @@ namespace rsx { struct video_info : public image_info_base { - std::vector data; + using image_info_base::image_info_base; + virtual ~video_info() {} const u8* get_data() const override { return data.empty() ? nullptr : data.data(); } + + std::vector data; }; class video_view final : public image_view diff --git a/rpcs3/Emu/RSX/Program/ProgramStateCache.cpp b/rpcs3/Emu/RSX/Program/ProgramStateCache.cpp index 9d70212c2a..4baf47ac4d 100644 --- a/rpcs3/Emu/RSX/Program/ProgramStateCache.cpp +++ b/rpcs3/Emu/RSX/Program/ProgramStateCache.cpp @@ -23,10 +23,6 @@ #endif #endif -#ifdef ARCH_ARM64 -#define AVX512_ICL_FUNC -#endif - #ifdef _MSC_VER #define AVX512_ICL_FUNC #else diff --git a/rpcs3/Emu/RSX/VK/VKOverlays.cpp b/rpcs3/Emu/RSX/VK/VKOverlays.cpp index f195ee6c15..f4e7d092f9 100644 --- a/rpcs3/Emu/RSX/VK/VKOverlays.cpp +++ b/rpcs3/Emu/RSX/VK/VKOverlays.cpp @@ -402,7 +402,8 @@ namespace vk upload_heap.unmap(); const VkImageSubresourceRange range = { VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, layers }; - VkBufferImageCopy region { + VkBufferImageCopy region + { .bufferOffset = offset, .bufferRowLength = w, .bufferImageHeight = h, diff --git a/rpcs3/rpcs3qt/qt_video_source.h b/rpcs3/rpcs3qt/qt_video_source.h index aa6e61af94..27f716f0d4 100644 --- a/rpcs3/rpcs3qt/qt_video_source.h +++ b/rpcs3/rpcs3qt/qt_video_source.h @@ -23,7 +23,7 @@ public: void get_image(std::vector& data, int& w, int& h, int& ch, int& bpp) override; bool has_new() const override { return m_has_new; } - virtual void set_active(bool active); + void set_active(bool active) override; bool get_active() const override { return m_active; } void start_movie(); diff --git a/rpcs3/util/types.hpp b/rpcs3/util/types.hpp index 0bbf45074c..6979d9a887 100644 --- a/rpcs3/util/types.hpp +++ b/rpcs3/util/types.hpp @@ -1192,7 +1192,7 @@ constexpr void write_to_ptr(U&& array, usz pos, const T& value) { static_assert(sizeof(T) % sizeof(array[0]) == 0); if (!std::is_constant_evaluated()) - std::memcpy(&array[pos], &value, sizeof(value)); + std::memcpy(static_cast(&array[pos]), &value, sizeof(value)); else ensure(!"Unimplemented"); }