RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2025-12-06 07:12:14 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

android: fix linkage errors

Browse source
This commit is contained in:
DH 2025-10-05 00:54:46 +03:00
parent e73a0b962d
commit 7b03b695f5
12 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kernel/cellos/include/cellos/sys_net/lv2_socket.h
View file

@ -34,7 +34,7 @@ public:
write, write,
error, error,
bitset_last bitset_last = error,
}; };
union sockopt_data { union sockopt_data {

2
ps3fw/cellGame.cpp
View file

@ -1612,7 +1612,7 @@ enum class strkey_flag : u32
// set_other, // writing is allowed for other types of PARAM.SFO (not // set_other, // writing is allowed for other types of PARAM.SFO (not
// possible) // possible)
bitset_last bitset_last = get_other,
}; };
struct string_key_info struct string_key_info

2
rpcs3/Emu/CPU/CPUThread.h
View file

@ -34,7 +34,7 @@ enum class cpu_flag : u32
dbg_pause, // Thread paused dbg_pause, // Thread paused
dbg_step, // Thread forced to pause after one step (one instruction, etc) dbg_step, // Thread forced to pause after one step (one instruction, etc)
bitset_last bitset_last = dbg_step,
}; };
// Test stopped state // Test stopped state

2
rpcs3/Emu/Cell/PPUAnalyser.h
View file

@ -19,7 +19,7 @@ enum class ppu_attr : u8
no_size, no_size,
has_mfvscr, has_mfvscr,
bitset_last bitset_last = has_mfvscr,
}; };
// PPU Function Information // PPU Function Information

2
rpcs3/Emu/Cell/PPUInterpreter.cpp
View file

@ -70,7 +70,7 @@ enum class ppu_exec_bit : u64
set_call_history, set_call_history,
use_feed_data, use_feed_data,
bitset_last bitset_last = use_feed_data,
}; };
using enum ppu_exec_bit; using enum ppu_exec_bit;

2
rpcs3/Emu/Cell/PPUThread.cpp
View file

@ -5421,7 +5421,7 @@ bool ppu_initialize(const ppu_module<lv2_obj>& info, bool check_only, u64 file_s
accurate_nj_mode, accurate_nj_mode,
contains_symbol_resolver, contains_symbol_resolver,
bitset_last bitset_last = contains_symbol_resolver,
}; };
be_t<rx::EnumBitSet<ppu_settings>> settings{}; be_t<rx::EnumBitSet<ppu_settings>> settings{};

2
rpcs3/Emu/Cell/SPUInterpreter.cpp
View file

@ -34,7 +34,7 @@ enum class spu_exec_bit : u64
{ {
use_dfma, use_dfma,
bitset_last bitset_last = use_dfma,
}; };
using enum spu_exec_bit; using enum spu_exec_bit;

2
rpcs3/Emu/Cell/SPURecompiler.h
View file

@ -198,7 +198,7 @@ public:
is_rel, is_rel,
is_null, is_null,
bitset_last bitset_last = is_null,
}; };
struct reg_state_t struct reg_state_t

4
rpcs3/Emu/System.cpp
View file

@ -303,7 +303,7 @@ void init_fxo_for_exec(utils::serial* ar, bool full = false)
{ {
ensure(pos == ar->pos); 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); 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; extension_flags += SaveStateExtentionFlags1::ShouldCloseMenu;
} }
ar(extension_flags); ar(extension_flags.raw());
ar(std::array<u8, 32>{}); // Reserved for future use ar(std::array<u8, 32>{}); // Reserved for future use
ar(timestamp); ar(timestamp);

2
rpcs3/Emu/System.h
View file

@ -188,7 +188,7 @@ class Emulator final
SupportsMenuOpenResume, SupportsMenuOpenResume,
ShouldCloseMenu, ShouldCloseMenu,
bitset_last, bitset_last = ShouldCloseMenu,
}; };
rx::EnumBitSet<SaveStateExtentionFlags1> m_savestate_extension_flags1{}; rx::EnumBitSet<SaveStateExtentionFlags1> m_savestate_extension_flags1{};

4
rpcs3/Loader/ELF.h
View file

@ -56,7 +56,7 @@ enum class sh_flag : u32
shf_alloc, shf_alloc,
shf_execinstr, shf_execinstr,
bitset_last bitset_last = shf_execinstr,
}; };
constexpr bool is_memorizable_section(sec_type type, rx::EnumBitSet<sh_flag> flags) constexpr bool is_memorizable_section(sec_type type, rx::EnumBitSet<sh_flag> flags)
@ -218,7 +218,7 @@ enum class elf_opt : u32
no_sections, // Don't load shdrs no_sections, // Don't load shdrs
no_data, // Load phdrs without data no_data, // Load phdrs without data
bitset_last bitset_last = no_data,
}; };
// ELF loading error // ELF loading error

1
rx/include/rx/format.hpp
View file

@ -2,7 +2,6 @@
#include "format-base.hpp" #include "format-base.hpp"
#include "refl.hpp" #include "refl.hpp"
#include <array> #include <array>
#include <source_location>
#include <string_view> #include <string_view>
#include <type_traits> #include <type_traits>
#include <unordered_map> #include <unordered_map>