mirrors/dynarmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Wrap #pragma warning with #ifdef _MSC_VER .. #endif

Browse source
This commit is contained in:
MerryMage 2016-12-15 21:31:58 +00:00
parent 0e8b626d87
commit 276873bf70
6 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/backend_x64/jitstate.h
View file

@ -17,6 +17,11 @@ class BlockOfCode;
constexpr size_t SpillCount = 64; 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 { struct JitState {
JitState() { ResetRSB(); } JitState() { ResetRSB(); }
@ -24,7 +29,6 @@ struct JitState {
std::array<u32, 16> Reg{}; // Current register file. std::array<u32, 16> Reg{}; // Current register file.
// TODO: Mode-specific register sets unimplemented. // TODO: Mode-specific register sets unimplemented.
#pragma warning (suppress : 4324) // Structure was padded due to alignment specifier
alignas(u64) std::array<u32, 64> ExtReg{}; // Extension registers. alignas(u64) std::array<u32, 64> ExtReg{}; // Extension registers.
std::array<u64, SpillCount> Spill{}; // Spill. std::array<u64, SpillCount> Spill{}; // Spill.
@ -55,6 +59,10 @@ struct JitState {
void SetFpscr(u32 FPSCR); void SetFpscr(u32 FPSCR);
}; };
#ifdef _MSC_VER
#pragma warning(pop)
#endif
using CodePtr = const void*; using CodePtr = const void*;
} // namespace BackendX64 } // namespace BackendX64

2
tests/skyeye_interpreter/dyncom/arm_dyncom_interpreter.cpp
View file

@ -4,7 +4,9 @@
#define CITRA_IGNORE_EXIT(x) #define CITRA_IGNORE_EXIT(x)
#ifdef _MSC_VER
#pragma warning(disable : 4244) #pragma warning(disable : 4244)
#endif
#include <algorithm> #include <algorithm>
#include <cstdio> #include <cstdio>

2
tests/skyeye_interpreter/skyeye_common/armstate.cpp
View file

@ -2,7 +2,9 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#ifdef _MSC_VER
#pragma warning(disable : 4244) #pragma warning(disable : 4244)
#endif
#include <algorithm> #include <algorithm>
#include "common/assert.h" #include "common/assert.h"

2
tests/skyeye_interpreter/skyeye_common/vfp/vfp.cpp
View file

@ -20,7 +20,9 @@
/* Note: this file handles interface with arm core and vfp registers */ /* Note: this file handles interface with arm core and vfp registers */
#ifdef _MSC_VER
#pragma warning(disable : 4100) #pragma warning(disable : 4100)
#endif
#include "common/assert.h" #include "common/assert.h"
//#include "common/common_funcs.h" //#include "common/common_funcs.h"

2
tests/skyeye_interpreter/skyeye_common/vfp/vfpdouble.cpp
View file

@ -51,7 +51,9 @@
* =========================================================================== * ===========================================================================
*/ */
#ifdef _MSC_VER
#pragma warning(disable : 4100 4244 4245) #pragma warning(disable : 4100 4244 4245)
#endif
#include <algorithm> #include <algorithm>
//#include "common/logging/log.h" //#include "common/logging/log.h"

2
tests/skyeye_interpreter/skyeye_common/vfp/vfpsingle.cpp
View file

@ -51,7 +51,9 @@
* =========================================================================== * ===========================================================================
*/ */
#ifdef _MSC_VER
#pragma warning(disable : 4100 4244 4245) #pragma warning(disable : 4100 4244 4245)
#endif
#include <algorithm> #include <algorithm>
#include <cinttypes> #include <cinttypes>