summaryrefslogtreecommitdiffstats
path: root/liba52
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-01-26 09:29:53 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-01-26 09:29:53 +0000
commiteb4a4604c099fa7c656b30d3edb759cb4c58661c (patch)
tree688310b04605805b0a7d0b033d81901c59c0c154 /liba52
parent418ce8eb059d44594b02c8e94d5a0a7ab28350e2 (diff)
downloadmpv-eb4a4604c099fa7c656b30d3edb759cb4c58661c.tar.bz2
mpv-eb4a4604c099fa7c656b30d3edb759cb4c58661c.tar.xz
HAVE_3DNOW --> HAVE_AMD3DNOW
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28370 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'liba52')
-rw-r--r--liba52/imdct.c16
-rw-r--r--liba52/imdct_3dnow.h28
-rw-r--r--liba52/liba52_changes.diff10
-rw-r--r--liba52/srfftp_3dnow.h4
4 files changed, 29 insertions, 29 deletions
diff --git a/liba52/imdct.c b/liba52/imdct.c
index c6253b672d..e3c6ca912d 100644
--- a/liba52/imdct.c
+++ b/liba52/imdct.c
@@ -53,8 +53,8 @@
void (*a52_imdct_512) (sample_t * data, sample_t * delay, sample_t bias);
#ifdef RUNTIME_CPUDETECT
-#undef HAVE_3DNOWEXT
-#define HAVE_3DNOWEXT 0
+#undef HAVE_AMD3DNOWEXT
+#define HAVE_AMD3DNOWEXT 0
#endif
typedef struct complex_s {
@@ -712,19 +712,19 @@ imdct_do_512_altivec(sample_t data[],sample_t delay[], sample_t bias)
// Stuff below this line is borrowed from libac3
#include "srfftp.h"
#if ARCH_X86 || ARCH_X86_64
-#undef HAVE_3DNOW
-#define HAVE_3DNOW 1
+#undef HAVE_AMD3DNOW
+#define HAVE_AMD3DNOW 1
#include "srfftp_3dnow.h"
const i_cmplx_t x_plus_minus_3dnow __attribute__ ((aligned (8))) = {{ 0x00000000UL, 0x80000000UL }};
const i_cmplx_t x_minus_plus_3dnow __attribute__ ((aligned (8))) = {{ 0x80000000UL, 0x00000000UL }};
const complex_t HSQRT2_3DNOW __attribute__ ((aligned (8))) = { 0.707106781188, 0.707106781188 };
-#undef HAVE_3DNOWEXT
-#define HAVE_3DNOWEXT 0
+#undef HAVE_AMD3DNOWEXT
+#define HAVE_AMD3DNOWEXT 0
#include "imdct_3dnow.h"
-#undef HAVE_3DNOWEXT
-#define HAVE_3DNOWEXT 1
+#undef HAVE_AMD3DNOWEXT
+#define HAVE_AMD3DNOWEXT 1
#include "imdct_3dnow.h"
void
diff --git a/liba52/imdct_3dnow.h b/liba52/imdct_3dnow.h
index 048aa7baa7..1c13f06870 100644
--- a/liba52/imdct_3dnow.h
+++ b/liba52/imdct_3dnow.h
@@ -26,7 +26,7 @@
#undef FFT_ASMB16_3DNOW
#undef FFT_128P_3DNOW
-#if HAVE_3DNOWEXT
+#if HAVE_AMD3DNOWEXT
#define FFT_4_3DNOW fft_4_3dnowex
#define FFT_8_3DNOW fft_8_3dnowex
#define FFT_ASMB_3DNOW fft_asmb_3dnowex
@@ -52,7 +52,7 @@ static void FFT_4_3DNOW(complex_t *x)
"pxor %3, %%mm1\n\t" /* -mm1.re | mm1.im */
"pfadd %%mm1, %%mm3\n\t" /* vi.im = x[3].re - x[1].re; */
"movq %%mm3, %%mm4\n\t" /* vi.re =-x[3].im + x[1].im; mm4 = vi */
-#if HAVE_3DNOWEXT
+#if HAVE_AMD3DNOWEXT
"pswapd %%mm4, %%mm4\n\t"
#else
"punpckldq %%mm4, %%mm5\n\t"
@@ -129,7 +129,7 @@ static void FFT_8_3DNOW(complex_t *x)
"movq (%1), %%mm1\n\t"
"movq 16(%1), %%mm4\n\t"
"movq %%mm1, %%mm2\n\t"
-#if HAVE_3DNOWEXT
+#if HAVE_AMD3DNOWEXT
"pswapd %%mm3, %%mm3\n\t"
#else
"punpckldq %%mm3, %%mm6\n\t"
@@ -160,7 +160,7 @@ static void FFT_8_3DNOW(complex_t *x)
"movq %2, %%mm1\n\t"
"movq 56(%3), %%mm3\n\t"
"pfsub 40(%3), %%mm0\n\t"
-#if HAVE_3DNOWEXT
+#if HAVE_AMD3DNOWEXT
"pswapd %%mm1, %%mm1\n\t"
#else
"punpckldq %%mm1, %%mm2\n\t"
@@ -168,7 +168,7 @@ static void FFT_8_3DNOW(complex_t *x)
#endif
"pxor %%mm7, %%mm1\n\t"
"pfadd %%mm1, %%mm0\n\t"
-#if HAVE_3DNOWEXT
+#if HAVE_AMD3DNOWEXT
"pswapd %%mm3, %%mm3\n\t"
#else
"punpckldq %%mm3, %%mm2\n\t"
@@ -182,7 +182,7 @@ static void FFT_8_3DNOW(complex_t *x)
"pfmul %4, %%mm0\n\t"
"movq 40(%3), %%mm5\n\t"
-#if HAVE_3DNOWEXT
+#if HAVE_AMD3DNOWEXT
"pswapd %%mm5, %%mm5\n\t"
#else
"punpckldq %%mm5, %%mm1\n\t"
@@ -205,7 +205,7 @@ static void FFT_8_3DNOW(complex_t *x)
/* x[3] x[7] */
__asm__ volatile(
"movq %1, %%mm0\n\t"
-#if HAVE_3DNOWEXT
+#if HAVE_AMD3DNOWEXT
"pswapd %3, %%mm1\n\t"
#else
"movq %3, %%mm1\n\t"
@@ -218,7 +218,7 @@ static void FFT_8_3DNOW(complex_t *x)
"movq 56(%4), %%mm3\n\t"
"pxor %%mm7, %%mm3\n\t"
"pfadd %%mm3, %%mm2\n\t"
-#if HAVE_3DNOWEXT
+#if HAVE_AMD3DNOWEXT
"pswapd %%mm2, %%mm2\n\t"
#else
"punpckldq %%mm2, %%mm5\n\t"
@@ -331,7 +331,7 @@ static void FFT_128P_3DNOW(complex_t *a)
}
static void
-#if HAVE_3DNOWEXT
+#if HAVE_AMD3DNOWEXT
imdct_do_512_3dnowex
#else
imdct_do_512_3dnow
@@ -371,14 +371,14 @@ imdct_do_512_3dnow
"punpckldq %4, %%mm1\n\t" /* mm1 = xcos[j] | xsin[j] */
"movq %%mm0, %%mm2\n\t"
"pfmul %%mm1, %%mm0\n\t"
-#if HAVE_3DNOWEXT
+#if HAVE_AMD3DNOWEXT
"pswapd %%mm1, %%mm1\n\t"
#else
"punpckldq %%mm1, %%mm5\n\t"
"punpckhdq %%mm5, %%mm1\n\t"
#endif
"pfmul %%mm1, %%mm2\n\t"
-#if HAVE_3DNOWEXT
+#if HAVE_AMD3DNOWEXT
"pfpnacc %%mm2, %%mm0\n\t"
#else
"pxor %%mm7, %%mm0\n\t"
@@ -445,7 +445,7 @@ imdct_do_512_3dnow
__asm__ volatile (
"movq %1, %%mm0\n\t" /* ac3_buf[i].re | ac3_buf[i].im */
"movq %%mm0, %%mm1\n\t" /* ac3_buf[i].re | ac3_buf[i].im */
-#if !HAVE_3DNOWEXT
+#if !HAVE_AMD3DNOWEXT
"punpckldq %%mm1, %%mm2\n\t"
"punpckhdq %%mm2, %%mm1\n\t"
#else
@@ -455,7 +455,7 @@ imdct_do_512_3dnow
"punpckldq %2, %%mm3\n\t" /* ac3_xsin[i] | ac3_xcos[i] */
"pfmul %%mm3, %%mm0\n\t"
"pfmul %%mm3, %%mm1\n\t"
-#if !HAVE_3DNOWEXT
+#if !HAVE_AMD3DNOWEXT
"pxor %%mm7, %%mm0\n\t"
"pfacc %%mm1, %%mm0\n\t"
"punpckldq %%mm0, %%mm1\n\t"
@@ -543,7 +543,7 @@ imdct_do_512_3dnow
"movd (%1), %%mm1\n\t"
"punpckldq (%2), %%mm0\n\t"
"punpckldq 508(%2), %%mm1\n\t"
-#if HAVE_3DNOWEXT
+#if HAVE_AMD3DNOWEXT
"pswapd (%3), %%mm3\n\t"
"pswapd -512(%3), %%mm4\n\t"
#else
diff --git a/liba52/liba52_changes.diff b/liba52/liba52_changes.diff
index 9840a05f02..9a559a5036 100644
--- a/liba52/liba52_changes.diff
+++ b/liba52/liba52_changes.diff
@@ -1412,7 +1412,7 @@
+void (*a52_imdct_512) (sample_t * data, sample_t * delay, sample_t bias);
+
+#ifdef RUNTIME_CPUDETECT
-+#undef HAVE_3DNOWEXT
++#undef HAVE_AMD3DNOWEXT
+#endif
typedef struct complex_s {
@@ -1853,8 +1853,8 @@
+// Stuff below this line is borrowed from libac3
+#include "srfftp.h"
+#if defined(ARCH_X86) || defined(ARCH_X86_64)
-+#ifndef HAVE_3DNOW
-+#define HAVE_3DNOW 1
++#ifndef HAVE_AMD3DNOW
++#define HAVE_AMD3DNOW 1
+#endif
+#include "srfftp_3dnow.h"
+
@@ -1862,9 +1862,9 @@
+const i_cmplx_t x_minus_plus_3dnow __attribute__ ((aligned (8))) = {{ 0x80000000UL, 0x00000000UL }};
+const complex_t HSQRT2_3DNOW __attribute__ ((aligned (8))) = { 0.707106781188, 0.707106781188 };
+
-+#undef HAVE_3DNOWEXT
++#undef HAVE_AMD3DNOWEXT
+#include "imdct_3dnow.h"
-+#define HAVE_3DNOWEXT
++#define HAVE_AMD3DNOWEXT
+#include "imdct_3dnow.h"
+
+void
diff --git a/liba52/srfftp_3dnow.h b/liba52/srfftp_3dnow.h
index 7d05d9e09f..fb4badc60c 100644
--- a/liba52/srfftp_3dnow.h
+++ b/liba52/srfftp_3dnow.h
@@ -46,7 +46,7 @@ typedef struct
"m"(x_minus_plus_3dnow)\
:"memory");
-#if HAVE_3DNOWEXT
+#if HAVE_AMD3DNOWEXT
#define PSWAP_MM(mm_base,mm_hlp) "pswapd "mm_base","mm_base"\n\t"
#else
#define PSWAP_MM(mm_base,mm_hlp)\
@@ -54,7 +54,7 @@ typedef struct
"psrlq $32, "mm_base"\n\t"\
"punpckldq "mm_hlp","mm_base"\n\t"
#endif
-#if HAVE_3DNOWEXT
+#if HAVE_AMD3DNOWEXT
#define PFNACC_MM(mm_base,mm_hlp) "pfnacc "mm_base","mm_base"\n\t"
#else
#define PFNACC_MM(mm_base,mm_hlp)\