dburr/eden
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden.git synced 2025-07-21 13:25:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[dynarmic] fix userconfig casting warn

Browse source
This commit is contained in:
lizzie 2025-07-13 22:47:34 +01:00
parent fe4f5a3860
commit d829334400
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
externals/dynarmic/src/dynarmic/interface/A32/config.h vendored
View file

@ -159,9 +159,6 @@ struct UserConfig {
/// Maximum size is limited by the maximum length of a x86_64 / arm64 jump.
std::uint32_t code_cache_size = 128 * 1024 * 1024; // bytes
/// Processor ID
std::uint32_t processor_id = 0;
/// Masks out the first N bits in host pointers from the page table.
/// The intention behind this is to allow users of Dynarmic to pack attributes in the
/// same integer and update the pointer attribute pair atomically.
@ -172,6 +169,9 @@ struct UserConfig {
/// There are minor behavioural differences between versions.
ArchVersion arch_version = ArchVersion::v8;
/// Processor ID
std::uint8_t processor_id = 0;
/// Determines if we should detect memory accesses via page_table that straddle are
/// misaligned. Accesses that straddle page boundaries will fallback to the relevant
/// memory callback.

2
src/core/arm/dynarmic/arm_dynarmic_32.cpp
View file

@ -201,7 +201,7 @@ std::shared_ptr<Dynarmic::A32::Jit> ArmDynarmic32::MakeJit(Common::PageTable* pa
}
// Multi-process state
config.processor_id = m_core_index;
config.processor_id = std::uint8_t(m_core_index);
config.global_monitor = &m_exclusive_monitor.monitor;
// Timing

6
src/core/arm/dynarmic/arm_dynarmic_64.cpp
View file

@ -232,7 +232,7 @@ std::shared_ptr<Dynarmic::A64::Jit> ArmDynarmic64::MakeJit(Common::PageTable* pa
// Memory
if (page_table) {
config.page_table = reinterpret_cast<void**>(page_table->pointers.data());
config.page_table_address_space_bits = address_space_bits;
config.page_table_address_space_bits = std::uint32_t(address_space_bits);
config.page_table_pointer_mask_bits = Common::PageTable::ATTRIBUTE_BITS;
config.silently_mirror_page_table = false;
config.absolute_offset_page_table = true;
@ -242,7 +242,7 @@ std::shared_ptr<Dynarmic::A64::Jit> ArmDynarmic64::MakeJit(Common::PageTable* pa
config.fastmem_pointer = page_table->fastmem_arena ?
std::optional<uintptr_t>{reinterpret_cast<uintptr_t>(page_table->fastmem_arena)} :
std::nullopt;
config.fastmem_address_space_bits = address_space_bits;
config.fastmem_address_space_bits = std::uint32_t(address_space_bits);
config.silently_mirror_fastmem = false;
config.fastmem_exclusive_access = config.fastmem_pointer != std::nullopt;
@ -250,7 +250,7 @@ std::shared_ptr<Dynarmic::A64::Jit> ArmDynarmic64::MakeJit(Common::PageTable* pa
}
// Multi-process state
config.processor_id = m_core_index;
config.processor_id = std::uint8_t(m_core_index);
config.global_monitor = &m_exclusive_monitor.monitor;
// System registers