[Mplayer-cvslog] CVS: main/mp3lib dct64_3dnow.c,1.5,1.6 dct64_MMX.c,1.4,1.5 dct64_k7.c,1.7,1.8 decode_MMX.c,1.6,1.7 sr1.c,1.27,1.28

[Alex Beregszaszi]

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

Modified Files:
	dct64_3dnow.c dct64_MMX.c dct64_k7.c decode_MMX.c sr1.c 
Log Message:
removed the stdcall convention

Index: dct64_3dnow.c
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/dct64_3dnow.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dct64_3dnow.c	19 Nov 2002 23:35:51 -0000	1.5
+++ dct64_3dnow.c	22 Oct 2003 20:58:46 -0000	1.6
@@ -14,7 +14,7 @@
 static unsigned long long int __attribute__((aligned(8))) x_plus_minus_3dnow = 0x8000000000000000ULL;
 static float plus_1f = 1.0;
 
-void __attribute__ (( __stdcall__ )) dct64_MMX_3dnow(real *a,real *b,real *c)
+void dct64_MMX_3dnow(real *a,real *b,real *c)
 {
   char tmp[256];
     __asm __volatile(

Index: dct64_MMX.c
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/dct64_MMX.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dct64_MMX.c	15 Dec 2002 10:54:33 -0000	1.4
+++ dct64_MMX.c	22 Oct 2003 20:58:46 -0000	1.5
@@ -6,7 +6,7 @@
 #include "../mangle.h"
 #define real float /* ugly - but only way */
 
-void __attribute__ (( __stdcall__ )) dct64_MMX(real *a,real *b,real *c)
+void dct64_MMX(real *a,real *b,real *c)
 {
     char tmp[256];
     __asm __volatile(

Index: dct64_k7.c
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/dct64_k7.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dct64_k7.c	19 Jan 2003 21:50:50 -0000	1.7
+++ dct64_k7.c	22 Oct 2003 20:58:46 -0000	1.8
@@ -14,7 +14,7 @@
 static unsigned long long int __attribute__((aligned(8))) x_plus_minus_3dnow = 0x8000000000000000ULL;
 static float plus_1f = 1.0;
 
-void __attribute__ (( __stdcall__ )) dct64_MMX_3dnowex(real *a,real *b,real *c)
+void dct64_MMX_3dnowex(real *a,real *b,real *c)
 {
   char tmp[256];
     __asm __volatile(

Index: decode_MMX.c
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/decode_MMX.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- decode_MMX.c	24 Dec 2002 22:33:46 -0000	1.6
+++ decode_MMX.c	22 Oct 2003 20:58:46 -0000	1.7
@@ -69,7 +69,6 @@
         "leal (%%esi,%%eax,2),%%edx\n\t"
         "movl %%eax,%5\n\t"
         "incl %%eax\n\t"
-        "pushl %0\n\t"
         "andl %%ebx,%%eax\n\t"
         "leal 544(%%esi,%%eax,2),%%ecx\n\t"
 	"incl %%ebx\n\t"
@@ -80,9 +79,11 @@
         "leal 544(%%esi),%%esi\n\t"
 ".L02:\n\t"
 	"emms\n\t"
+        "pushl %0\n\t"
         "pushl %%edx\n\t"
         "pushl %%ecx\n\t"
         "call *"MANGLE(dct64_MMX_func)"\n\t"
+	"addl $12, %%esp\n\t"
 	"leal 1(%%ebx), %%ecx\n\t"
         "subl %5,%%ebx\n\t"
 	"pushl %%ecx\n\t"
@@ -241,5 +242,5 @@
 	"emms\n\t"
         :
 	:"m"(bandPtr),"m"(channel),"m"(samples),"m"(buffs),"m"(bo), "m"(temp)
-	:"memory","%edi","%esi","%ebx");
+	:"memory","%edi","%esi","%ebx","%esp");
 }

Index: sr1.c
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/sr1.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sr1.c	9 Aug 2003 19:15:40 -0000	1.27
+++ sr1.c	22 Oct 2003 20:58:46 -0000	1.28
@@ -383,11 +383,11 @@
 /******************************************************************************/
 
 /* It's hidden from gcc in assembler */
-extern void __attribute__((__stdcall__)) dct64_MMX(real *, real *, real *);
-extern void __attribute__((__stdcall__)) dct64_MMX_3dnow(real *, real *, real *);
-extern void __attribute__((__stdcall__)) dct64_MMX_3dnowex(real *, real *, real *);
-extern void __attribute__((__stdcall__)) dct64_MMX_sse(real *, real *, real *);
-void __attribute__((__stdcall__)) (*dct64_MMX_func)(real *, real *, real *);
+extern void dct64_MMX(real *, real *, real *);
+extern void dct64_MMX_3dnow(real *, real *, real *);
+extern void dct64_MMX_3dnowex(real *, real *, real *);
+extern void dct64_MMX_sse(real *, real *, real *);
+void (*dct64_MMX_func)(real *, real *, real *);
 
 #include "../cpudetect.h"