[Mplayer-cvslog] CVS: main/mp3lib d_cpu.h,1.3,1.4 d_cpu.s,1.6,1.7 dct36.c,1.2,1.3 dct36_3dnow.s,1.1.1.1,1.2 dct36_k7.s,1.1,1.2 dct64.c,1.1.1.1,1.2 dct64_3dnow.s,1.6,1.7 dct64_MMX.s,1.4,1.5 dct64_k7.s,1.8,1.9 dct64_sse.s,1.2,1.3 decod386.c,1.7,1.8 decode_MMX.s,1.6,1.7 decode_i586.s,1.2,1.3 layer3.c,1.3,1.4 sr1.c,1.13,1.14 tabinit_MMX.s,1.2,1.3

Atmosfear atmos4 at mplayer.dev.hu
Tue Aug 7 19:47:23 CEST 2001 

Update of /cvsroot/mplayer/main/mp3lib
In directory mplayer:/var/tmp.root/cvs-serv16353

Modified Files:
	d_cpu.h d_cpu.s dct36.c dct36_3dnow.s dct36_k7.s dct64.c 
	dct64_3dnow.s dct64_MMX.s dct64_k7.s dct64_sse.s decod386.c 
	decode_MMX.s decode_i586.s layer3.c sr1.c tabinit_MMX.s 
Log Message:
Added ASMLINK stuff to allow linking on win32 or aout.


Index: d_cpu.h
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/d_cpu.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- d_cpu.h	29 Jun 2001 17:53:53 -0000	1.3
+++ d_cpu.h	7 Aug 2001 17:47:20 -0000	1.4
@@ -5,6 +5,7 @@
 
 #ifndef __MY_CPUIDENT
 #define __MY_CPUIDENT
+#include "../asmlink.h"
 
 unsigned int _CpuID;
 unsigned int _i586;
@@ -12,10 +13,10 @@
 unsigned int _isse;
 unsigned int _has_mmx;
 
-extern unsigned long CpuDetect( void );
-extern unsigned long ipentium( void );
-extern unsigned long isse( void );
-extern unsigned long a3dnow( void );
+extern unsigned long ASMLINK(CpuDetect)( void );
+extern unsigned long ASMLINK(ipentium)( void );
+extern unsigned long ASMLINK(isse)( void );
+extern unsigned long ASMLINK(a3dnow)( void );
 
 #endif
 

Index: d_cpu.s
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/d_cpu.s,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- d_cpu.s	2 Jul 2001 08:07:41 -0000	1.6
+++ d_cpu.s	7 Aug 2001 17:47:20 -0000	1.7
@@ -6,16 +6,16 @@
 
 .text
 
-.globl CpuDetect
-.globl ipentium
-.globl a3dnow
-.globl isse
+.globl _CpuDetect
+.globl _ipentium
+.globl _a3dnow
+.globl _isse
 
 / ---------------------------------------------------------------------------
 /  in C: unsigned long CpuDetect( void );
 /   return: cpu ident number.
 / ---------------------------------------------------------------------------
-CpuDetect:
+_CpuDetect:
         pushl %ebx
         pushl %ecx
         pushl %edx
@@ -50,7 +50,7 @@
 /          1 otherwise
 /          3 if this cpu supports mmx
 / ---------------------------------------------------------------------------
-ipentium:
+_ipentium:
         pushl  %ebx
         pushl  %ecx
         pushl  %edx
@@ -90,13 +90,13 @@
 /          1 otherwise
 /          3 if this cpu supports 3dnow-dsp extension
 / ---------------------------------------------------------------------------
-a3dnow:
+_a3dnow:
         pushl  %ebx
         pushl  %edx
         pushl  %ecx
 
 
-        call   ipentium
+        call   _ipentium
         testl  %eax,%eax
         jz     exit2
 
@@ -128,12 +128,12 @@
 /          1 otherwise
 /          3 if this cpu supports sse2 extension
 / ---------------------------------------------------------------------------
-isse:
+_isse:
         pushl  %ebx
         pushl  %edx
         pushl  %ecx
 
-        call   ipentium
+        call   _ipentium
         testl  %eax,%eax
         jz     exit3
 

Index: dct36.c
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/dct36.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dct36.c	29 Jun 2001 17:53:53 -0000	1.2
+++ dct36.c	7 Aug 2001 17:47:20 -0000	1.3
@@ -115,7 +115,7 @@
       t0 = cos9[0] * (in[5] + in[9]);
       t1 = cos9[1] * (in[9] - in[17]);
 
-      tmp[13] = (t4 + t2 + t2) * tfcos36[17-13];
+      tmp[13] = (t4 + t2 + t2) * ASMLINK(tfcos36)[17-13];
       t2 = cos9[2] * (in[5] + in[17]);
 
       t6 = t3 - t0 - t2;
@@ -127,21 +127,21 @@
       t7 = COS6_1 * in[7];
 
       t1 = t2 + t4 + t7;
-      tmp[17] = (t0 + t1) * tfcos36[17-17];
-      tmp[9]  = (t0 - t1) * tfcos36[17-9];
+      tmp[17] = (t0 + t1) * ASMLINK(tfcos36)[17-17];
+      tmp[9]  = (t0 - t1) * ASMLINK(tfcos36)[17-9];
       t1 = cos18[2] * (in[3] + in[15]);
       t2 += t1 - t7;
 
-      tmp[14] = (t3 + t2) * tfcos36[17-14];
+      tmp[14] = (t3 + t2) * ASMLINK(tfcos36)[17-14];
       t0 = COS6_1 * (in[11] + in[15] - in[3]);
-      tmp[12] = (t3 - t2) * tfcos36[17-12];
+      tmp[12] = (t3 - t2) * ASMLINK(tfcos36)[17-12];
 
       t4 -= t1 + t7;
 
-      tmp[16] = (t5 - t0) * tfcos36[17-16];
-      tmp[10] = (t5 + t0) * tfcos36[17-10];
-      tmp[15] = (t6 + t4) * tfcos36[17-15];
-      tmp[11] = (t6 - t4) * tfcos36[17-11];
+      tmp[16] = (t5 - t0) * ASMLINK(tfcos36)[17-16];
+      tmp[10] = (t5 + t0) * ASMLINK(tfcos36)[17-10];
+      tmp[15] = (t6 + t4) * ASMLINK(tfcos36)[17-15];
+      tmp[11] = (t6 - t4) * ASMLINK(tfcos36)[17-11];
    }
 
 #define MACRO(v) { \
@@ -185,15 +185,15 @@
 #define MACRO1(v) { \
 	real sum0,sum1; \
     sum0 = tmp1a + tmp2a; \
-	sum1 = (tmp1b + tmp2b) * tfcos36[(v)]; \
+	sum1 = (tmp1b + tmp2b) * ASMLINK(tfcos36)[(v)]; \
 	MACRO0(v); }
 #define MACRO2(v) { \
     real sum0,sum1; \
     sum0 = tmp2a - tmp1a; \
-    sum1 = (tmp2b - tmp1b) * tfcos36[(v)]; \
+    sum1 = (tmp2b - tmp1b) * ASMLINK(tfcos36)[(v)]; \
 	MACRO0(v); }
 
-    register const real *c = COS9;
+    register const real *c = ASMLINK(COS9);
     register real *out2 = o2;
 	register real *w = wintab;
 	register real *out1 = o1;
@@ -253,7 +253,7 @@
 	{
 		real sum0,sum1;
     	sum0 =  in[2*0+0] - in[2*2+0] + in[2*4+0] - in[2*6+0] + in[2*8+0];
-    	sum1 = (in[2*0+1] - in[2*2+1] + in[2*4+1] - in[2*6+1] + in[2*8+1] ) * tfcos36[4];
+    	sum1 = (in[2*0+1] - in[2*2+1] + in[2*4+1] - in[2*6+1] + in[2*8+1] ) * ASMLINK(tfcos36)[4];
 		MACRO0(4);
 	}
   }

Index: dct36_3dnow.s
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/dct36_3dnow.s,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- dct36_3dnow.s	24 Feb 2001 20:31:08 -0000	1.1.1.1
+++ dct36_3dnow.s	7 Aug 2001 17:47:20 -0000	1.2
@@ -26,9 +26,9 @@
 /// this program. Use it at your own risk.
 /// 
 
-	.globl dct36_3dnow
-	.type	 dct36_3dnow, at function
-dct36_3dnow:
+	.globl _dct36_3dnow
+	.type  _dct36_3dnow, at function
+_dct36_3dnow:
 	pushl %ebp
 	movl %esp,%ebp
 	subl $120,%esp
@@ -120,9 +120,9 @@
 
 	movq 24(%eax),%mm0
 	movq 48(%eax),%mm1
-	movd COS9+12,%mm2
+	movd _COS9+12,%mm2
 	punpckldq %mm2,%mm2
-	movd COS9+24,%mm3
+	movd _COS9+24,%mm3
 	punpckldq %mm3,%mm3
 	pfmul %mm2,%mm0
 	pfmul %mm3,%mm1
@@ -132,41 +132,41 @@
 	pi2fd %mm7,%mm7
 	popl %eax
 	movq 8(%eax),%mm2
-	movd COS9+4,%mm3
+	movd _COS9+4,%mm3
 	punpckldq %mm3,%mm3
 	pfmul %mm3,%mm2
 	pfadd %mm0,%mm2
 	movq 40(%eax),%mm3
-	movd COS9+20,%mm4
+	movd _COS9+20,%mm4
 	punpckldq %mm4,%mm4
 	pfmul %mm4,%mm3
 	pfadd %mm3,%mm2
 	movq 56(%eax),%mm3
-	movd COS9+28,%mm4
+	movd _COS9+28,%mm4
 	punpckldq %mm4,%mm4
 	pfmul %mm4,%mm3
 	pfadd %mm3,%mm2
 	movq (%eax),%mm3
 	movq 16(%eax),%mm4
-	movd COS9+8,%mm5
+	movd _COS9+8,%mm5
 	punpckldq %mm5,%mm5
 	pfmul %mm5,%mm4
 	pfadd %mm4,%mm3
 	movq 32(%eax),%mm4
-	movd COS9+16,%mm5
+	movd _COS9+16,%mm5
 	punpckldq %mm5,%mm5
 	pfmul %mm5,%mm4
 	pfadd %mm4,%mm3
 	pfadd %mm1,%mm3
 	movq 64(%eax),%mm4
-	movd COS9+32,%mm5
+	movd _COS9+32,%mm5
 	punpckldq %mm5,%mm5
 	pfmul %mm5,%mm4
 	pfadd %mm4,%mm3
 	movq %mm2,%mm4
 	pfadd %mm3,%mm4
 	movq %mm7,%mm5
-	punpckldq tfcos36+0,%mm5
+	punpckldq _tfcos36+0,%mm5
 	pfmul %mm5,%mm4
 	movq %mm4,%mm5
 	pfacc %mm5,%mm5
@@ -192,7 +192,7 @@
 	movq %mm3,%mm4
 	pfsub %mm2,%mm4
 	movq %mm7,%mm5
-	punpckldq tfcos36+32,%mm5
+	punpckldq _tfcos36+32,%mm5
 	pfmul %mm5,%mm4
 	movq %mm4,%mm5
 	pfacc %mm5,%mm5
@@ -220,7 +220,7 @@
 	pfsub %mm3,%mm2
 	movq 56(%eax),%mm3
 	pfsub %mm3,%mm2
-	movd COS9+12,%mm3
+	movd _COS9+12,%mm3
 	punpckldq %mm3,%mm3
 	pfmul %mm3,%mm2
 	movq 16(%eax),%mm3
@@ -228,7 +228,7 @@
 	pfsub %mm4,%mm3
 	movq 64(%eax),%mm4
 	pfsub %mm4,%mm3
-	movd COS9+24,%mm4
+	movd _COS9+24,%mm4
 	punpckldq %mm4,%mm4
 	pfmul %mm4,%mm3
 	movq 48(%eax),%mm4
@@ -238,7 +238,7 @@
 	movq %mm2,%mm4
 	pfadd %mm3,%mm4
 	movq %mm7,%mm5
-	punpckldq tfcos36+4,%mm5
+	punpckldq _tfcos36+4,%mm5
 	pfmul %mm5,%mm4
 	movq %mm4,%mm5
 	pfacc %mm5,%mm5
@@ -264,7 +264,7 @@
 	movq %mm3,%mm4
 	pfsub %mm2,%mm4
 	movq %mm7,%mm5
-	punpckldq tfcos36+28,%mm5
+	punpckldq _tfcos36+28,%mm5
 	pfmul %mm5,%mm4
 	movq %mm4,%mm5
 	pfacc %mm5,%mm5
@@ -289,41 +289,41 @@
 	movd %mm5,2048(%ebx)
 
 	movq 8(%eax),%mm2
-	movd COS9+20,%mm3
+	movd _COS9+20,%mm3
 	punpckldq %mm3,%mm3
 	pfmul %mm3,%mm2
 	pfsub %mm0,%mm2
 	movq 40(%eax),%mm3
-	movd COS9+28,%mm4
+	movd _COS9+28,%mm4
 	punpckldq %mm4,%mm4
 	pfmul %mm4,%mm3
 	pfsub %mm3,%mm2
 	movq 56(%eax),%mm3
-	movd COS9+4,%mm4
+	movd _COS9+4,%mm4
 	punpckldq %mm4,%mm4
 	pfmul %mm4,%mm3
 	pfadd %mm3,%mm2
 	movq (%eax),%mm3
 	movq 16(%eax),%mm4
-	movd COS9+32,%mm5
+	movd _COS9+32,%mm5
 	punpckldq %mm5,%mm5
 	pfmul %mm5,%mm4
 	pfsub %mm4,%mm3
 	movq 32(%eax),%mm4
-	movd COS9+8,%mm5
+	movd _COS9+8,%mm5
 	punpckldq %mm5,%mm5
 	pfmul %mm5,%mm4
 	pfsub %mm4,%mm3
 	pfadd %mm1,%mm3
 	movq 64(%eax),%mm4
-	movd COS9+16,%mm5
+	movd _COS9+16,%mm5
 	punpckldq %mm5,%mm5
 	pfmul %mm5,%mm4
 	pfadd %mm4,%mm3
 	movq %mm2,%mm4
 	pfadd %mm3,%mm4
 	movq %mm7,%mm5
-	punpckldq tfcos36+8,%mm5
+	punpckldq _tfcos36+8,%mm5
 	pfmul %mm5,%mm4
 	movq %mm4,%mm5
 	pfacc %mm5,%mm5
@@ -349,7 +349,7 @@
 	movq %mm3,%mm4
 	pfsub %mm2,%mm4
 	movq %mm7,%mm5
-	punpckldq tfcos36+24,%mm5
+	punpckldq _tfcos36+24,%mm5
 	pfmul %mm5,%mm4
 	movq %mm4,%mm5
 	pfacc %mm5,%mm5
@@ -373,41 +373,41 @@
 	psrlq $32,%mm5
 	movd %mm5,1920(%ebx)
 	movq 8(%eax),%mm2
-	movd COS9+28,%mm3
+	movd _COS9+28,%mm3
 	punpckldq %mm3,%mm3
 	pfmul %mm3,%mm2
 	pfsub %mm0,%mm2
 	movq 40(%eax),%mm3
-	movd COS9+4,%mm4
+	movd _COS9+4,%mm4
 	punpckldq %mm4,%mm4
 	pfmul %mm4,%mm3
 	pfadd %mm3,%mm2
 	movq 56(%eax),%mm3
-	movd COS9+20,%mm4
+	movd _COS9+20,%mm4
 	punpckldq %mm4,%mm4
 	pfmul %mm4,%mm3
 	pfsub %mm3,%mm2
 	movq (%eax),%mm3
 	movq 16(%eax),%mm4
-	movd COS9+16,%mm5
+	movd _COS9+16,%mm5
 	punpckldq %mm5,%mm5
 	pfmul %mm5,%mm4
 	pfsub %mm4,%mm3
 	movq 32(%eax),%mm4
-	movd COS9+32,%mm5
+	movd _COS9+32,%mm5
 	punpckldq %mm5,%mm5
 	pfmul %mm5,%mm4
 	pfadd %mm4,%mm3
 	pfadd %mm1,%mm3
 	movq 64(%eax),%mm4
-	movd COS9+8,%mm5
+	movd _COS9+8,%mm5
 	punpckldq %mm5,%mm5
 	pfmul %mm5,%mm4
 	pfsub %mm4,%mm3
 	movq %mm2,%mm4
 	pfadd %mm3,%mm4
 	movq %mm7,%mm5
-	punpckldq tfcos36+12,%mm5
+	punpckldq _tfcos36+12,%mm5
 	pfmul %mm5,%mm4
 	movq %mm4,%mm5
 	pfacc %mm5,%mm5
@@ -433,7 +433,7 @@
 	movq %mm3,%mm4
 	pfsub %mm2,%mm4
 	movq %mm7,%mm5
-	punpckldq tfcos36+20,%mm5
+	punpckldq _tfcos36+20,%mm5
 	pfmul %mm5,%mm4
 	movq %mm4,%mm5
 	pfacc %mm5,%mm5
@@ -467,7 +467,7 @@
 	movq 64(%eax),%mm3
 	pfadd %mm3,%mm4
 	movq %mm7,%mm5
-	punpckldq tfcos36+16,%mm5
+	punpckldq _tfcos36+16,%mm5
 	pfmul %mm5,%mm4
 	movq %mm4,%mm5
 	pfacc %mm5,%mm5

Index: dct36_k7.s
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/dct36_k7.s,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dct36_k7.s	9 May 2001 07:59:55 -0000	1.1
+++ dct36_k7.s	7 Aug 2001 17:47:20 -0000	1.2
@@ -40,9 +40,9 @@
 /// this program. Use it at your own risk.
 /// 
 
-	.globl dct36_3dnowex
-	.type	 dct36_3dnowex, at function
-dct36_3dnowex:
+	.globl _dct36_3dnowex
+	.type  _dct36_3dnowex, at function
+_dct36_3dnowex:
 	pushl %ebp
 	movl %esp,%ebp
 	subl $120,%esp
@@ -133,9 +133,9 @@
 	movd %mm3,68(%eax)
 	movq 24(%eax),%mm0
 	movq 48(%eax),%mm1
-	movd COS9+12,%mm2
+	movd _COS9+12,%mm2
 	punpckldq %mm2,%mm2
-	movd COS9+24,%mm3
+	movd _COS9+24,%mm3
 	punpckldq %mm3,%mm3
 	pfmul %mm2,%mm0
 	pfmul %mm3,%mm1
@@ -145,41 +145,41 @@
 	pi2fd %mm7,%mm7
 	popl %eax
 	movq 8(%eax),%mm2
-	movd COS9+4,%mm3
+	movd _COS9+4,%mm3
 	punpckldq %mm3,%mm3
 	pfmul %mm3,%mm2
 	pfadd %mm0,%mm2
 	movq 40(%eax),%mm3
-	movd COS9+20,%mm4
+	movd _COS9+20,%mm4
 	punpckldq %mm4,%mm4
 	pfmul %mm4,%mm3
 	pfadd %mm3,%mm2
 	movq 56(%eax),%mm3
-	movd COS9+28,%mm4
+	movd _COS9+28,%mm4
 	punpckldq %mm4,%mm4
 	pfmul %mm4,%mm3
 	pfadd %mm3,%mm2
 	movq (%eax),%mm3
 	movq 16(%eax),%mm4
-	movd COS9+8,%mm5
+	movd _COS9+8,%mm5
 	punpckldq %mm5,%mm5
 	pfmul %mm5,%mm4
 	pfadd %mm4,%mm3
 	movq 32(%eax),%mm4
-	movd COS9+16,%mm5
+	movd _COS9+16,%mm5
 	punpckldq %mm5,%mm5
 	pfmul %mm5,%mm4
 	pfadd %mm4,%mm3
 	pfadd %mm1,%mm3
 	movq 64(%eax),%mm4
-	movd COS9+32,%mm5
+	movd _COS9+32,%mm5
 	punpckldq %mm5,%mm5
 	pfmul %mm5,%mm4
 	pfadd %mm4,%mm3
 	movq %mm2,%mm4
 	pfadd %mm3,%mm4
 	movq %mm7,%mm5
-	punpckldq tfcos36+0,%mm5
+	punpckldq _tfcos36+0,%mm5
 	pfmul %mm5,%mm4
 	movq %mm4,%mm5
 	pfacc %mm5,%mm5
@@ -204,7 +204,7 @@
 	movq %mm3,%mm4
 	pfsub %mm2,%mm4
 	movq %mm7,%mm5
-	punpckldq tfcos36+32,%mm5
+	punpckldq _tfcos36+32,%mm5
 	pfmul %mm5,%mm4
 	movq %mm4,%mm5
 	pfacc %mm5,%mm5
@@ -232,7 +232,7 @@
 	pfsub %mm3,%mm2
 	movq 56(%eax),%mm3
 	pfsub %mm3,%mm2
-	movd COS9+12,%mm3
+	movd _COS9+12,%mm3
 	punpckldq %mm3,%mm3
 	pfmul %mm3,%mm2
 	movq 16(%eax),%mm3
@@ -240,7 +240,7 @@
 	pfsub %mm4,%mm3
 	movq 64(%eax),%mm4
 	pfsub %mm4,%mm3
-	movd COS9+24,%mm4
+	movd _COS9+24,%mm4
 	punpckldq %mm4,%mm4
 	pfmul %mm4,%mm3
 	movq 48(%eax),%mm4
@@ -250,7 +250,7 @@
 	movq %mm2,%mm4
 	pfadd %mm3,%mm4
 	movq %mm7,%mm5
-	punpckldq tfcos36+4,%mm5
+	punpckldq _tfcos36+4,%mm5
 	pfmul %mm5,%mm4
 	movq %mm4,%mm5
 	pfacc %mm5,%mm5
@@ -276,7 +276,7 @@
 	movq %mm3,%mm4
 	pfsub %mm2,%mm4
 	movq %mm7,%mm5
-	punpckldq tfcos36+28,%mm5
+	punpckldq _tfcos36+28,%mm5
 	pfmul %mm5,%mm4
 	movq %mm4,%mm5
 	pfacc %mm5,%mm5
@@ -301,41 +301,41 @@
 	movd %mm5,2048(%ebx)
 
 	movq 8(%eax),%mm2
-	movd COS9+20,%mm3
+	movd _COS9+20,%mm3
 	punpckldq %mm3,%mm3
 	pfmul %mm3,%mm2
 	pfsub %mm0,%mm2
 	movq 40(%eax),%mm3
-	movd COS9+28,%mm4
+	movd _COS9+28,%mm4
 	punpckldq %mm4,%mm4
 	pfmul %mm4,%mm3
 	pfsub %mm3,%mm2
 	movq 56(%eax),%mm3
-	movd COS9+4,%mm4
+	movd _COS9+4,%mm4
 	punpckldq %mm4,%mm4
 	pfmul %mm4,%mm3
 	pfadd %mm3,%mm2
 	movq (%eax),%mm3
 	movq 16(%eax),%mm4
-	movd COS9+32,%mm5
+	movd _COS9+32,%mm5
 	punpckldq %mm5,%mm5
 	pfmul %mm5,%mm4
 	pfsub %mm4,%mm3
 	movq 32(%eax),%mm4
-	movd COS9+8,%mm5
+	movd _COS9+8,%mm5
 	punpckldq %mm5,%mm5
 	pfmul %mm5,%mm4
 	pfsub %mm4,%mm3
 	pfadd %mm1,%mm3
 	movq 64(%eax),%mm4
-	movd COS9+16,%mm5
+	movd _COS9+16,%mm5
 	punpckldq %mm5,%mm5
 	pfmul %mm5,%mm4
 	pfadd %mm4,%mm3
 	movq %mm2,%mm4
 	pfadd %mm3,%mm4
 	movq %mm7,%mm5
-	punpckldq tfcos36+8,%mm5
+	punpckldq _tfcos36+8,%mm5
 	pfmul %mm5,%mm4
 	movq %mm4,%mm5
 	pfacc %mm5,%mm5
@@ -361,7 +361,7 @@
 	movq %mm3,%mm4
 	pfsub %mm2,%mm4
 	movq %mm7,%mm5
-	punpckldq tfcos36+24,%mm5
+	punpckldq _tfcos36+24,%mm5
 	pfmul %mm5,%mm4
 	movq %mm4,%mm5
 	pfacc %mm5,%mm5
@@ -385,41 +385,41 @@
 	psrlq $32,%mm5
 	movd %mm5,1920(%ebx)
 	movq 8(%eax),%mm2
-	movd COS9+28,%mm3
+	movd _COS9+28,%mm3
 	punpckldq %mm3,%mm3
 	pfmul %mm3,%mm2
 	pfsub %mm0,%mm2
 	movq 40(%eax),%mm3
-	movd COS9+4,%mm4
+	movd _COS9+4,%mm4
 	punpckldq %mm4,%mm4
 	pfmul %mm4,%mm3
 	pfadd %mm3,%mm2
 	movq 56(%eax),%mm3
-	movd COS9+20,%mm4
+	movd _COS9+20,%mm4
 	punpckldq %mm4,%mm4
 	pfmul %mm4,%mm3
 	pfsub %mm3,%mm2
 	movq (%eax),%mm3
 	movq 16(%eax),%mm4
-	movd COS9+16,%mm5
+	movd _COS9+16,%mm5
 	punpckldq %mm5,%mm5
 	pfmul %mm5,%mm4
 	pfsub %mm4,%mm3
 	movq 32(%eax),%mm4
-	movd COS9+32,%mm5
+	movd _COS9+32,%mm5
 	punpckldq %mm5,%mm5
 	pfmul %mm5,%mm4
 	pfadd %mm4,%mm3
 	pfadd %mm1,%mm3
 	movq 64(%eax),%mm4
-	movd COS9+8,%mm5
+	movd _COS9+8,%mm5
 	punpckldq %mm5,%mm5
 	pfmul %mm5,%mm4
 	pfsub %mm4,%mm3
 	movq %mm2,%mm4
 	pfadd %mm3,%mm4
 	movq %mm7,%mm5
-	punpckldq tfcos36+12,%mm5
+	punpckldq _tfcos36+12,%mm5
 	pfmul %mm5,%mm4
 	movq %mm4,%mm5
 	pfacc %mm5,%mm5
@@ -445,7 +445,7 @@
 	movq %mm3,%mm4
 	pfsub %mm2,%mm4
 	movq %mm7,%mm5
-	punpckldq tfcos36+20,%mm5
+	punpckldq _tfcos36+20,%mm5
 	pfmul %mm5,%mm4
 	movq %mm4,%mm5
 	pfacc %mm5,%mm5
@@ -479,7 +479,7 @@
 	movq 64(%eax),%mm3
 	pfadd %mm3,%mm4
 	movq %mm7,%mm5
-	punpckldq tfcos36+16,%mm5
+	punpckldq _tfcos36+16,%mm5
 	pfmul %mm5,%mm4
 	movq %mm4,%mm5
 	pfacc %mm5,%mm5

Index: dct64.c
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/dct64.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- dct64.c	24 Feb 2001 20:31:00 -0000	1.1.1.1
+++ dct64.c	7 Aug 2001 17:47:20 -0000	1.2
@@ -7,6 +7,8 @@
  * even for Intel processors.
  */
 
+#include "../asmlink.h"
+
 static void dct64_1(real *out0,real *out1,real *b1,real *b2,real *samples)
 {
 
@@ -305,7 +307,7 @@
  * the call via dct64 is a trick to force GCC to use
  * (new) registers for the b1,b2 pointer to the bufs[xx] field
  */
-void dct64(real *a,real *b,real *c)
+void ASMLINK(dct64)(real *a,real *b,real *c)
 {
   real bufs[0x40];
   dct64_1(a,b,bufs,bufs+0x20,c);

Index: dct64_3dnow.s
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/dct64_3dnow.s,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dct64_3dnow.s	7 Aug 2001 15:37:45 -0000	1.6
+++ dct64_3dnow.s	7 Aug 2001 17:47:20 -0000	1.7
@@ -16,8 +16,8 @@
 
 	.balign 16
 
-.globl dct64_MMX_3dnow
-dct64_MMX_3dnow:
+.globl _dct64_MMX_3dnow
+_dct64_MMX_3dnow:
 	pushl %ebx
 	pushl %esi
 	pushl %edi

Index: dct64_MMX.s
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/dct64_MMX.s,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dct64_MMX.s	7 Aug 2001 15:37:45 -0000	1.4
+++ dct64_MMX.s	7 Aug 2001 17:47:20 -0000	1.5
@@ -7,8 +7,8 @@
 
 	.balign 16
 
-.globl dct64_MMX
-dct64_MMX:
+.globl _dct64_MMX
+_dct64_MMX:
 	pushl %ebx
 	pushl %esi
 	pushl %edi

Index: dct64_k7.s
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/dct64_k7.s,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- dct64_k7.s	7 Aug 2001 15:37:45 -0000	1.8
+++ dct64_k7.s	7 Aug 2001 17:47:20 -0000	1.9
@@ -16,8 +16,8 @@
 
 	.balign 16
 
-.globl dct64_MMX_3dnowex
-dct64_MMX_3dnowex:
+.globl _dct64_MMX_3dnowex
+_dct64_MMX_3dnowex:
 	pushl %ebx
 	pushl %esi
 	pushl %edi

Index: dct64_sse.s
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/dct64_sse.s,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dct64_sse.s	7 Aug 2001 15:37:45 -0000	1.2
+++ dct64_sse.s	7 Aug 2001 17:47:20 -0000	1.3
@@ -14,9 +14,9 @@
 
 	.balign 16
 
-	.global dct64_MMX_sse
+	.globl _dct64_MMX_sse
 
-dct64_MMX_sse:
+_dct64_MMX_sse:
 	pushl %ebx
 	pushl %esi
 	pushl %edi

Index: decod386.c
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/decod386.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- decod386.c	14 Jul 2001 16:52:09 -0000	1.7
+++ decod386.c	7 Aug 2001 17:47:20 -0000	1.8
@@ -12,6 +12,7 @@
 
 
 #include "../config.h"
+#include "../asmlink.h"
 
 #if 0
  /* old WRITE_SAMPLE */
@@ -190,12 +191,12 @@
   if(bo & 0x1) {
     b0 = buf[0];
     bo1 = bo;
-    dct64(buf[1]+((bo+1)&0xf),buf[0]+bo,bandPtr);
+    ASMLINK(dct64)(buf[1]+((bo+1)&0xf),buf[0]+bo,bandPtr);
   }
   else {
     b0 = buf[1];
     bo1 = bo+1;
-    dct64(buf[0]+bo,buf[1]+bo+1,bandPtr);
+    ASMLINK(dct64)(buf[0]+bo,buf[1]+bo+1,bandPtr);
   }
 
   {

Index: decode_MMX.s
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/decode_MMX.s,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- decode_MMX.s	7 Aug 2001 15:37:45 -0000	1.6
+++ decode_MMX.s	7 Aug 2001 17:47:20 -0000	1.7
@@ -47,12 +47,12 @@
 
 .text
 
-.globl synth_1to1_MMX_s
+.globl _synth_1to1_MMX_s
 //
 // void synth_1to1_MMX_s(real *bandPtr, int channel, short *samples,
 //                       short *buffs, int *bo);
 //
-synth_1to1_MMX_s:
+_synth_1to1_MMX_s:
         pushl %ebp
         pushl %edi
         pushl %esi
@@ -87,7 +87,7 @@
 	emms
         pushl %edx
         pushl %ecx
-        call *dct64_MMX_func
+        call *_dct64_MMX_func
 	leal 1(%ebx), %ecx
         subl %ebp,%ebx
 	pushl %ecx

Index: decode_i586.s
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/decode_i586.s,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- decode_i586.s	7 Aug 2001 15:37:45 -0000	1.2
+++ decode_i586.s	7 Aug 2001 17:47:20 -0000	1.3
@@ -43,8 +43,8 @@
         .long 0x0,0xc0e00000
         .balign 8
 .text
-.globl synth_1to1_pent
-synth_1to1_pent:
+.globl _synth_1to1_pent
+_synth_1to1_pent:
         subl $12,%esp
         pushl %ebp
         pushl %edi
@@ -89,7 +89,7 @@
         leal (%ecx,%ebp,4),%eax
 .L74:
         pushl %eax
-        call dct64
+        call _dct64
         addl $12,%esp
         movl 16(%esp),%edx
         leal 0(,%edx,4),%edx

Index: layer3.c
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/layer3.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- layer3.c	29 Jun 2001 17:53:53 -0000	1.3
+++ layer3.c	7 Aug 2001 17:47:20 -0000	1.4
@@ -13,6 +13,8 @@
  *   mpeg1_iis package
  */ 
 
+#include "../asmlink.h"
+
 static real ispow[8207];
 static real aa_ca[8],aa_cs[8];
 static real COS1[12][6];
@@ -22,9 +24,9 @@
 #define GP2MAX (256+118+4)
 static real gainpow2[GP2MAX];
 
-real COS9[9];
+real ASMLINK(COS9)[9];
 static real COS6_1,COS6_2;
-real tfcos36[9];
+real ASMLINK(tfcos36)[9];
 static real tfcos12[3];
 #ifdef NEW_DCT9
 static real cos9[3],cos18[3];
@@ -143,10 +145,10 @@
   }
 
   for(i=0;i<9;i++)
-    COS9[i] = cos( M_PI / 18.0 * (double) i);
+    ASMLINK(COS9)[i] = cos( M_PI / 18.0 * (double) i);
 
   for(i=0;i<9;i++)
-    tfcos36[i] = 0.5 / cos ( M_PI * (double) (i*2+1) / 36.0 );
+    ASMLINK(tfcos36)[i] = 0.5 / cos ( M_PI * (double) (i*2+1) / 36.0 );
   for(i=0;i<3;i++)
     tfcos12[i] = 0.5 / cos ( M_PI * (double) (i*2+1) / 12.0 );
 

Index: sr1.c
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/sr1.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sr1.c	27 Jul 2001 17:21:23 -0000	1.13
+++ sr1.c	7 Aug 2001 17:47:20 -0000	1.14
@@ -21,6 +21,7 @@
 #define real float
 // #define int long
 
+#include "../asmlink.h"
 #include "mpg123.h"
 #include "huffman.h"
 #include "mp3.h"
@@ -364,11 +365,11 @@
 static int tables_done_flag=0;
 
 /* It's hidden from gcc in assembler */
-extern void dct64_MMX( void );
-extern void dct64_MMX_3dnow( void );
-extern void dct64_MMX_3dnowex( void );
-extern void dct64_MMX_sse( void );
-void (*dct64_MMX_func)( void );
+extern void ASMLINK(dct64_MMX)( void );
+extern void ASMLINK(dct64_MMX_3dnow)( void );
+extern void ASMLINK(dct64_MMX_3dnowex)( void );
+extern void ASMLINK(dct64_MMX_sse)( void );
+void (*ASMLINK(dct64_MMX_func))( void );
 
 // Init decoder tables.  Call first, once!
 #ifdef USE_FAKE_MONO
@@ -377,19 +378,19 @@
 void MP3_Init(){
 #endif
 #ifdef ARCH_X86
-    _CpuID=CpuDetect();
-    _i586=ipentium();
+    _CpuID=ASMLINK(CpuDetect)();
+    _i586=ASMLINK(ipentium)();
 #ifndef HAVE_MMX
     _i586 &= 1;
 #endif
-    _3dnow=a3dnow();
+    _3dnow=ASMLINK(a3dnow)();
 #ifndef HAVE_3DNOW
     _3dnow = 0;
 #endif
 #ifndef HAVE_3DNOWEX
     _3dnow &= 1;
 #endif
-    _isse=isse();
+    _isse=ASMLINK(isse)();
 #ifndef HAVE_SSE
     _isse = 0;
 #endif
@@ -418,7 +419,7 @@
 #ifdef HAVE_MMX
 /* Use it for any MMX cpu */
    if(_has_mmx)
-	make_decode_tables_MMX(outscale);
+	ASMLINK(make_decode_tables_MMX)(outscale);
    else
 #endif
 	make_decode_tables(outscale);
@@ -443,41 +444,41 @@
 #ifdef HAVE_SSE
   if(_isse)
   {
-    synth_func=synth_1to1_MMX;
-    dct64_MMX_func=dct64_MMX_sse;
+    synth_func=ASMLINK(synth_1to1_MMX);
+    dct64_MMX_func=ASMLINK(dct64_MMX_sse);
   }    
   else
 #endif
 #ifdef HAVE_3DNOWEX
   if ( _3dnow > 1 )
   {
-     synth_func=synth_1to1_MMX;
-     dct36_func=dct36_3dnowex;
-     dct64_MMX_func=dct64_MMX_3dnowex;
+     synth_func=ASMLINK(synth_1to1_MMX);
+     dct36_func=ASMLINK(dct36_3dnowex);
+     dct64_MMX_func=ASMLINK(dct64_MMX_3dnowex);
   }
   else
 #endif
 #ifdef HAVE_3DNOW
   if ( _3dnow )
   {
-    synth_func=synth_1to1_MMX;
-    dct36_func=dct36_3dnow;
-    dct64_MMX_func=dct64_MMX_3dnow;
+    synth_func=ASMLINK(synth_1to1_MMX);
+    dct36_func=ASMLINK(dct36_3dnow);
+    dct64_MMX_func=ASMLINK(dct64_MMX_3dnow);
   }
   else
 #endif
 #ifdef HAVE_MMX
   if ( _i586 > 1)
   {
-    synth_func=synth_1to1_MMX;
-    dct64_MMX_func=dct64_MMX;
+    synth_func=ASMLINK(synth_1to1_MMX);
+    dct64_MMX_func=ASMLINK(dct64_MMX);
   }    
   else
 #endif
 #ifdef ARCH_X86
   if ( _i586 )
   {
-    synth_func=synth_1to1_pent;
+    synth_func=(synth_1to1_pent);
   }    
   else
 #endif

Index: tabinit_MMX.s
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/tabinit_MMX.s,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tabinit_MMX.s	7 Aug 2001 15:37:45 -0000	1.2
+++ tabinit_MMX.s	7 Aug 2001 17:47:20 -0000	1.3
@@ -50,8 +50,8 @@
 	.long 0x47800000			# 65536.0
 .text
 	.balign 32
-.globl make_decode_tables_MMX
-make_decode_tables_MMX:
+.globl _make_decode_tables_MMX
+_make_decode_tables_MMX:
 	pushl %edi
 	pushl %esi
 	pushl %ebx

More information about the MPlayer-cvslog mailing list