Plexi09/eden-miror
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden synced 2026-04-10 07:38:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Partially fix size_t

Browse source 
Signed-off-by: crueter <crueter@eden-emu.dev>
This commit is contained in:
crueter 2026-03-29 21:17:05 -04:00
parent f37f05b327
commit 08a73d1854
No known key found for this signature in database
GPG key ID: 425ACD2D4830EBC6
3 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/dynarmic/src/dynarmic/backend/x64/a32_jitstate.h
View file

@ -9,6 +9,7 @@
#pragma once
#include <array>
#include <cstddef>
#include "common/common_types.h"
@ -48,8 +49,8 @@ struct A32JitState {
// Exclusive state
u32 exclusive_state = 0;
static constexpr size_t RSBSize = 8; // MUST be a power of 2.
static constexpr size_t RSBPtrMask = RSBSize - 1;
static constexpr std::size_t RSBSize = 8; // MUST be a power of 2.
static constexpr std::size_t RSBPtrMask = RSBSize - 1;
u32 rsb_ptr = 0;
std::array<u64, RSBSize> rsb_location_descriptors;
std::array<u64, RSBSize> rsb_codeptrs;

11
src/dynarmic/src/dynarmic/backend/x64/nzcv_util.h
View file

@ -9,16 +9,17 @@
#pragma once
#include "common/common_types.h"
#include <cstddef>
namespace Dynarmic::Backend::X64::NZCV {
constexpr u32 arm_mask = 0xF000'0000;
constexpr u32 x64_mask = 0xC101;
constexpr size_t x64_n_flag_bit = 15;
constexpr size_t x64_z_flag_bit = 14;
constexpr size_t x64_c_flag_bit = 8;
constexpr size_t x64_v_flag_bit = 0;
constexpr std::size_t x64_n_flag_bit = 15;
constexpr std::size_t x64_z_flag_bit = 14;
constexpr std::size_t x64_c_flag_bit = 8;
constexpr std::size_t x64_v_flag_bit = 0;
/// This is a constant used to create the x64 flags format from the ARM format.
/// NZCV * multiplier: NZCV0NZCV000NZCV
@ -46,7 +47,7 @@ inline u32 FromX64(u32 x64_flags) {
nzcv |= mcl::bit::get_bit<15>(x64_flags) ? 1 << 31 : 0;
nzcv |= mcl::bit::get_bit<14>(x64_flags) ? 1 << 30 : 0;
nzcv |= mcl::bit::get_bit<8>(x64_flags) ? 1 << 29 : 0;
nzcv |= mcl::bit::get_bit<0>(x64_flags) ? 1 << 28 : 0;
nzcv |= mcl::bit::get_bit<0>(x64_flaags) ? 1 << 28 : 0;
return nzcv;
*/
return ((x64_flags & x64_mask) * from_x64_multiplier) & arm_mask;

3
src/dynarmic/src/dynarmic/backend/x64/stack_layout.h
View file

@ -9,12 +9,13 @@
#pragma once
#include <array>
#include <cstddef>
#include "common/common_types.h"
namespace Dynarmic::Backend::X64 {
constexpr size_t SpillCount = 64;
constexpr std::size_t SpillCount = 64;
#ifdef _MSC_VER
# pragma warning(push)