diff options
| -rw-r--r-- | libavutil/arm/cpu.h | 13 | ||||
| -rw-r--r-- | libavutil/cpu_internal.h | 7 | ||||
| -rw-r--r-- | libavutil/x86/cpu.h | 54 |
3 files changed, 40 insertions, 34 deletions
diff --git a/libavutil/arm/cpu.h b/libavutil/arm/cpu.h index b45f30b1a1..52e839c32e 100644 --- a/libavutil/arm/cpu.h +++ b/libavutil/arm/cpu.h @@ -21,12 +21,13 @@ #include "config.h" #include "libavutil/cpu.h" +#include "libavutil/cpu_internal.h" -#define have_armv5te(flags) (HAVE_ARMV5TE && ((flags) & AV_CPU_FLAG_ARMV5TE)) -#define have_armv6(flags) (HAVE_ARMV6 && ((flags) & AV_CPU_FLAG_ARMV6)) -#define have_armv6t2(flags) (HAVE_ARMV6T2 && ((flags) & AV_CPU_FLAG_ARMV6T2)) -#define have_vfp(flags) (HAVE_VFP && ((flags) & AV_CPU_FLAG_VFP)) -#define have_vfpv3(flags) (HAVE_VFPV3 && ((flags) & AV_CPU_FLAG_VFPV3)) -#define have_neon(flags) (HAVE_NEON && ((flags) & AV_CPU_FLAG_NEON)) +#define have_armv5te(flags) CPUEXT(flags, ARMV5TE) +#define have_armv6(flags) CPUEXT(flags, ARMV6) +#define have_armv6t2(flags) CPUEXT(flags, ARMV6T2) +#define have_vfp(flags) CPUEXT(flags, VFP) +#define have_vfpv3(flags) CPUEXT(flags, VFPV3) +#define have_neon(flags) CPUEXT(flags, NEON) #endif /* AVUTIL_ARM_CPU_H */ diff --git a/libavutil/cpu_internal.h b/libavutil/cpu_internal.h index 2fb9ad79ea..08f6e858db 100644 --- a/libavutil/cpu_internal.h +++ b/libavutil/cpu_internal.h @@ -19,6 +19,13 @@ #ifndef AVUTIL_CPU_INTERNAL_H #define AVUTIL_CPU_INTERNAL_H +#include "cpu.h" + +#define CPUEXT_SUFFIX(flags, suffix, cpuext) \ + (HAVE_ ## cpuext ## suffix && ((flags) & AV_CPU_FLAG_ ## cpuext)) + +#define CPUEXT(flags, cpuext) CPUEXT_SUFFIX(flags, , cpuext) + int ff_get_cpu_flags_arm(void); int ff_get_cpu_flags_ppc(void); int ff_get_cpu_flags_x86(void); diff --git a/libavutil/x86/cpu.h b/libavutil/x86/cpu.h index e4f6f0bd5a..5a3ad8a672 100644 --- a/libavutil/x86/cpu.h +++ b/libavutil/x86/cpu.h @@ -21,38 +21,36 @@ #include "config.h" #include "libavutil/cpu.h" - -#define CPUEXT(flags, suffix, cpuext) \ - (HAVE_ ## cpuext ## suffix && ((flags) & AV_CPU_FLAG_ ## cpuext)) +#include "libavutil/cpu_internal.h" #define AV_CPU_FLAG_AMD3DNOW AV_CPU_FLAG_3DNOW #define AV_CPU_FLAG_AMD3DNOWEXT AV_CPU_FLAG_3DNOWEXT -#define EXTERNAL_AMD3DNOW(flags) CPUEXT(flags, _EXTERNAL, AMD3DNOW) -#define EXTERNAL_AMD3DNOWEXT(flags) CPUEXT(flags, _EXTERNAL, AMD3DNOWEXT) -#define EXTERNAL_MMX(flags) CPUEXT(flags, _EXTERNAL, MMX) -#define EXTERNAL_MMXEXT(flags) CPUEXT(flags, _EXTERNAL, MMXEXT) -#define EXTERNAL_SSE(flags) CPUEXT(flags, _EXTERNAL, SSE) -#define EXTERNAL_SSE2(flags) CPUEXT(flags, _EXTERNAL, SSE2) -#define EXTERNAL_SSE3(flags) CPUEXT(flags, _EXTERNAL, SSE3) -#define EXTERNAL_SSSE3(flags) CPUEXT(flags, _EXTERNAL, SSSE3) -#define EXTERNAL_SSE4(flags) CPUEXT(flags, _EXTERNAL, SSE4) -#define EXTERNAL_SSE42(flags) CPUEXT(flags, _EXTERNAL, SSE42) -#define EXTERNAL_AVX(flags) CPUEXT(flags, _EXTERNAL, AVX) -#define EXTERNAL_FMA4(flags) CPUEXT(flags, _EXTERNAL, FMA4) - -#define INLINE_AMD3DNOW(flags) CPUEXT(flags, _INLINE, AMD3DNOW) -#define INLINE_AMD3DNOWEXT(flags) CPUEXT(flags, _INLINE, AMD3DNOWEXT) -#define INLINE_MMX(flags) CPUEXT(flags, _INLINE, MMX) -#define INLINE_MMXEXT(flags) CPUEXT(flags, _INLINE, MMXEXT) -#define INLINE_SSE(flags) CPUEXT(flags, _INLINE, SSE) -#define INLINE_SSE2(flags) CPUEXT(flags, _INLINE, SSE2) -#define INLINE_SSE3(flags) CPUEXT(flags, _INLINE, SSE3) -#define INLINE_SSSE3(flags) CPUEXT(flags, _INLINE, SSSE3) -#define INLINE_SSE4(flags) CPUEXT(flags, _INLINE, SSE4) -#define INLINE_SSE42(flags) CPUEXT(flags, _INLINE, SSE42) -#define INLINE_AVX(flags) CPUEXT(flags, _INLINE, AVX) -#define INLINE_FMA4(flags) CPUEXT(flags, _INLINE, FMA4) +#define EXTERNAL_AMD3DNOW(flags) CPUEXT_SUFFIX(flags, _EXTERNAL, AMD3DNOW) +#define EXTERNAL_AMD3DNOWEXT(flags) CPUEXT_SUFFIX(flags, _EXTERNAL, AMD3DNOWEXT) +#define EXTERNAL_MMX(flags) CPUEXT_SUFFIX(flags, _EXTERNAL, MMX) +#define EXTERNAL_MMXEXT(flags) CPUEXT_SUFFIX(flags, _EXTERNAL, MMXEXT) +#define EXTERNAL_SSE(flags) CPUEXT_SUFFIX(flags, _EXTERNAL, SSE) +#define EXTERNAL_SSE2(flags) CPUEXT_SUFFIX(flags, _EXTERNAL, SSE2) +#define EXTERNAL_SSE3(flags) CPUEXT_SUFFIX(flags, _EXTERNAL, SSE3) +#define EXTERNAL_SSSE3(flags) CPUEXT_SUFFIX(flags, _EXTERNAL, SSSE3) +#define EXTERNAL_SSE4(flags) CPUEXT_SUFFIX(flags, _EXTERNAL, SSE4) +#define EXTERNAL_SSE42(flags) CPUEXT_SUFFIX(flags, _EXTERNAL, SSE42) +#define EXTERNAL_AVX(flags) CPUEXT_SUFFIX(flags, _EXTERNAL, AVX) +#define EXTERNAL_FMA4(flags) CPUEXT_SUFFIX(flags, _EXTERNAL, FMA4) + +#define INLINE_AMD3DNOW(flags) CPUEXT_SUFFIX(flags, _INLINE, AMD3DNOW) +#define INLINE_AMD3DNOWEXT(flags) CPUEXT_SUFFIX(flags, _INLINE, AMD3DNOWEXT) +#define INLINE_MMX(flags) CPUEXT_SUFFIX(flags, _INLINE, MMX) +#define INLINE_MMXEXT(flags) CPUEXT_SUFFIX(flags, _INLINE, MMXEXT) +#define INLINE_SSE(flags) CPUEXT_SUFFIX(flags, _INLINE, SSE) +#define INLINE_SSE2(flags) CPUEXT_SUFFIX(flags, _INLINE, SSE2) +#define INLINE_SSE3(flags) CPUEXT_SUFFIX(flags, _INLINE, SSE3) +#define INLINE_SSSE3(flags) CPUEXT_SUFFIX(flags, _INLINE, SSSE3) +#define INLINE_SSE4(flags) CPUEXT_SUFFIX(flags, _INLINE, SSE4) +#define INLINE_SSE42(flags) CPUEXT_SUFFIX(flags, _INLINE, SSE42) +#define INLINE_AVX(flags) CPUEXT_SUFFIX(flags, _INLINE, AVX) +#define INLINE_FMA4(flags) CPUEXT_SUFFIX(flags, _INLINE, FMA4) void ff_cpu_cpuid(int index, int *eax, int *ebx, int *ecx, int *edx); void ff_cpu_xgetbv(int op, int *eax, int *edx); |