[Mplayer-cvslog] CVS: main/mp3lib d_cpu.s,1.5,1.6 sr1.c,1.8,1.9

[Nick Kurshev]

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

Modified Files:
	d_cpu.s sr1.c 
Log Message:
Minor fixes

Index: d_cpu.s
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/d_cpu.s,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- d_cpu.s	29 Jun 2001 17:53:53 -0000	1.5
+++ d_cpu.s	2 Jul 2001 08:07:41 -0000	1.6
@@ -48,7 +48,7 @@
 /  in C: unsigled long ipentium( void );
 /  return: 0 if this processor i386 or i486
 /          1 otherwise
-/          2 if this cpu supports mmx
+/          3 if this cpu supports mmx
 / ---------------------------------------------------------------------------
 ipentium:
         pushl  %ebx
@@ -74,7 +74,7 @@
         incl   %eax
 	test   $0x00800000, %edx
 	jz     exit
-	incl   %eax
+	orl    $2, %eax
         jmp    exit
 no_cpuid:
         xorl   %eax,%eax
@@ -88,7 +88,7 @@
 /  in C: unsigned long a3dnow( void );
 /  return: 0 if this processor does not support 3dnow!
 /          1 otherwise
-/          2 if this cpu supports 3dnow-dsp extension
+/          3 if this cpu supports 3dnow-dsp extension
 / ---------------------------------------------------------------------------
 a3dnow:
         pushl  %ebx
@@ -114,7 +114,7 @@
         testl  $0x40000000,%edx
         jz     exit2
 /// eax=2 - K7 3DNowEx!	
-        inc    %eax
+        orl    $2, %eax
 exit2:
 
         popl   %ecx
@@ -126,7 +126,7 @@
 /  in C: unsigned long isse( void );
 /  return: 0 if this processor does not support sse
 /          1 otherwise
-/          2 if this cpu supports sse2 extension
+/          3 if this cpu supports sse2 extension
 / ---------------------------------------------------------------------------
 isse:
         pushl  %ebx
@@ -145,7 +145,7 @@
 	incl   %eax
         testl  $0x04000000,%edx
         jz     exit3
-        incl   %eax
+        orl    $2, %eax
 exit3:
         popl   %ecx
         popl   %edx

Index: sr1.c
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/sr1.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sr1.c	29 Jun 2001 17:53:53 -0000	1.8
+++ sr1.c	2 Jul 2001 08:07:41 -0000	1.9
@@ -355,6 +355,7 @@
 #else
 void MP3_Init(){
 #endif
+#ifdef ARCH_X86
     _CpuID=CpuDetect();
     _i586=ipentium();
 #ifndef HAVE_MMX
@@ -384,11 +385,15 @@
        Note: It's ok, Since K8 will have SSE2 support and will much faster
        of P4 ;) 
      */
-      printf( "mp3lib: Using SSE%s! optimized decore.\n",(_isse>1?"2":""));
+//      printf( "mp3lib: Using SSE%s! optimized decore.\n",(_isse>1?"2":""));
+      printf( "mp3lib: Using Pentium%s optimized decore.\n",(_i586>1?"-MMX":""));
     else
     if(_3dnow)
       printf( "mp3lib: Using AMD 3dnow%s! optimized decore.\n",(_3dnow>1?"-dsp(k7)":""));
-
+#else
+      _CpuID = _i586 = _3dnow = _isse = _has_mmx = 0;
+      printf( "mp3lib: Using generic decore.\n");
+#endif
 /* Use it for any MMX cpu */
    if(_has_mmx)	make_decode_tables_MMX(outscale);
    else		make_decode_tables(outscale);


_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog