Mercurial > mplayer.hg
changeset 3925:74fa7c82a66c
applied "magic" Michael real fix ;)
(tested with gcc 2.95.4 and 3.0.3)
| author | pl |
|---|---|
| date | Tue, 01 Jan 2002 02:00:57 +0000 |
| parents | 9f18722fafe9 |
| children | a840a7476705 |
| files | loader/win32.c |
| diffstat | 1 files changed, 7 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/loader/win32.c Tue Jan 01 01:11:31 2002 +0000 +++ b/loader/win32.c Tue Jan 01 02:00:57 2002 +0000 @@ -3411,17 +3411,6 @@ // _ftol - operated on the float value which is already on the FPU stack -#ifdef MPLAYER -// Note: the asm version is buggy and causes mysterious sig11 with gcc-3.0 -// flavors so we'd better stick to the old one for the moment (C version -// is found in release 1.39 of this file in MPlayer CVS) - pl -int -exp_ftol (float f) -{ - return (int) (f + .5); -} -#else -#warning "exp_ftol may cause sig11" static void exp_ftol(void) { __asm__ __volatile__ @@ -3429,16 +3418,18 @@ "sub $12, %esp \n\t" "fstcw -2(%ebp) \n\t" "wait \n\t" - "mov -2(%ebp), %ax \n\t" - "or $0x0C, %ah \n\t" - "mov %ax, -4(%ebp) \n\t" + "movw -2(%ebp), %ax \n\t" + "orb $0x0C, %ah \n\t" + "movw %ax, -4(%ebp) \n\t" "fldcw -4(%ebp) \n\t" "fistpl -12(%ebp) \n\t" "fldcw -2(%ebp) \n\t" - "mov -12(%ebp), %eax \n\t" + "movl -12(%ebp), %eax \n\t" + //Note: gcc 3.03 does not do the following op if it + // knows that ebp=esp + "movl %ebp, %esp \n\t" ); } -#endif static double exppow(double x, double y) {