From b8d58e327c70e3b5bec64c7bab76a48d3a6d4d77 Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Sun, 15 Jun 2014 20:29:34 +1000 Subject: [PATCH] Revert "Replace FLAC__CPU_X86_64 with FLaC__CPU_X86_64." This reverts commit 151739921b74fbf31420358a5fbeb094efa017ed. This patch only when part way to replace all FLAC_* with FLaC_* and its really not worth going all the way. --- configure.ac | 6 +++--- src/libFLAC/cpu.c | 8 ++++---- src/libFLAC/fixed_intrin_sse2.c | 4 ++-- src/libFLAC/fixed_intrin_ssse3.c | 4 ++-- src/libFLAC/include/private/cpu.h | 6 +++--- src/libFLAC/include/private/fixed.h | 2 +- src/libFLAC/include/private/lpc.h | 6 +++--- src/libFLAC/include/private/stream_encoder.h | 2 +- src/libFLAC/lpc_intrin_sse.c | 4 ++-- src/libFLAC/lpc_intrin_sse2.c | 4 ++-- src/libFLAC/lpc_intrin_sse41.c | 4 ++-- src/libFLAC/stream_encoder.c | 6 +++--- src/libFLAC/stream_encoder_intrin_sse2.c | 4 ++-- src/libFLAC/stream_encoder_intrin_ssse3.c | 4 ++-- 14 files changed, 32 insertions(+), 32 deletions(-) diff --git a/configure.ac b/configure.ac index c3970b97..d3c302aa 100644 --- a/configure.ac +++ b/configure.ac @@ -113,8 +113,8 @@ case "$host_cpu" in else # x86_64 user space and kernel. cpu_x86_64=true - AC_DEFINE(FLaC__CPU_X86_64) - AH_TEMPLATE(FLaC__CPU_X86_64, [define if building for x86_64]) + AC_DEFINE(FLAC__CPU_X86_64) + AH_TEMPLATE(FLAC__CPU_X86_64, [define if building for x86_64]) fi asm_optimisation=$asm_opt ;; @@ -137,7 +137,7 @@ case "$host_cpu" in asm_optimisation=$asm_opt ;; esac -AM_CONDITIONAL(FLaC__CPU_X86_64, test "x$cpu_x86_64" = xtrue) +AM_CONDITIONAL(FLAC__CPU_X86_64, test "x$cpu_x86_64" = xtrue) AM_CONDITIONAL(FLaC__CPU_IA32, test "x$cpu_ia32" = xtrue) AM_CONDITIONAL(FLaC__CPU_PPC, test "x$cpu_ppc" = xtrue) AM_CONDITIONAL(FLaC__CPU_SPARC, test "x$cpu_sparc" = xtrue) diff --git a/src/libFLAC/cpu.c b/src/libFLAC/cpu.c index 627bd400..383f8230 100644 --- a/src/libFLAC/cpu.c +++ b/src/libFLAC/cpu.c @@ -419,7 +419,7 @@ void FLAC__cpu_info(FLAC__CPUInfo *info) /* * x86-64-specific */ -#elif defined FLaC__CPU_X86_64 +#elif defined FLAC__CPU_X86_64 info->type = FLAC__CPUINFO_TYPE_X86_64; #if !defined FLAC__NO_ASM && defined FLAC__HAS_X86INTRIN info->use_asm = true; @@ -518,7 +518,7 @@ void FLAC__cpu_info(FLAC__CPUInfo *info) #endif } -#if (defined FLAC__CPU_IA32 || defined FLaC__CPU_X86_64) && defined FLAC__HAS_X86INTRIN +#if (defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64) && defined FLAC__HAS_X86INTRIN #if defined _MSC_VER #include /* for __cpuid() */ @@ -528,7 +528,7 @@ void FLAC__cpu_info(FLAC__CPUInfo *info) FLAC__uint32 FLAC__cpu_have_cpuid_x86(void) { -#ifdef FLaC__CPU_X86_64 +#ifdef FLAC__CPU_X86_64 return 1; #else # if defined _MSC_VER || defined __INTEL_COMPILER /* Do they support CPUs w/o CPUID support (or OSes that work on those CPUs)? */ @@ -577,4 +577,4 @@ void FLAC__cpu_info_x86(FLAC__uint32 *flags_edx, FLAC__uint32 *flags_ecx) #endif } -#endif /* (FLAC__CPU_IA32 || FLaC__CPU_X86_64) && FLAC__HAS_X86INTRIN */ +#endif /* (FLAC__CPU_IA32 || FLAC__CPU_X86_64) && FLAC__HAS_X86INTRIN */ diff --git a/src/libFLAC/fixed_intrin_sse2.c b/src/libFLAC/fixed_intrin_sse2.c index fee11a3a..25f7d369 100644 --- a/src/libFLAC/fixed_intrin_sse2.c +++ b/src/libFLAC/fixed_intrin_sse2.c @@ -36,7 +36,7 @@ #ifndef FLAC__INTEGER_ONLY_LIBRARY #ifndef FLAC__NO_ASM -#if (defined FLAC__CPU_IA32 || defined FLaC__CPU_X86_64) && defined FLAC__HAS_X86INTRIN +#if (defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64) && defined FLAC__HAS_X86INTRIN #include "private/fixed.h" #ifdef FLAC__SSE2_SUPPORTED @@ -251,6 +251,6 @@ unsigned FLAC__fixed_compute_best_predictor_wide_intrin_sse2(const FLAC__int32 d } #endif /* FLAC__SSE2_SUPPORTED */ -#endif /* (FLAC__CPU_IA32 || FLaC__CPU_X86_64) && FLAC__HAS_X86INTRIN */ +#endif /* (FLAC__CPU_IA32 || FLAC__CPU_X86_64) && FLAC__HAS_X86INTRIN */ #endif /* FLAC__NO_ASM */ #endif /* FLAC__INTEGER_ONLY_LIBRARY */ diff --git a/src/libFLAC/fixed_intrin_ssse3.c b/src/libFLAC/fixed_intrin_ssse3.c index b01df942..be564704 100644 --- a/src/libFLAC/fixed_intrin_ssse3.c +++ b/src/libFLAC/fixed_intrin_ssse3.c @@ -36,7 +36,7 @@ #ifndef FLAC__INTEGER_ONLY_LIBRARY #ifndef FLAC__NO_ASM -#if (defined FLAC__CPU_IA32 || defined FLaC__CPU_X86_64) && defined FLAC__HAS_X86INTRIN +#if (defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64) && defined FLAC__HAS_X86INTRIN #include "private/fixed.h" #ifdef FLAC__SSSE3_SUPPORTED @@ -239,6 +239,6 @@ unsigned FLAC__fixed_compute_best_predictor_wide_intrin_ssse3(const FLAC__int32 } #endif /* FLAC__SSSE3_SUPPORTED */ -#endif /* (FLAC__CPU_IA32 || FLaC__CPU_X86_64) && FLAC__HAS_X86INTRIN */ +#endif /* (FLAC__CPU_IA32 || FLAC__CPU_X86_64) && FLAC__HAS_X86INTRIN */ #endif /* FLAC__NO_ASM */ #endif /* FLAC__INTEGER_ONLY_LIBRARY */ diff --git a/src/libFLAC/include/private/cpu.h b/src/libFLAC/include/private/cpu.h index 0d414445..f9b8b041 100644 --- a/src/libFLAC/include/private/cpu.h +++ b/src/libFLAC/include/private/cpu.h @@ -104,7 +104,7 @@ typedef struct { FLAC__bool ext3dnow; FLAC__bool extmmx; } FLAC__CPUInfo_IA32; -#elif defined FLaC__CPU_X86_64 +#elif defined FLAC__CPU_X86_64 typedef struct { FLAC__bool sse3; FLAC__bool ssse3; @@ -123,7 +123,7 @@ typedef struct { FLAC__CPUInfo_Type type; #if defined FLAC__CPU_IA32 FLAC__CPUInfo_IA32 ia32; -#elif defined FLaC__CPU_X86_64 +#elif defined FLAC__CPU_X86_64 FLAC__CPUInfo_x86_64 x86_64; #elif defined FLAC__CPU_PPC FLAC__CPUInfo_PPC ppc; @@ -140,7 +140,7 @@ void FLAC__cpu_info_asm_ia32(FLAC__uint32 *flags_edx, FLAC__uint32 *flag FLAC__uint32 FLAC__cpu_info_extended_amd_asm_ia32(void); #endif -#if (defined FLAC__CPU_IA32 || defined FLaC__CPU_X86_64) && defined FLAC__HAS_X86INTRIN +#if (defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64) && defined FLAC__HAS_X86INTRIN FLAC__uint32 FLAC__cpu_have_cpuid_x86(void); void FLAC__cpu_info_x86(FLAC__uint32 *flags_edx, FLAC__uint32 *flags_ecx); #endif diff --git a/src/libFLAC/include/private/fixed.h b/src/libFLAC/include/private/fixed.h index ca63b517..d1b8a869 100644 --- a/src/libFLAC/include/private/fixed.h +++ b/src/libFLAC/include/private/fixed.h @@ -57,7 +57,7 @@ unsigned FLAC__fixed_compute_best_predictor(const FLAC__int32 data[], unsigned data_len, FLAC__float residual_bits_per_sample[FLAC__MAX_FIXED_ORDER+1]); unsigned FLAC__fixed_compute_best_predictor_wide(const FLAC__int32 data[], unsigned data_len, FLAC__float residual_bits_per_sample[FLAC__MAX_FIXED_ORDER+1]); # ifndef FLAC__NO_ASM -# if (defined FLAC__CPU_IA32 || defined FLaC__CPU_X86_64) && defined FLAC__HAS_X86INTRIN +# if (defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64) && defined FLAC__HAS_X86INTRIN # ifdef FLAC__SSE2_SUPPORTED unsigned FLAC__fixed_compute_best_predictor_intrin_sse2(const FLAC__int32 data[], unsigned data_len, FLAC__float residual_bits_per_sample[FLAC__MAX_FIXED_ORDER + 1]); unsigned FLAC__fixed_compute_best_predictor_wide_intrin_sse2(const FLAC__int32 data[], unsigned data_len, FLAC__float residual_bits_per_sample[FLAC__MAX_FIXED_ORDER + 1]); diff --git a/src/libFLAC/include/private/lpc.h b/src/libFLAC/include/private/lpc.h index 53e5383e..12dd34b0 100644 --- a/src/libFLAC/include/private/lpc.h +++ b/src/libFLAC/include/private/lpc.h @@ -80,7 +80,7 @@ void FLAC__lpc_compute_autocorrelation_asm_ia32_sse_lag_16(const FLAC__real data void FLAC__lpc_compute_autocorrelation_asm_ia32_3dnow(const FLAC__real data[], unsigned data_len, unsigned lag, FLAC__real autoc[]); # endif # endif -# if (defined FLAC__CPU_IA32 || defined FLaC__CPU_X86_64) && defined FLAC__HAS_X86INTRIN +# if (defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64) && defined FLAC__HAS_X86INTRIN # ifdef FLAC__SSE_SUPPORTED void FLAC__lpc_compute_autocorrelation_intrin_sse_lag_4(const FLAC__real data[], unsigned data_len, unsigned lag, FLAC__real autoc[]); void FLAC__lpc_compute_autocorrelation_intrin_sse_lag_8(const FLAC__real data[], unsigned data_len, unsigned lag, FLAC__real autoc[]); @@ -158,7 +158,7 @@ void FLAC__lpc_compute_residual_from_qlp_coefficients_asm_ia32_mmx(const FLAC__i void FLAC__lpc_compute_residual_from_qlp_coefficients_wide_asm_ia32(const FLAC__int32 *data, unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 residual[]); # endif # endif -# if (defined FLAC__CPU_IA32 || defined FLaC__CPU_X86_64) && defined FLAC__HAS_X86INTRIN +# if (defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64) && defined FLAC__HAS_X86INTRIN # ifdef FLAC__SSE2_SUPPORTED void FLAC__lpc_compute_residual_from_qlp_coefficients_16_intrin_sse2(const FLAC__int32 *data, unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 residual[]); void FLAC__lpc_compute_residual_from_qlp_coefficients_intrin_sse2(const FLAC__int32 *data, unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 residual[]); @@ -199,7 +199,7 @@ void FLAC__lpc_restore_signal_wide_asm_ia32(const FLAC__int32 residual[], unsign void FLAC__lpc_restore_signal_asm_ppc_altivec_16(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]); void FLAC__lpc_restore_signal_asm_ppc_altivec_16_order8(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]); # endif /* FLAC__CPU_IA32 || FLAC__CPU_PPC */ -# if (defined FLAC__CPU_IA32 || defined FLaC__CPU_X86_64) && defined FLAC__HAS_X86INTRIN +# if (defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64) && defined FLAC__HAS_X86INTRIN # ifdef FLAC__SSE2_SUPPORTED void FLAC__lpc_restore_signal_16_intrin_sse2(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]); void FLAC__lpc_restore_signal_intrin_sse2(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]); diff --git a/src/libFLAC/include/private/stream_encoder.h b/src/libFLAC/include/private/stream_encoder.h index 76988da1..d26039ac 100644 --- a/src/libFLAC/include/private/stream_encoder.h +++ b/src/libFLAC/include/private/stream_encoder.h @@ -37,7 +37,7 @@ #include #endif -#if (defined FLAC__CPU_IA32 || defined FLaC__CPU_X86_64) && defined FLAC__HAS_X86INTRIN +#if (defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64) && defined FLAC__HAS_X86INTRIN #include "private/cpu.h" #include "FLAC/format.h" diff --git a/src/libFLAC/lpc_intrin_sse.c b/src/libFLAC/lpc_intrin_sse.c index 55b6632f..aed6741b 100644 --- a/src/libFLAC/lpc_intrin_sse.c +++ b/src/libFLAC/lpc_intrin_sse.c @@ -36,7 +36,7 @@ #ifndef FLAC__INTEGER_ONLY_LIBRARY #ifndef FLAC__NO_ASM -#if (defined FLAC__CPU_IA32 || defined FLaC__CPU_X86_64) && defined FLAC__HAS_X86INTRIN +#if (defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64) && defined FLAC__HAS_X86INTRIN #include "private/lpc.h" #ifdef FLAC__SSE_SUPPORTED @@ -247,6 +247,6 @@ void FLAC__lpc_compute_autocorrelation_intrin_sse_lag_16(const FLAC__real data[] } #endif /* FLAC__SSE_SUPPORTED */ -#endif /* (FLAC__CPU_IA32 || FLaC__CPU_X86_64) && FLAC__HAS_X86INTRIN */ +#endif /* (FLAC__CPU_IA32 || FLAC__CPU_X86_64) && FLAC__HAS_X86INTRIN */ #endif /* FLAC__NO_ASM */ #endif /* FLAC__INTEGER_ONLY_LIBRARY */ diff --git a/src/libFLAC/lpc_intrin_sse2.c b/src/libFLAC/lpc_intrin_sse2.c index 3a0bf217..1ee5c95f 100644 --- a/src/libFLAC/lpc_intrin_sse2.c +++ b/src/libFLAC/lpc_intrin_sse2.c @@ -36,7 +36,7 @@ #ifndef FLAC__INTEGER_ONLY_LIBRARY #ifndef FLAC__NO_ASM -#if (defined FLAC__CPU_IA32 || defined FLaC__CPU_X86_64) && defined FLAC__HAS_X86INTRIN +#if (defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64) && defined FLAC__HAS_X86INTRIN #include "private/lpc.h" #ifdef FLAC__SSE2_SUPPORTED @@ -2522,6 +2522,6 @@ void FLAC__lpc_restore_signal_intrin_sse2(const FLAC__int32 residual[], unsigned } #endif /* FLAC__SSE2_SUPPORTED */ -#endif /* (FLAC__CPU_IA32 || FLaC__CPU_X86_64) && FLAC__HAS_X86INTRIN */ +#endif /* (FLAC__CPU_IA32 || FLAC__CPU_X86_64) && FLAC__HAS_X86INTRIN */ #endif /* FLAC__NO_ASM */ #endif /* FLAC__INTEGER_ONLY_LIBRARY */ diff --git a/src/libFLAC/lpc_intrin_sse41.c b/src/libFLAC/lpc_intrin_sse41.c index 4cee7f7c..56da80f5 100644 --- a/src/libFLAC/lpc_intrin_sse41.c +++ b/src/libFLAC/lpc_intrin_sse41.c @@ -36,7 +36,7 @@ #ifndef FLAC__INTEGER_ONLY_LIBRARY #ifndef FLAC__NO_ASM -#if (defined FLAC__CPU_IA32 || defined FLaC__CPU_X86_64) && defined FLAC__HAS_X86INTRIN +#if (defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64) && defined FLAC__HAS_X86INTRIN #include "private/lpc.h" #ifdef FLAC__SSE4_1_SUPPORTED @@ -1134,6 +1134,6 @@ void FLAC__lpc_restore_signal_wide_intrin_sse41(const FLAC__int32 residual[], un } #endif /* FLAC__SSE4_1_SUPPORTED */ -#endif /* (FLAC__CPU_IA32 || FLaC__CPU_X86_64) && FLAC__HAS_X86INTRIN */ +#endif /* (FLAC__CPU_IA32 || FLAC__CPU_X86_64) && FLAC__HAS_X86INTRIN */ #endif /* FLAC__NO_ASM */ #endif /* FLAC__INTEGER_ONLY_LIBRARY */ diff --git a/src/libFLAC/stream_encoder.c b/src/libFLAC/stream_encoder.c index 818fbfc9..e64ece27 100644 --- a/src/libFLAC/stream_encoder.c +++ b/src/libFLAC/stream_encoder.c @@ -961,7 +961,7 @@ static FLAC__StreamEncoderInitStatus init_stream_internal_( } # endif # endif /* FLAC__HAS_X86INTRIN */ -# elif defined FLaC__CPU_X86_64 +# elif defined FLAC__CPU_X86_64 FLAC__ASSERT(encoder->private_->cpuinfo.type == FLAC__CPUINFO_TYPE_X86_64); # ifdef FLAC__HAS_X86INTRIN # ifdef FLAC__SSE_SUPPORTED @@ -1007,7 +1007,7 @@ static FLAC__StreamEncoderInitStatus init_stream_internal_( if(encoder->private_->cpuinfo.ia32.sse2) encoder->private_->local_precompute_partition_info_sums = FLAC__precompute_partition_info_sums_intrin_sse2; # endif -# elif defined FLaC__CPU_X86_64 +# elif defined FLAC__CPU_X86_64 # ifdef FLAC__SSE2_SUPPORTED # ifdef FLAC__SSSE3_SUPPORTED if(encoder->private_->cpuinfo.x86_64.ssse3) @@ -4135,7 +4135,7 @@ FLAC__bool set_partitioned_rice_( for(rice_parameter = 0, k = partition_samples; k < mean; rice_parameter++, k <<= 1) ; #else -#if defined FLaC__CPU_X86_64 /* and other 64-bit arch, too */ +#if defined FLAC__CPU_X86_64 /* and other 64-bit arch, too */ if(mean <= 0x80000000/512) { /* 512: more or less optimal for both 16- and 24-bit input */ #else if(mean <= 0x80000000/8) { /* 32-bit arch: use 32-bit math if possible */ diff --git a/src/libFLAC/stream_encoder_intrin_sse2.c b/src/libFLAC/stream_encoder_intrin_sse2.c index b2303a4c..bef55453 100644 --- a/src/libFLAC/stream_encoder_intrin_sse2.c +++ b/src/libFLAC/stream_encoder_intrin_sse2.c @@ -35,7 +35,7 @@ #endif #ifndef FLAC__NO_ASM -#if (defined FLAC__CPU_IA32 || defined FLaC__CPU_X86_64) && defined FLAC__HAS_X86INTRIN +#if (defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64) && defined FLAC__HAS_X86INTRIN #include "private/stream_encoder.h" #ifdef FLAC__SSE2_SUPPORTED @@ -154,5 +154,5 @@ void FLAC__precompute_partition_info_sums_intrin_sse2(const FLAC__int32 residual } #endif /* FLAC__SSE2_SUPPORTED */ -#endif /* (FLAC__CPU_IA32 || FLaC__CPU_X86_64) && FLAC__HAS_X86INTRIN */ +#endif /* (FLAC__CPU_IA32 || FLAC__CPU_X86_64) && FLAC__HAS_X86INTRIN */ #endif /* FLAC__NO_ASM */ diff --git a/src/libFLAC/stream_encoder_intrin_ssse3.c b/src/libFLAC/stream_encoder_intrin_ssse3.c index 876fbfe6..95b5f623 100644 --- a/src/libFLAC/stream_encoder_intrin_ssse3.c +++ b/src/libFLAC/stream_encoder_intrin_ssse3.c @@ -35,7 +35,7 @@ #endif #ifndef FLAC__NO_ASM -#if (defined FLAC__CPU_IA32 || defined FLaC__CPU_X86_64) && defined FLAC__HAS_X86INTRIN +#if (defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64) && defined FLAC__HAS_X86INTRIN #include "private/stream_encoder.h" #ifdef FLAC__SSSE3_SUPPORTED @@ -142,5 +142,5 @@ void FLAC__precompute_partition_info_sums_intrin_ssse3(const FLAC__int32 residua } #endif /* FLAC__SSSE3_SUPPORTED */ -#endif /* (FLAC__CPU_IA32 || FLaC__CPU_X86_64) && FLAC__HAS_X86INTRIN */ +#endif /* (FLAC__CPU_IA32 || FLAC__CPU_X86_64) && FLAC__HAS_X86INTRIN */ #endif /* FLAC__NO_ASM */