ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #472 from Sonicadvance1/ARM-is-not-generic 

Make it so ARMv7 isn't a generic target.
This commit is contained in:
Ryan Houdek 2014-06-08 09:30:57 -05:00
parent 489534bc7c 6e1d312091
commit 4cfeeee5e9
4 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -151,8 +151,6 @@ if(NOT ENABLE_GENERIC)
set(_M_ARM 1) set(_M_ARM 1)
set(_M_ARM_32 1) set(_M_ARM_32 1)
add_definitions(-D_M_ARM=1 -D_M_ARM_32=1) add_definitions(-D_M_ARM=1 -D_M_ARM_32=1)
# ARMv7 isn't a generic build anymore, this shouldn't need to be defined
set(ENABLE_GENERIC 1)
if(${ANDROID_NDK_ABI_NAME} MATCHES "armeabi-v7a") if(${ANDROID_NDK_ABI_NAME} MATCHES "armeabi-v7a")
add_definitions(-marm -march=armv7-a) add_definitions(-marm -march=armv7-a)
endif() endif()

21
Source/Core/Common/CMakeLists.txt
View File

@ -31,17 +31,16 @@ set(SRCS BreakPoints.cpp
if(_M_ARM_32) #ARMv7 if(_M_ARM_32) #ARMv7
set(SRCS ${SRCS} set(SRCS ${SRCS}
ArmCPUDetect.cpp ArmCPUDetect.cpp
ArmEmitter.cpp) ArmEmitter.cpp
else() GenericFPURoundMode.cpp)
if(_M_X86) #X86 elseif(_M_X86) #X86
set(SRCS ${SRCS} set(SRCS ${SRCS}
x64FPURoundMode.cpp) x64CPUDetect.cpp
endif() x64FPURoundMode.cpp)
set(SRCS ${SRCS} x64CPUDetect.cpp) else() #Generic
endif() set(SRCS ${SRCS}
if(_M_GENERIC) #Generic GenericFPURoundMode.cpp
set(SRCS ${SRCS} x64CPUDetect.cpp)
GenericFPURoundMode.cpp)
endif() endif()
if(WIN32) if(WIN32)
set(SRCS ${SRCS} ExtendedTrace.cpp) set(SRCS ${SRCS} ExtendedTrace.cpp)

8
Source/Core/Common/CommonFuncs.h
View File

@ -36,7 +36,7 @@ struct ArraySizeImpl : public std::extent<T>
#endif #endif
#if (defined __GNUC__ && !__GNUC_PREREQ(4,9)) && \ #if (defined __GNUC__ && !__GNUC_PREREQ(4,9)) && \
!defined __SSSE3__ && !defined _M_GENERIC !defined __SSSE3__ && defined _M_X86
#include <emmintrin.h> #include <emmintrin.h>
static __inline __m128i __attribute__((__always_inline__)) static __inline __m128i __attribute__((__always_inline__))
_mm_shuffle_epi8(__m128i a, __m128i mask) _mm_shuffle_epi8(__m128i a, __m128i mask)
@ -61,10 +61,10 @@ _mm_shuffle_epi8(__m128i a, __m128i mask)
// go to debugger mode // go to debugger mode
#ifdef GEKKO #ifdef GEKKO
#define Crash() #define Crash()
#elif defined _M_GENERIC #elif defined _M_X86
#define Crash() { exit(1); }
#else
#define Crash() {asm ("int $3");} #define Crash() {asm ("int $3");}
#else
#define Crash() { exit(1); }
#endif #endif
// GCC 4.8 defines all the rotate functions now // GCC 4.8 defines all the rotate functions now

2
Source/Core/VideoCommon/CMakeLists.txt
View File

@ -38,7 +38,7 @@ set(SRCS BPFunctions.cpp
XFStructs.cpp) XFStructs.cpp)
set(LIBS core png) set(LIBS core png)
if(NOT _M_GENERIC) if(_M_X86)
set(SRCS ${SRCS} TextureDecoder_x64.cpp) set(SRCS ${SRCS} TextureDecoder_x64.cpp)
else() else()
set(SRCS ${SRCS} TextureDecoder_Generic.cpp) set(SRCS ${SRCS} TextureDecoder_Generic.cpp)