mirror of
https://github.com/RPCSX/rpcsx.git
synced 2025-12-06 07:12:14 +01:00
android: fix linkage errors
This commit is contained in:
parent
e73a0b962d
commit
7b03b695f5
|
|
@ -34,7 +34,7 @@ public:
|
|||
write,
|
||||
error,
|
||||
|
||||
bitset_last
|
||||
bitset_last = error,
|
||||
};
|
||||
|
||||
union sockopt_data {
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ enum class ppu_attr : u8
|
|||
no_size,
|
||||
has_mfvscr,
|
||||
|
||||
bitset_last
|
||||
bitset_last = has_mfvscr,
|
||||
};
|
||||
|
||||
// PPU Function Information
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -5421,7 +5421,7 @@ bool ppu_initialize(const ppu_module<lv2_obj>& info, bool check_only, u64 file_s
|
|||
accurate_nj_mode,
|
||||
contains_symbol_resolver,
|
||||
|
||||
bitset_last
|
||||
bitset_last = contains_symbol_resolver,
|
||||
};
|
||||
|
||||
be_t<rx::EnumBitSet<ppu_settings>> settings{};
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ enum class spu_exec_bit : u64
|
|||
{
|
||||
use_dfma,
|
||||
|
||||
bitset_last
|
||||
bitset_last = use_dfma,
|
||||
};
|
||||
|
||||
using enum spu_exec_bit;
|
||||
|
|
|
|||
|
|
@ -198,7 +198,7 @@ public:
|
|||
is_rel,
|
||||
is_null,
|
||||
|
||||
bitset_last
|
||||
bitset_last = is_null,
|
||||
};
|
||||
|
||||
struct reg_state_t
|
||||
|
|
|
|||
|
|
@ -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<u8, 32>{}); // Reserved for future use
|
||||
ar(timestamp);
|
||||
|
|
|
|||
|
|
@ -188,7 +188,7 @@ class Emulator final
|
|||
SupportsMenuOpenResume,
|
||||
ShouldCloseMenu,
|
||||
|
||||
bitset_last,
|
||||
bitset_last = ShouldCloseMenu,
|
||||
};
|
||||
|
||||
rx::EnumBitSet<SaveStateExtentionFlags1> m_savestate_extension_flags1{};
|
||||
|
|
|
|||
|
|
@ -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<sh_flag> 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
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
#include "format-base.hpp"
|
||||
#include "refl.hpp"
|
||||
#include <array>
|
||||
#include <source_location>
|
||||
#include <string_view>
|
||||
#include <type_traits>
|
||||
#include <unordered_map>
|
||||
|
|
|
|||
Loading…
Reference in a new issue