[Mplayer-cvslog] CVS: main/mp3lib Makefile,1.25,1.26 decode_MMX.c,1.2,1.3

[Nick Kurshev]

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

Modified Files:
	Makefile decode_MMX.c 
Log Message:
Fixing compilation on non-MMX but x86 systems

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/Makefile,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- Makefile	19 Jan 2002 21:21:00 -0000	1.25
+++ Makefile	23 Jan 2002 17:27:07 -0000	1.26
@@ -11,23 +11,16 @@
 ifeq ($(TARGET_ARCH_X86),yes)
 SRCS += decode_i586.c
 OBJS += decode_i586.o
-#ifeq ($(TARGET_MMX),yes)
-CFLAGS += -fomit-frame-pointer
 SRCS += decode_MMX.c dct64_MMX.c tabinit_MMX.c
 OBJS += decode_MMX.o dct64_MMX.o tabinit_MMX.o
-#endif
 #ifeq ($(TARGET_SSE),yes)
 #SRCS += dct64_sse.s
 #OBJS += dct64_sse.o
 #endif
-#ifeq ($(TARGET_3DNOW),yes)
 SRCS += dct36_3dnow.s dct64_3dnow.c
 OBJS += dct36_3dnow.o dct64_3dnow.o
-#endif
-#ifeq ($(TARGET_3DNOWEX),yes)
 SRCS += dct36_k7.c dct64_k7.c
 OBJS += dct36_k7.o dct64_k7.o
-#endif
 endif
 
 .SUFFIXES: .c .o

Index: decode_MMX.c
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/decode_MMX.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- decode_MMX.c	19 Jan 2002 04:47:32 -0000	1.2
+++ decode_MMX.c	23 Jan 2002 17:27:07 -0000	1.3
@@ -47,10 +47,10 @@
 	1060439283,
 };
 
+static int temp;
 void synth_1to1_MMX_s(real *bandPtr, int channel, short *samples,
                       short *buffs, int *bo)
 {
-
 __asm __volatile(
         "movl %1,%%ecx\n\t"
         "movl %2,%%edi\n\t"
@@ -67,7 +67,7 @@
         "movl %%eax,(%%edx)\n\t"
 ".L1:\n\t"
         "leal (%%esi,%%eax,2),%%edx\n\t"
-        "movl %%eax,%%ebp\n\t"
+        "movl %%eax,%5\n\t"
         "incl %%eax\n\t"
         "pushl %0\n\t"
         "andl %%ebx,%%eax\n\t"
@@ -76,7 +76,7 @@
 	"testl $1, %%eax\n\t"
 	"jnz .L2\n\t"
         "xchgl %%edx,%%ecx\n\t"
-	"incl %%ebp\n\t"
+	"incl %5\n\t"
         "leal 544(%%esi),%%esi\n\t"
 ".L2:\n\t"
 	"emms\n\t"
@@ -84,7 +84,7 @@
         "pushl %%ecx\n\t"
         "call *"MANGLE(dct64_MMX_func)"\n\t"
 	"leal 1(%%ebx), %%ecx\n\t"
-        "subl %%ebp,%%ebx\n\t"
+        "subl %5,%%ebx\n\t"
 	"pushl %%ecx\n\t"
 	"leal "MANGLE(decwins)"(%%ebx,%%ebx,1), %%edx\n\t"
 	"shrl $1, %%ecx\n\t"
@@ -240,6 +240,6 @@
 	"movw %%ax,(%%edi)\n\t"
 	"emms\n\t"
         :
-	:"m"(bandPtr),"m"(channel),"m"(samples),"m"(buffs),"m"(bo)
-	:"memory","%ebp","%edi","%esi","%ebx");
+	:"m"(bandPtr),"m"(channel),"m"(samples),"m"(buffs),"m"(bo), "m"(temp)
+	:"memory","%edi","%esi","%ebx");
 }