[MPlayer-cvslog] r26928 - in trunk/libmpeg2: idct_altivec.c libmpeg-0.4.1.diff

[diego]

Author: diego
Date: Fri May 30 14:09:06 2008
New Revision: 26928

Log:
Check for ALTIVEC_H instead of __APPLE_CC__ to decide which AltiVec vector
declaration syntax to use. Checking for HAVE_ALTIVEC_VECTOR_BRACES would be
better, but this variant is more likely to be mergeable upstream.


Modified:
   trunk/libmpeg2/idct_altivec.c
   trunk/libmpeg2/libmpeg-0.4.1.diff

Modified: trunk/libmpeg2/idct_altivec.c
==============================================================================
--- trunk/libmpeg2/idct_altivec.c	(original)
+++ trunk/libmpeg2/idct_altivec.c	Fri May 30 14:09:06 2008
@@ -56,10 +56,10 @@ static inline vector_s16_t my_vec_mergel
 #define vec_mergel my_vec_mergel
 #endif
 
-#if defined(__APPLE_CC__)	/* apple */
-#define VEC_S16(a,b,c,d,e,f,g,h) (vector_s16_t) (a, b, c, d, e, f, g, h)
-#else			/* gnu */
+#ifdef HAVE_ALTIVEC_H	/* gnu */
 #define VEC_S16(a,b,c,d,e,f,g,h) {a, b, c, d, e, f, g, h}
+#else			/* apple */
+#define VEC_S16(a,b,c,d,e,f,g,h) (vector_s16_t) (a, b, c, d, e, f, g, h)
 #endif
 
 static const vector_s16_t constants ATTR_ALIGN(16) =

Modified: trunk/libmpeg2/libmpeg-0.4.1.diff
==============================================================================
--- trunk/libmpeg2/libmpeg-0.4.1.diff	(original)
+++ trunk/libmpeg2/libmpeg-0.4.1.diff	Fri May 30 14:09:06 2008
@@ -50,20 +50,6 @@
 +#endif /* ARCH_X86 || ARCH_X86_64 */
  
  #if defined(ARCH_PPC) || defined(ARCH_SPARC)
-@@ -166,10 +168,10 @@
- 
-     canjump = 1;
- 
--#ifdef HAVE_ALTIVEC_H	/* gnu */
--#define VAND(a,b,c) "vand " #a "," #b "," #c "\n\t"
--#else			/* apple */
-+#if defined(__APPLE_CC__)	/* apple */
- #define VAND(a,b,c) "vand v" #a ",v" #b ",v" #c "\n\t"
-+#else			/* gnu */
-+#define VAND(a,b,c) "vand " #a "," #b "," #c "\n\t"
- #endif
-     asm volatile ("mtspr 256, %0\n\t"
- 		  VAND (0, 0, 0)
 @@ -212,7 +241,7 @@
  
      accel = 0;