From 7b03b695f52e626504c52cefdc4717517ef05207 Mon Sep 17 00:00:00 2001 From: DH Date: Sun, 5 Oct 2025 00:54:46 +0300 Subject: [PATCH] android: fix linkage errors --- kernel/cellos/include/cellos/sys_net/lv2_socket.h | 2 +- ps3fw/cellGame.cpp | 2 +- rpcs3/Emu/CPU/CPUThread.h | 2 +- rpcs3/Emu/Cell/PPUAnalyser.h | 2 +- rpcs3/Emu/Cell/PPUInterpreter.cpp | 2 +- rpcs3/Emu/Cell/PPUThread.cpp | 2 +- rpcs3/Emu/Cell/SPUInterpreter.cpp | 2 +- rpcs3/Emu/Cell/SPURecompiler.h | 2 +- rpcs3/Emu/System.cpp | 4 ++-- rpcs3/Emu/System.h | 2 +- rpcs3/Loader/ELF.h | 4 ++-- rx/include/rx/format.hpp | 1 - 12 files changed, 13 insertions(+), 14 deletions(-) diff --git a/kernel/cellos/include/cellos/sys_net/lv2_socket.h b/kernel/cellos/include/cellos/sys_net/lv2_socket.h index 481dd7d53..7b7866c2c 100644 --- a/kernel/cellos/include/cellos/sys_net/lv2_socket.h +++ b/kernel/cellos/include/cellos/sys_net/lv2_socket.h @@ -34,7 +34,7 @@ public: write, error, - bitset_last + bitset_last = error, }; union sockopt_data { diff --git a/ps3fw/cellGame.cpp b/ps3fw/cellGame.cpp index 9086355c0..d9e5f187b 100644 --- a/ps3fw/cellGame.cpp +++ b/ps3fw/cellGame.cpp @@ -1612,7 +1612,7 @@ enum class strkey_flag : u32 // set_other, // writing is allowed for other types of PARAM.SFO (not // possible) - bitset_last + bitset_last = get_other, }; struct string_key_info diff --git a/rpcs3/Emu/CPU/CPUThread.h b/rpcs3/Emu/CPU/CPUThread.h index 661e8b997..4a3704a31 100644 --- a/rpcs3/Emu/CPU/CPUThread.h +++ b/rpcs3/Emu/CPU/CPUThread.h @@ -34,7 +34,7 @@ enum class cpu_flag : u32 dbg_pause, // Thread paused dbg_step, // Thread forced to pause after one step (one instruction, etc) - bitset_last + bitset_last = dbg_step, }; // Test stopped state diff --git a/rpcs3/Emu/Cell/PPUAnalyser.h b/rpcs3/Emu/Cell/PPUAnalyser.h index 6e5fd3341..abb76f1bc 100644 --- a/rpcs3/Emu/Cell/PPUAnalyser.h +++ b/rpcs3/Emu/Cell/PPUAnalyser.h @@ -19,7 +19,7 @@ enum class ppu_attr : u8 no_size, has_mfvscr, - bitset_last + bitset_last = has_mfvscr, }; // PPU Function Information diff --git a/rpcs3/Emu/Cell/PPUInterpreter.cpp b/rpcs3/Emu/Cell/PPUInterpreter.cpp index f05b49703..646f2fc27 100644 --- a/rpcs3/Emu/Cell/PPUInterpreter.cpp +++ b/rpcs3/Emu/Cell/PPUInterpreter.cpp @@ -70,7 +70,7 @@ enum class ppu_exec_bit : u64 set_call_history, use_feed_data, - bitset_last + bitset_last = use_feed_data, }; using enum ppu_exec_bit; diff --git a/rpcs3/Emu/Cell/PPUThread.cpp b/rpcs3/Emu/Cell/PPUThread.cpp index 5226a97cb..0f42a7b78 100644 --- a/rpcs3/Emu/Cell/PPUThread.cpp +++ b/rpcs3/Emu/Cell/PPUThread.cpp @@ -5421,7 +5421,7 @@ bool ppu_initialize(const ppu_module& info, bool check_only, u64 file_s accurate_nj_mode, contains_symbol_resolver, - bitset_last + bitset_last = contains_symbol_resolver, }; be_t> settings{}; diff --git a/rpcs3/Emu/Cell/SPUInterpreter.cpp b/rpcs3/Emu/Cell/SPUInterpreter.cpp index 86be410df..5e64a5aa2 100644 --- a/rpcs3/Emu/Cell/SPUInterpreter.cpp +++ b/rpcs3/Emu/Cell/SPUInterpreter.cpp @@ -34,7 +34,7 @@ enum class spu_exec_bit : u64 { use_dfma, - bitset_last + bitset_last = use_dfma, }; using enum spu_exec_bit; diff --git a/rpcs3/Emu/Cell/SPURecompiler.h b/rpcs3/Emu/Cell/SPURecompiler.h index feb53f51d..164713752 100644 --- a/rpcs3/Emu/Cell/SPURecompiler.h +++ b/rpcs3/Emu/Cell/SPURecompiler.h @@ -198,7 +198,7 @@ public: is_rel, is_null, - bitset_last + bitset_last = is_null, }; struct reg_state_t diff --git a/rpcs3/Emu/System.cpp b/rpcs3/Emu/System.cpp index 127839852..daa6c62cf 100644 --- a/rpcs3/Emu/System.cpp +++ b/rpcs3/Emu/System.cpp @@ -303,7 +303,7 @@ void init_fxo_for_exec(utils::serial* ar, bool full = false) { ensure(pos == ar->pos); - (*ar)(Emu.m_savestate_extension_flags1); + (*ar)(Emu.m_savestate_extension_flags1.raw()); const usz advance = (Emu.m_savestate_extension_flags1 & Emulator::SaveStateExtentionFlags1::SupportsMenuOpenResume ? 32 : 31); @@ -3612,7 +3612,7 @@ void Emulator::Kill(bool allow_autoexit, bool savestate, savestate_stage* save_s extension_flags += SaveStateExtentionFlags1::ShouldCloseMenu; } - ar(extension_flags); + ar(extension_flags.raw()); ar(std::array{}); // Reserved for future use ar(timestamp); diff --git a/rpcs3/Emu/System.h b/rpcs3/Emu/System.h index 9e9149195..dc329dda0 100644 --- a/rpcs3/Emu/System.h +++ b/rpcs3/Emu/System.h @@ -188,7 +188,7 @@ class Emulator final SupportsMenuOpenResume, ShouldCloseMenu, - bitset_last, + bitset_last = ShouldCloseMenu, }; rx::EnumBitSet m_savestate_extension_flags1{}; diff --git a/rpcs3/Loader/ELF.h b/rpcs3/Loader/ELF.h index d37acdeec..ed8a7da7d 100644 --- a/rpcs3/Loader/ELF.h +++ b/rpcs3/Loader/ELF.h @@ -56,7 +56,7 @@ enum class sh_flag : u32 shf_alloc, shf_execinstr, - bitset_last + bitset_last = shf_execinstr, }; constexpr bool is_memorizable_section(sec_type type, rx::EnumBitSet flags) @@ -218,7 +218,7 @@ enum class elf_opt : u32 no_sections, // Don't load shdrs no_data, // Load phdrs without data - bitset_last + bitset_last = no_data, }; // ELF loading error diff --git a/rx/include/rx/format.hpp b/rx/include/rx/format.hpp index 7beffe405..970f99b8d 100644 --- a/rx/include/rx/format.hpp +++ b/rx/include/rx/format.hpp @@ -2,7 +2,6 @@ #include "format-base.hpp" #include "refl.hpp" #include -#include #include #include #include