diff --git a/src/backend_x64/jitstate.h b/src/backend_x64/jitstate.h index d3bd7039..2e62b9c3 100644 --- a/src/backend_x64/jitstate.h +++ b/src/backend_x64/jitstate.h @@ -17,6 +17,11 @@ class BlockOfCode; constexpr size_t SpillCount = 64; +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4324) // Structure was padded due to alignment specifier +#endif + struct JitState { JitState() { ResetRSB(); } @@ -24,7 +29,6 @@ struct JitState { std::array Reg{}; // Current register file. // TODO: Mode-specific register sets unimplemented. - #pragma warning (suppress : 4324) // Structure was padded due to alignment specifier alignas(u64) std::array ExtReg{}; // Extension registers. std::array Spill{}; // Spill. @@ -55,6 +59,10 @@ struct JitState { void SetFpscr(u32 FPSCR); }; +#ifdef _MSC_VER +#pragma warning(pop) +#endif + using CodePtr = const void*; } // namespace BackendX64 diff --git a/tests/skyeye_interpreter/dyncom/arm_dyncom_interpreter.cpp b/tests/skyeye_interpreter/dyncom/arm_dyncom_interpreter.cpp index e630162d..531de758 100644 --- a/tests/skyeye_interpreter/dyncom/arm_dyncom_interpreter.cpp +++ b/tests/skyeye_interpreter/dyncom/arm_dyncom_interpreter.cpp @@ -4,7 +4,9 @@ #define CITRA_IGNORE_EXIT(x) +#ifdef _MSC_VER #pragma warning(disable : 4244) +#endif #include #include diff --git a/tests/skyeye_interpreter/skyeye_common/armstate.cpp b/tests/skyeye_interpreter/skyeye_common/armstate.cpp index d4f6d445..cbf08a78 100644 --- a/tests/skyeye_interpreter/skyeye_common/armstate.cpp +++ b/tests/skyeye_interpreter/skyeye_common/armstate.cpp @@ -2,7 +2,9 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#ifdef _MSC_VER #pragma warning(disable : 4244) +#endif #include #include "common/assert.h" diff --git a/tests/skyeye_interpreter/skyeye_common/vfp/vfp.cpp b/tests/skyeye_interpreter/skyeye_common/vfp/vfp.cpp index 11486438..aa497959 100644 --- a/tests/skyeye_interpreter/skyeye_common/vfp/vfp.cpp +++ b/tests/skyeye_interpreter/skyeye_common/vfp/vfp.cpp @@ -20,7 +20,9 @@ /* Note: this file handles interface with arm core and vfp registers */ +#ifdef _MSC_VER #pragma warning(disable : 4100) +#endif #include "common/assert.h" //#include "common/common_funcs.h" diff --git a/tests/skyeye_interpreter/skyeye_common/vfp/vfpdouble.cpp b/tests/skyeye_interpreter/skyeye_common/vfp/vfpdouble.cpp index eb196cb6..79df26c7 100644 --- a/tests/skyeye_interpreter/skyeye_common/vfp/vfpdouble.cpp +++ b/tests/skyeye_interpreter/skyeye_common/vfp/vfpdouble.cpp @@ -51,7 +51,9 @@ * =========================================================================== */ +#ifdef _MSC_VER #pragma warning(disable : 4100 4244 4245) +#endif #include //#include "common/logging/log.h" diff --git a/tests/skyeye_interpreter/skyeye_common/vfp/vfpsingle.cpp b/tests/skyeye_interpreter/skyeye_common/vfp/vfpsingle.cpp index db6c7aac..c174593a 100644 --- a/tests/skyeye_interpreter/skyeye_common/vfp/vfpsingle.cpp +++ b/tests/skyeye_interpreter/skyeye_common/vfp/vfpsingle.cpp @@ -51,7 +51,9 @@ * =========================================================================== */ +#ifdef _MSC_VER #pragma warning(disable : 4100 4244 4245) +#endif #include #include