diff --git a/src/dynarmic/src/dynarmic/backend/x64/a32_jitstate.h b/src/dynarmic/src/dynarmic/backend/x64/a32_jitstate.h index f8de2d91de..c276ab0b8b 100644 --- a/src/dynarmic/src/dynarmic/backend/x64/a32_jitstate.h +++ b/src/dynarmic/src/dynarmic/backend/x64/a32_jitstate.h @@ -9,6 +9,7 @@ #pragma once #include +#include #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 rsb_location_descriptors; std::array rsb_codeptrs; diff --git a/src/dynarmic/src/dynarmic/backend/x64/nzcv_util.h b/src/dynarmic/src/dynarmic/backend/x64/nzcv_util.h index 01ba9e034e..2abe06e035 100644 --- a/src/dynarmic/src/dynarmic/backend/x64/nzcv_util.h +++ b/src/dynarmic/src/dynarmic/backend/x64/nzcv_util.h @@ -9,16 +9,17 @@ #pragma once #include "common/common_types.h" +#include 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; diff --git a/src/dynarmic/src/dynarmic/backend/x64/stack_layout.h b/src/dynarmic/src/dynarmic/backend/x64/stack_layout.h index 804711ad60..b5fd1f04e9 100644 --- a/src/dynarmic/src/dynarmic/backend/x64/stack_layout.h +++ b/src/dynarmic/src/dynarmic/backend/x64/stack_layout.h @@ -9,12 +9,13 @@ #pragma once #include +#include #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)