encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cpuinfo: patched to compile. 

Nothing quite like experimentation via Buildbot!  :/
This commit is contained in:
Ryan C. Gordon 2016-11-17 16:01:59 -05:00
parent 74eb78dcbf
commit e8f4b7c4f5
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/cpuinfo/SDL_cpuinfo.c
View File

@ -50,9 +50,12 @@
#include <setjmp.h> #include <setjmp.h>
#endif #endif
#if defined(__LINUX__) && defined(__ARM_ARCH) #if defined(__LINUX__) || defined(__ANDROID__) && defined(__ARM_ARCH)
#include <sys/auxv.h> #include <sys/auxv.h>
#include <asm/hwcap.h> #include <asm/hwcap.h>
#if !defined HAVE_GETAUXVAL
#include <fcntl.h>
#endif
#endif #endif
#define CPU_HAS_RDTSC 0x00000001 #define CPU_HAS_RDTSC 0x00000001
@ -294,7 +297,7 @@ CPU_haveAltiVec(void)
return altivec; return altivec;
} }
#if (defined(__LINUX__) || defined(__ANDROID__)) && !HAVE_GETAUXVAL #if (defined(__LINUX__) || defined(__ANDROID__)) && !defined(HAVE_GETAUXVAL)
static int static int
readProcAuxvForNeon(void) readProcAuxvForNeon(void)
{ {
@ -326,7 +329,7 @@ CPU_haveNEON(void)
/* The way you detect NEON is a privileged instruction on ARM, so you have /* The way you detect NEON is a privileged instruction on ARM, so you have
query the OS kernel in a platform-specific way. :/ */ query the OS kernel in a platform-specific way. :/ */
#if defined(SDL_CPUINFO_DISABLED) || !defined(__ARM_ARCH) #if defined(SDL_CPUINFO_DISABLED) || !defined(__ARM_ARCH)
return 0; return 0; /* disabled or not an ARM CPU at all. */
#elif __ARM_ARCH >= 8 #elif __ARM_ARCH >= 8
return 1; // ARMv8 always has non-optional NEON support. return 1; // ARMv8 always has non-optional NEON support.
#elif defined(__APPLE__) #elif defined(__APPLE__)
@ -336,18 +339,16 @@ CPU_haveNEON(void)
const int error = sysctlbyname("hw.optional.neon", &neon, &length, NULL, 0); const int error = sysctlbyname("hw.optional.neon", &neon, &length, NULL, 0);
return (!error) && (neon != 0); return (!error) && (neon != 0);
/* Android offers a static library for this but all it does is parse /proc/cpuinfo */ /* Android offers a static library for this but all it does is parse /proc/cpuinfo */
#elif (defined(__LINUX__) || defined(__ANDROID__)) && HAVE_GETAUXVAL #elif (defined(__LINUX__) || defined(__ANDROID__)) && defined(HAVE_GETAUXVAL)
return ((getauxval(AT_HWCAP) & HWCAP_NEON) == HWCAP_NEON) return ((getauxval(AT_HWCAP) & HWCAP_NEON) == HWCAP_NEON)
#elif (defined(__LINUX__) || defined(__ANDROID__)) #elif (defined(__LINUX__) || defined(__ANDROID__))
return readProcAuxvForNeon(); return readProcAuxvForNeon();
#elif (defined(__WINDOWS__) || defined(__WINRT__)) && defined(_M_ARM) #elif (defined(__WINDOWS__) || defined(__WINRT__)) && defined(_M_ARM)
/* All WinRT ARM devices are required to support NEON, but just in case. */ /* All WinRT ARM devices are required to support NEON, but just in case. */
if (IsProcessorFeaturePresent(PF_ARM_NEON_INSTRUCTIONS_AVAILABLE)) { return IsProcessorFeaturePresent(PF_ARM_NEON_INSTRUCTIONS_AVAILABLE) != 0;
neon = 1;
}
#else #else
#warning SDL_HasNEON is not implemented for this ARM platform. Write me. #warning SDL_HasNEON is not implemented for this ARM platform. Write me.
#endif return 0;
#endif #endif
} }