Mercurial > mplayer.hg
changeset 15483:52838f825747
set define for apple gcc altivec
| author | nplourde |
|---|---|
| date | Sun, 15 May 2005 20:11:34 +0000 |
| parents | c4af653727eb |
| children | 15b5b56d809f |
| files | configure libmpeg2/cpu_accel.c libmpeg2/cpu_state.c libmpeg2/idct_altivec.c |
| diffstat | 4 files changed, 15 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Sun May 15 15:38:57 2005 +0000 +++ b/configure Sun May 15 20:11:34 2005 +0000 @@ -1973,7 +1973,7 @@ } EOF FSF_flags='-maltivec -mabi=altivec' - Darwin_flags='-faltivec' + Darwin_flags='-faltivec -D__APPLE_ALTIVEC__' # check for Darwin-style flags first, since # gcc-3.3 (August Update from Apple) on MacOS 10.2.8 @@ -3225,9 +3225,6 @@ _aomodules="macosx $_aomodules" _vosrc="$_vosrc vo_quartz.c" _vomodules="quartz $_vomodules" - if test "$_cc_major" -ge "4" ; then - _def_altivec_h='#undef HAVE_ALTIVEC_H' - fi else _macosx=no _def_macosx='#undef MACOSX'
--- a/libmpeg2/cpu_accel.c Sun May 15 15:38:57 2005 +0000 +++ b/libmpeg2/cpu_accel.c Sun May 15 20:11:34 2005 +0000 @@ -143,10 +143,10 @@ canjump = 1; -#ifdef HAVE_ALTIVEC_H /* gnu */ +#if defined( __APPLE_CC__ ) && defined( __APPLE_ALTIVEC__ ) /* 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" -#else /* apple */ -#define VAND(a,b,c) "vand v" #a ",v" #b ",v" #c "\n\t" #endif asm volatile ("mtspr 256, %0\n\t" VAND (0, 0, 0)
--- a/libmpeg2/cpu_state.c Sun May 15 15:38:57 2005 +0000 +++ b/libmpeg2/cpu_state.c Sun May 15 20:11:34 2005 +0000 @@ -48,18 +48,18 @@ #endif #if defined( ARCH_PPC ) && defined( HAVE_ALTIVEC ) -#ifdef HAVE_ALTIVEC_H /* gnu */ +#if defined( __APPLE_CC__ ) && defined( __APPLE_ALTIVEC__ ) /* apple */ +#define LI(a,b) "li r" #a "," #b "\n\t" +#define STVX0(a,b,c) "stvx v" #a ",0,r" #c "\n\t" +#define STVX(a,b,c) "stvx v" #a ",r" #b ",r" #c "\n\t" +#define LVX0(a,b,c) "lvx v" #a ",0,r" #c "\n\t" +#define LVX(a,b,c) "lvx v" #a ",r" #b ",r" #c "\n\t" +#else /* gnu */ #define LI(a,b) "li " #a "," #b "\n\t" #define STVX0(a,b,c) "stvx " #a ",0," #c "\n\t" #define STVX(a,b,c) "stvx " #a "," #b "," #c "\n\t" #define LVX0(a,b,c) "lvx " #a ",0," #c "\n\t" #define LVX(a,b,c) "lvx " #a "," #b "," #c "\n\t" -#else /* apple */ -#define LI(a,b) "li r" #a "," #b "\n\t" -#define STVX0(a,b,c) "stvx v" #a ",0,r" #c "\n\t" -#define STVX(a,b,c) "stvx v" #a ",r" #b ",r" #c "\n\t" -#define LVX0(a,b,c) "lvx v" #a ",0,r" #c "\n\t" -#define LVX(a,b,c) "lvx v" #a ",r" #b ",r" #c "\n\t" #endif static void state_save_altivec (cpu_state_t * state)
--- a/libmpeg2/idct_altivec.c Sun May 15 15:38:57 2005 +0000 +++ b/libmpeg2/idct_altivec.c Sun May 15 20:11:34 2005 +0000 @@ -41,7 +41,7 @@ typedef vector signed int vector_s32_t; typedef vector unsigned int vector_u32_t; -#if defined(HAVE_ALTIVEC_H) && (__GNUC__ * 100 + __GNUC_MINOR__ < 303) +#if defined( HAVE_ALTIVEC_H ) && !defined( __APPLE_ALTIVEC__ ) && (__GNUC__ * 100 + __GNUC_MINOR__ < 303) /* work around gcc <3.3 vec_mergel bug */ static inline vector_s16_t my_vec_mergel (vector_s16_t const A, vector_s16_t const B) @@ -56,10 +56,10 @@ #define vec_mergel my_vec_mergel #endif -#ifdef HAVE_ALTIVEC_H /* gnu */ +#if defined( __APPLE_CC__ ) && defined( __APPLE_ALTIVEC__ ) /* 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 */ #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) =