diff options
author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-10-22 20:58:46 +0000 |
---|---|---|
committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-10-22 20:58:46 +0000 |
commit | cf069df98e3ae5a0ee6179ba7f6f734b323ed7f2 (patch) | |
tree | 0db619d1bbb8bd7b1a5e2e65ac24773bced18177 /mp3lib | |
parent | c5065685a83ee76dc4f8fdbebb738ca79260cc80 (diff) | |
download | mpv-cf069df98e3ae5a0ee6179ba7f6f734b323ed7f2.tar.bz2 mpv-cf069df98e3ae5a0ee6179ba7f6f734b323ed7f2.tar.xz |
removed the stdcall convention
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11241 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mp3lib')
-rw-r--r-- | mp3lib/dct64_3dnow.c | 2 | ||||
-rw-r--r-- | mp3lib/dct64_MMX.c | 2 | ||||
-rw-r--r-- | mp3lib/dct64_k7.c | 2 | ||||
-rw-r--r-- | mp3lib/decode_MMX.c | 5 | ||||
-rw-r--r-- | mp3lib/sr1.c | 10 |
5 files changed, 11 insertions, 10 deletions
diff --git a/mp3lib/dct64_3dnow.c b/mp3lib/dct64_3dnow.c index 104ad14868..47a089143a 100644 --- a/mp3lib/dct64_3dnow.c +++ b/mp3lib/dct64_3dnow.c @@ -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 --git a/mp3lib/dct64_MMX.c b/mp3lib/dct64_MMX.c index 29b44e6437..aafa8890e1 100644 --- a/mp3lib/dct64_MMX.c +++ b/mp3lib/dct64_MMX.c @@ -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 --git a/mp3lib/dct64_k7.c b/mp3lib/dct64_k7.c index 03538086d6..46e99b32d7 100644 --- a/mp3lib/dct64_k7.c +++ b/mp3lib/dct64_k7.c @@ -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 --git a/mp3lib/decode_MMX.c b/mp3lib/decode_MMX.c index 5ed21c5a2c..ec3181d9be 100644 --- a/mp3lib/decode_MMX.c +++ b/mp3lib/decode_MMX.c @@ -69,7 +69,6 @@ __asm __volatile( "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 @@ __asm __volatile( "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 @@ __asm __volatile( "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 --git a/mp3lib/sr1.c b/mp3lib/sr1.c index a596c4386c..025ef1faa1 100644 --- a/mp3lib/sr1.c +++ b/mp3lib/sr1.c @@ -383,11 +383,11 @@ int _has_mmx = 0; // used by layer2.c, layer3.c to pre-scale coeffs /******************************************************************************/ /* 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" |