# HG changeset patch # User alex # Date 1066856326 0 # Node ID 5403367c703201e898cce90744c7b349a7a28938 # Parent a71000eeeb9c28698f8bfda7d40faed0006872ae removed the stdcall convention diff -r a71000eeeb9c -r 5403367c7032 mp3lib/dct64_3dnow.c --- a/mp3lib/dct64_3dnow.c Wed Oct 22 20:39:58 2003 +0000 +++ b/mp3lib/dct64_3dnow.c Wed Oct 22 20:58:46 2003 +0000 @@ -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( diff -r a71000eeeb9c -r 5403367c7032 mp3lib/dct64_MMX.c --- a/mp3lib/dct64_MMX.c Wed Oct 22 20:39:58 2003 +0000 +++ b/mp3lib/dct64_MMX.c Wed Oct 22 20:58:46 2003 +0000 @@ -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( diff -r a71000eeeb9c -r 5403367c7032 mp3lib/dct64_k7.c --- a/mp3lib/dct64_k7.c Wed Oct 22 20:39:58 2003 +0000 +++ b/mp3lib/dct64_k7.c Wed Oct 22 20:58:46 2003 +0000 @@ -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( diff -r a71000eeeb9c -r 5403367c7032 mp3lib/decode_MMX.c --- a/mp3lib/decode_MMX.c Wed Oct 22 20:39:58 2003 +0000 +++ b/mp3lib/decode_MMX.c Wed Oct 22 20:58:46 2003 +0000 @@ -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"); } diff -r a71000eeeb9c -r 5403367c7032 mp3lib/sr1.c --- a/mp3lib/sr1.c Wed Oct 22 20:39:58 2003 +0000 +++ b/mp3lib/sr1.c Wed Oct 22 20:58:46 2003 +0000 @@ -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"