[MPlayer-cvslog] r28361 - in trunk: Makefile configure cpudetect.c liba52/imdct.c liba52/imdct_3dnow.h liba52/liba52_changes.diff liba52/srfftp_3dnow.h mp3lib/sr1.c mpcommon.c

diego subversion at mplayerhq.hu
Sun Jan 25 22:03:02 CET 2009


Author: diego
Date: Sun Jan 25 22:03:02 2009
New Revision: 28361

Log:
HAVE_3DNOWEX --> HAVE_3DNOWEXT

Modified:
   trunk/Makefile
   trunk/configure
   trunk/cpudetect.c
   trunk/liba52/imdct.c
   trunk/liba52/imdct_3dnow.h
   trunk/liba52/liba52_changes.diff
   trunk/liba52/srfftp_3dnow.h
   trunk/mp3lib/sr1.c
   trunk/mpcommon.c

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Sun Jan 25 21:35:58 2009	(r28360)
+++ trunk/Makefile	Sun Jan 25 22:03:02 2009	(r28361)
@@ -389,7 +389,7 @@ SRCS_COMMON-$(MP3LIB)                += 
 SRCS_COMMON-$(MP3LIB)-$(ARCH_X86_32) += mp3lib/decode_i586.c
 SRCS_COMMON-$(MP3LIB)-$(ARCH_X86_32)-$(HAVE_3DNOW)    += mp3lib/dct36_3dnow.c \
                                                          mp3lib/dct64_3dnow.c
-SRCS_COMMON-$(MP3LIB)-$(ARCH_X86_32)-$(HAVE_3DNOWEX)  += mp3lib/dct36_k7.c \
+SRCS_COMMON-$(MP3LIB)-$(ARCH_X86_32)-$(HAVE_3DNOWEXT) += mp3lib/dct36_k7.c \
                                                          mp3lib/dct64_k7.c
 SRCS_COMMON-$(MP3LIB)-$(ARCH_X86_32)-$(HAVE_MMX)      += mp3lib/dct64_mmx.c
 SRCS_COMMON-$(MP3LIB)-$(HAVE_ALTIVEC) += mp3lib/dct64_altivec.c

Modified: trunk/configure
==============================================================================
--- trunk/configure	Sun Jan 25 21:35:58 2009	(r28360)
+++ trunk/configure	Sun Jan 25 22:03:02 2009	(r28361)
@@ -2611,12 +2611,12 @@ EOF
   echores "$_iwmmxt"
 fi
 
-_cpuexts_all='ALTIVEC MMX MMX2 3DNOW 3DNOWEX SSE SSE2 SSSE3 FAST_CMOV CMOV PLD ARMV5TE ARMV6 ARMV6T2 ARMVFP IWMMXT MMI VIS MVI'
+_cpuexts_all='ALTIVEC MMX MMX2 3DNOW 3DNOWEXT SSE SSE2 SSSE3 FAST_CMOV CMOV PLD ARMV5TE ARMV6 ARMV6T2 ARMVFP IWMMXT MMI VIS MVI'
 test "$_altivec"   = yes && _cpuexts="ALTIVEC $_cpuexts"
 test "$_mmx"       = yes && _cpuexts="MMX $_cpuexts"
 test "$_mmxext"    = yes && _cpuexts="MMX2 $_cpuexts"
 test "$_3dnow"     = yes && _cpuexts="3DNOW $_cpuexts"
-test "$_3dnowext"  = yes && _cpuexts="3DNOWEX $_cpuexts"
+test "$_3dnowext"  = yes && _cpuexts="3DNOWEXT $_cpuexts"
 test "$_sse"       = yes && _cpuexts="SSE $_cpuexts"
 test "$_sse2"      = yes && _cpuexts="SSE2 $_cpuexts"
 test "$_ssse3"     = yes && _cpuexts="SSSE3 $_cpuexts"

Modified: trunk/cpudetect.c
==============================================================================
--- trunk/cpudetect.c	Sun Jan 25 21:35:58 2009	(r28360)
+++ trunk/cpudetect.c	Sun Jan 25 22:03:02 2009	(r28361)
@@ -232,7 +232,7 @@ void GetCpuCaps( CpuCaps *caps)
 	if(caps->has3DNow) mp_msg(MSGT_CPUDETECT,MSGL_WARN,"3DNow supported but disabled\n");
 	caps->has3DNow=0;
 #endif
-#if !HAVE_3DNOWEX
+#if !HAVE_3DNOWEXT
 	if(caps->has3DNowExt) mp_msg(MSGT_CPUDETECT,MSGL_WARN,"3DNowExt supported but disabled\n");
 	caps->has3DNowExt=0;
 #endif

Modified: trunk/liba52/imdct.c
==============================================================================
--- trunk/liba52/imdct.c	Sun Jan 25 21:35:58 2009	(r28360)
+++ trunk/liba52/imdct.c	Sun Jan 25 22:03:02 2009	(r28361)
@@ -53,8 +53,8 @@
 void (*a52_imdct_512) (sample_t * data, sample_t * delay, sample_t bias);
 
 #ifdef RUNTIME_CPUDETECT
-#undef HAVE_3DNOWEX
-#define HAVE_3DNOWEX 0
+#undef HAVE_3DNOWEXT
+#define HAVE_3DNOWEXT 0
 #endif
 
 typedef struct complex_s {
@@ -720,11 +720,11 @@ const i_cmplx_t x_plus_minus_3dnow __att
 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_3DNOWEX
-#define HAVE_3DNOWEX 0
+#undef HAVE_3DNOWEXT
+#define HAVE_3DNOWEXT 0
 #include "imdct_3dnow.h"
-#undef HAVE_3DNOWEX
-#define HAVE_3DNOWEX 1
+#undef HAVE_3DNOWEXT
+#define HAVE_3DNOWEXT 1
 #include "imdct_3dnow.h"
 
 void

Modified: trunk/liba52/imdct_3dnow.h
==============================================================================
--- trunk/liba52/imdct_3dnow.h	Sun Jan 25 21:35:58 2009	(r28360)
+++ trunk/liba52/imdct_3dnow.h	Sun Jan 25 22:03:02 2009	(r28361)
@@ -26,7 +26,7 @@
 #undef FFT_ASMB16_3DNOW
 #undef FFT_128P_3DNOW
 
-#if HAVE_3DNOWEX
+#if HAVE_3DNOWEXT
 #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_3DNOWEX
+#if HAVE_3DNOWEXT
 	"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_3DNOWEX
+#if HAVE_3DNOWEXT
       "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_3DNOWEX
+#if HAVE_3DNOWEXT
 	"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_3DNOWEX
+#if HAVE_3DNOWEXT
 	"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_3DNOWEX
+#if HAVE_3DNOWEXT
 	"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_3DNOWEX
+#if HAVE_3DNOWEXT
 	"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_3DNOWEX
+#if HAVE_3DNOWEXT
 	"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_3DNOWEX
+#if HAVE_3DNOWEXT
 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_3DNOWEX
+#if HAVE_3DNOWEXT
 		"pswapd	%%mm1, %%mm1\n\t"
 #else
 		"punpckldq %%mm1, %%mm5\n\t"
 		"punpckhdq %%mm5, %%mm1\n\t"
 #endif
 		"pfmul	%%mm1, %%mm2\n\t"
-#if HAVE_3DNOWEX
+#if HAVE_3DNOWEXT
 		"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_3DNOWEX
+#if !HAVE_3DNOWEXT
 		"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_3DNOWEX
+#if !HAVE_3DNOWEXT
 		"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_3DNOWEX
+#if HAVE_3DNOWEXT
 		"pswapd	(%3), %%mm3\n\t"
 		"pswapd	-512(%3), %%mm4\n\t"
 #else

Modified: trunk/liba52/liba52_changes.diff
==============================================================================
--- trunk/liba52/liba52_changes.diff	Sun Jan 25 21:35:58 2009	(r28360)
+++ trunk/liba52/liba52_changes.diff	Sun Jan 25 22:03:02 2009	(r28361)
@@ -1412,7 +1412,7 @@
 +void (*a52_imdct_512) (sample_t * data, sample_t * delay, sample_t bias);
 +
 +#ifdef RUNTIME_CPUDETECT
-+#undef HAVE_3DNOWEX
++#undef HAVE_3DNOWEXT
 +#endif
  
  typedef struct complex_s {
@@ -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_3DNOWEX
++#undef HAVE_3DNOWEXT
 +#include "imdct_3dnow.h"
-+#define HAVE_3DNOWEX
++#define HAVE_3DNOWEXT
 +#include "imdct_3dnow.h"
 +
 +void

Modified: trunk/liba52/srfftp_3dnow.h
==============================================================================
--- trunk/liba52/srfftp_3dnow.h	Sun Jan 25 21:35:58 2009	(r28360)
+++ trunk/liba52/srfftp_3dnow.h	Sun Jan 25 22:03:02 2009	(r28361)
@@ -46,7 +46,7 @@ typedef struct
 	"m"(x_minus_plus_3dnow)\
 	:"memory");
 
-#if HAVE_3DNOWEX
+#if HAVE_3DNOWEXT
 #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_3DNOWEX
+#if HAVE_3DNOWEXT
 #define PFNACC_MM(mm_base,mm_hlp)	"pfnacc	"mm_base","mm_base"\n\t"
 #else
 #define PFNACC_MM(mm_base,mm_hlp)\

Modified: trunk/mp3lib/sr1.c
==============================================================================
--- trunk/mp3lib/sr1.c	Sun Jan 25 21:35:58 2009	(r28360)
+++ trunk/mp3lib/sr1.c	Sun Jan 25 22:03:02 2009	(r28361)
@@ -30,9 +30,9 @@
 #if ARCH_X86_64
 // 3DNow! and 3DNow!Ext routines don't compile under AMD64
 #undef HAVE_3DNOW
-#undef HAVE_3DNOWEX
+#undef HAVE_3DNOWEXT
 #define HAVE_3DNOW 0
-#define HAVE_3DNOWEX 0
+#define HAVE_3DNOWEXT 0
 #endif
 
 //static FILE* mp3_file=NULL;
@@ -423,7 +423,7 @@ void MP3_Init(void){
     }
 #endif
 
-#if HAVE_3DNOWEX
+#if HAVE_3DNOWEXT
     if (gCpuCaps.has3DNowExt)
     {
 	dct36_func=dct36_3dnowex;

Modified: trunk/mpcommon.c
==============================================================================
--- trunk/mpcommon.c	Sun Jan 25 21:35:58 2009	(r28360)
+++ trunk/mpcommon.c	Sun Jan 25 22:03:02 2009	(r28361)
@@ -54,7 +54,7 @@ void print_version(const char* name)
 #if HAVE_3DNOW
     mp_msg(MSGT_CPLAYER,MSGL_V," 3DNow");
 #endif
-#if HAVE_3DNOWEX
+#if HAVE_3DNOWEXT
     mp_msg(MSGT_CPLAYER,MSGL_V," 3DNowEx");
 #endif
 #if HAVE_SSE



More information about the MPlayer-cvslog mailing list