[Mplayer-cvslog] CVS: main/libmpeg2 cpu_accel.c,1.2,1.3 idct_alpha.c,1.2,1.3 idct.c,1.7,1.8

[Alex Beregszaszi]

Update of /cvsroot/mplayer/main/libmpeg2
In directory mail:/var/tmp.root/cvs-serv14218/libmpeg2

Modified Files:
	cpu_accel.c idct_alpha.c idct.c 
Log Message:
gcc2.95.x has no support for mvi instructions

Index: cpu_accel.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpeg2/cpu_accel.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cpu_accel.c	17 Jun 2003 22:54:45 -0000	1.2
+++ cpu_accel.c	27 Jul 2003 22:55:25 -0000	1.3
@@ -154,6 +154,7 @@
 #ifdef ARCH_ALPHA
 static inline uint32_t arch_accel (void)
 {
+#ifdef CAN_COMPILE_ALPHA_MVI
     uint64_t no_mvi;
 
     asm volatile ("amask %1, %0"
@@ -161,6 +162,9 @@
 		  : "rI" (256));	/* AMASK_MVI */
     return no_mvi ? MPEG2_ACCEL_ALPHA : (MPEG2_ACCEL_ALPHA |
 					 MPEG2_ACCEL_ALPHA_MVI);
+#else
+    return MPEG2_ACCEL_ALPHA;
+#endif
 }
 #endif /* ARCH_ALPHA */
 #endif

Index: idct_alpha.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpeg2/idct_alpha.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- idct_alpha.c	7 Jul 2003 17:12:45 -0000	1.2
+++ idct_alpha.c	27 Jul 2003 22:55:25 -0000	1.3
@@ -155,6 +155,7 @@
     block[8*7] = (a0 - b0) >> 17;
 }
 
+#ifdef CAN_COMPILE_ALPHA_MVI
 void mpeg2_idct_copy_mvi (int16_t * block, uint8_t * dest, const int stride)
 {
     uint64_t clampmask;
@@ -287,6 +288,7 @@
 	stq (p7, dest + 7 * stride);
     }
 }
+#endif
 
 void mpeg2_idct_copy_alpha (int16_t * block, uint8_t * dest, const int stride)
 {

Index: idct.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpeg2/idct.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- idct.c	7 Jul 2003 17:12:45 -0000	1.7
+++ idct.c	27 Jul 2003 22:55:25 -0000	1.8
@@ -250,11 +250,14 @@
 #endif
 #endif
 #ifdef ARCH_ALPHA
+#ifdef CAN_COMPILE_ALPHA_MVI
     if (accel & MPEG2_ACCEL_ALPHA_MVI) {
 	mpeg2_idct_copy = mpeg2_idct_copy_mvi;
 	mpeg2_idct_add = mpeg2_idct_add_mvi;
 	mpeg2_idct_alpha_init (0);
-    } else if (accel & MPEG2_ACCEL_ALPHA) {
+    } else
+#endif
+    if (accel & MPEG2_ACCEL_ALPHA) {
 	mpeg2_idct_copy = mpeg2_idct_copy_alpha;
 	mpeg2_idct_add = mpeg2_idct_add_alpha;
 	mpeg2_idct_alpha_init (1);