diff options
| author | Matthew Parlane <parlane@gmail.com> | 2014-03-05 09:26:02 +1300 |
|---|---|---|
| committer | Matthew Parlane <parlane@gmail.com> | 2014-03-05 09:26:02 +1300 |
| commit | 09212d49121d57f2fc670af64c71f4ff731c14ba (patch) | |
| tree | 3941a217046e39148768a1c7eb1aff0289251d4b /Source/Core/Common/x64CPUDetect.cpp | |
| parent | d1ccd964cd7c552068c1ed649235eac83e3b1195 (diff) | |
| parent | 4f02132f9323a147c68b7dc1a79a62be33c1f170 (diff) | |
Merge pull request #120 from Sonicadvance1/Arch-clean
Make our architecture defines less stupid.
Diffstat (limited to 'Source/Core/Common/x64CPUDetect.cpp')
| -rw-r--r-- | Source/Core/Common/x64CPUDetect.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/Core/Common/x64CPUDetect.cpp b/Source/Core/Common/x64CPUDetect.cpp index 5ce1775843..64ded2df3f 100644 --- a/Source/Core/Common/x64CPUDetect.cpp +++ b/Source/Core/Common/x64CPUDetect.cpp @@ -98,16 +98,16 @@ CPUInfo::CPUInfo() { void CPUInfo::Detect() { memset(this, 0, sizeof(*this)); -#ifdef _M_IX86 +#if _M_X86_32 Mode64bit = false; -#elif defined (_M_X64) +#elif _M_X86_64 Mode64bit = true; OS64bit = true; #endif num_cores = 1; #ifdef _WIN32 -#ifdef _M_IX86 +#if _M_X86_32 BOOL f64 = false; IsWow64Process(GetCurrentProcess(), &f64); OS64bit = (f64 == TRUE) ? true : false; @@ -170,9 +170,9 @@ void CPUInfo::Detect() GC_ALIGNED16(u8 fx_state[512]); memset(fx_state, 0, sizeof(fx_state)); #ifdef _WIN32 -#ifdef _M_IX86 +#if _M_X86_32 _fxsave(fx_state); -#elif defined (_M_X64) +#elif _M_X86_64 _fxsave64(fx_state); #endif #else |