claunia/flac
1
0
Fork 0
mirror of https://github.com/claunia/flac.git synced 2025-12-16 18:54:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

libFLAC/cpu.c: More pre-processor cleanups

Browse Source
This commit is contained in:
Erik de Castro Lopo
2016-06-25 17:02:06 +10:00
parent 36a0ab100d
commit 23778a3a60
1 changed files with 36 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
src/libFLAC/cpu.c
View File

@@ -37,12 +37,36 @@
#include "private/cpu.h" #include "private/cpu.h"
#include <stdlib.h> #include <stdlib.h>
#include <memory.h> #include <memory.h>
#ifdef DEBUG #ifdef DEBUG
# include <stdio.h> # include <stdio.h>
#endif
#if defined (__NetBSD__) || defined(__OpenBSD__)
# include <sys/param.h>
# include <sys/sysctl.h>
# include <machine/cpu.h>
#endif
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) || defined(__APPLE__)
# include <sys/types.h>
# include <sys/sysctl.h>
#endif
#if defined(__linux__) && defined(FLAC__CPU_IA32) && !defined FLAC__NO_ASM && (defined FLAC__HAS_NASM || FLAC__HAS_X86INTRIN) && !FLAC__SSE_OS
# include <sys/ucontext.h>
#endif
#if defined(_MSC_VER)
# include <windows.h>
# include <intrin.h> /* for __cpuid() and _xgetbv() */
#endif
#if defined __GNUC__ && defined HAVE_CPUID_H
# include <cpuid.h> /* for __get_cpuid() and __get_cpuid_max() */
#endif #endif
#if defined FLAC__CPU_IA32 #if defined FLAC__CPU_IA32
# include <signal.h>
static void disable_sse(FLAC__CPUInfo *info) static void disable_sse(FLAC__CPUInfo *info)
{ {
@@ -71,17 +95,6 @@ static void disable_avx(FLAC__CPUInfo *info)
} }
#endif #endif
#if defined (__NetBSD__) || defined(__OpenBSD__)
#include <sys/param.h>
#include <sys/sysctl.h>
#include <machine/cpu.h>
#endif
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) || defined(__APPLE__)
#include <sys/types.h>
#include <sys/sysctl.h>
#endif
#ifdef FLAC__CPU_IA32 #ifdef FLAC__CPU_IA32
/* these are flags in EDX of CPUID AX=00000001 */ /* these are flags in EDX of CPUID AX=00000001 */
static const unsigned FLAC__CPUINFO_IA32_CPUID_CMOV = 0x00008000; static const unsigned FLAC__CPUINFO_IA32_CPUID_CMOV = 0x00008000;
@@ -109,8 +122,7 @@ static const unsigned FLAC__CPUINFO_IA32_CPUID_AVX2 = 0x00000020;
/* /*
* Extra stuff needed for detection of OS support for SSE on IA-32 * Extra stuff needed for detection of OS support for SSE on IA-32
*/ */
#if defined(FLAC__CPU_IA32) && !defined FLAC__NO_ASM && (defined FLAC__HAS_NASM || FLAC__HAS_X86INTRIN) && !FLAC__SSE_OS #if defined(__linux__) && defined(FLAC__CPU_IA32) && !defined FLAC__NO_ASM && (defined FLAC__HAS_NASM || FLAC__HAS_X86INTRIN) && !FLAC__SSE_OS
# if defined(__linux__)
/* /*
* If the OS doesn't support SSE, we will get here with a SIGILL. We * If the OS doesn't support SSE, we will get here with a SIGILL. We
* modify the return address to jump over the offending SSE instruction * modify the return address to jump over the offending SSE instruction
@@ -124,15 +136,11 @@ static const unsigned FLAC__CPUINFO_IA32_CPUID_AVX2 = 0x00000020;
* 6 bytes extra in case our estimate is wrong * 6 bytes extra in case our estimate is wrong
* 12 bytes puts us in the NOP "landing zone" * 12 bytes puts us in the NOP "landing zone"
*/ */
# include <sys/ucontext.h> static void sigill_handler_sse_os(int signal, siginfo_t *si, void *uc)
static void sigill_handler_sse_os(int signal, siginfo_t *si, void *uc) {
{ (void)signal, (void)si;
(void)signal, (void)si; ((ucontext_t*)uc)->uc_mcontext.gregs[14/*REG_EIP*/] += 3 + 3 + 6;
((ucontext_t*)uc)->uc_mcontext.gregs[14/*REG_EIP*/] += 3 + 3 + 6; }
}
# elif defined(_MSC_VER)
# include <windows.h>
# endif
#endif #endif
@@ -206,10 +214,7 @@ void FLAC__cpu_info(FLAC__CPUInfo *info)
* now have to check for OS support of SSE instructions * now have to check for OS support of SSE instructions
*/ */
if(info->ia32.sse) { if(info->ia32.sse) {
#if !FLAC__SSE_OS #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) || defined(__APPLE__)
/* assume user knows better than us; turn it off */
disable_sse(info);
#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) || defined(__APPLE__)
int sse = 0; int sse = 0;
size_t len; size_t len;
/* at least one of these must work: */ /* at least one of these must work: */
@@ -407,18 +412,11 @@ void FLAC__cpu_info(FLAC__CPUInfo *info)
#if (defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64) && FLAC__HAS_X86INTRIN #if (defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64) && FLAC__HAS_X86INTRIN
#if defined _MSC_VER
#include <intrin.h> /* for __cpuid() and _xgetbv() */
#elif defined __GNUC__ && defined HAVE_CPUID_H
#include <cpuid.h> /* for __get_cpuid() and __get_cpuid_max() */
#endif
FLAC__uint32 FLAC__cpu_have_cpuid_x86(void) FLAC__uint32 FLAC__cpu_have_cpuid_x86(void)
{ {
#ifdef FLAC__CPU_X86_64 #ifdef FLAC__CPU_X86_64
return 1; return 1;
#else #elif defined _MSC_VER || defined __INTEL_COMPILER /* Do they support CPUs w/o CPUID support (or OSes that work on those CPUs)? */
# if defined _MSC_VER || defined __INTEL_COMPILER /* Do they support CPUs w/o CPUID support (or OSes that work on those CPUs)? */
FLAC__uint32 flags1, flags2; FLAC__uint32 flags1, flags2;
__asm { __asm {
pushfd pushfd
@@ -437,14 +435,13 @@ FLAC__uint32 FLAC__cpu_have_cpuid_x86(void)
return 1; return 1;
else else
return 0; return 0;
# elif defined __GNUC__ && defined HAVE_CPUID_H #elif defined __GNUC__ && defined HAVE_CPUID_H
if (__get_cpuid_max(0, 0) != 0) if (__get_cpuid_max(0, 0) != 0)
return 1; return 1;
else else
return 0; return 0;
# else #else
return 0; return 0;
# endif
#endif #endif
} }