X-Git-Url: https://git.libav.org/?p=libav.git;a=blobdiff_plain;f=libavcodec%2Fppc%2Fgcc_fixes.h;h=9814c3cb15548e64992183462ed07f65fe61d120;hp=8fac4ab7ca11528d52766dfd1e9d53095185d845;hb=8008a04325236d6b6e0b3ae1c9c2a28c68668696;hpb=3efd4952dfcc0e452d28910758876884925c6175 diff --git a/libavcodec/ppc/gcc_fixes.h b/libavcodec/ppc/gcc_fixes.h index 8fac4ab7ca..9814c3cb15 100644 --- a/libavcodec/ppc/gcc_fixes.h +++ b/libavcodec/ppc/gcc_fixes.h @@ -1,21 +1,46 @@ /* * gcc fixes for altivec. - * Used to workaround broken gcc (FSF gcc-3 pre gcc-3.3) + * Used to workaround broken gcc (FSF gcc-3 pre gcc-3.3) * and to stay somewhat compatible with Darwin. + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _GCC_FIXES_ -#define _GCC_FIXES_ +#ifndef GCC_FIXES_H +#define GCC_FIXES_H #ifdef HAVE_ALTIVEC_H #include #endif -#ifdef CONFIG_DARWIN -#define AVV(x...) (x) +#ifdef SYS_DARWIN +# ifdef __MWERKS__ +# define AVV +# endif +#define REG_v(a) asm ( #a ) #else -#define AVV(x...) {x} -#if (__GNUC__ * 100 + __GNUC_MINOR__ < 303) + +#if (__GNUC__ < 4) +# define REG_v(a) +#else +# define REG_v(a) asm ( #a ) +#endif + +#if (__GNUC__ * 100 + __GNUC_MINOR__ < 303) /* This code was provided to me by Bartosch Pixa * as a separate header file (broken_mergel.h). @@ -25,60 +50,66 @@ * http://gcc.gnu.org/ml/gcc/2003-04/msg00967.html */ -static inline vector signed char my_vmrglb (vector signed char const A, - vector signed char const B) +static inline vector signed char ff_vmrglb (vector signed char const A, + vector signed char const B) { static const vector unsigned char lowbyte = { - 0x08, 0x18, 0x09, 0x19, 0x0a, 0x1a, 0x0b, 0x1b, - 0x0c, 0x1c, 0x0d, 0x1d, 0x0e, 0x1e, 0x0f, 0x1f + 0x08, 0x18, 0x09, 0x19, 0x0a, 0x1a, 0x0b, 0x1b, + 0x0c, 0x1c, 0x0d, 0x1d, 0x0e, 0x1e, 0x0f, 0x1f }; return vec_perm (A, B, lowbyte); } -static inline vector signed short my_vmrglh (vector signed short const A, - vector signed short const B) +static inline vector signed short ff_vmrglh (vector signed short const A, + vector signed short const B) { static const vector unsigned char lowhalf = { - 0x08, 0x09, 0x18, 0x19, 0x0a, 0x0b, 0x1a, 0x1b, - 0x0c, 0x0d, 0x1c, 0x1d, 0x0e, 0x0f, 0x1e, 0x1f + 0x08, 0x09, 0x18, 0x19, 0x0a, 0x0b, 0x1a, 0x1b, + 0x0c, 0x0d, 0x1c, 0x1d, 0x0e, 0x0f, 0x1e, 0x1f }; return vec_perm (A, B, lowhalf); } -static inline vector signed int my_vmrglw (vector signed int const A, - vector signed int const B) +static inline vector signed int ff_vmrglw (vector signed int const A, + vector signed int const B) { static const vector unsigned char lowword = { - 0x08, 0x09, 0x0a, 0x0b, 0x18, 0x19, 0x1a, 0x1b, - 0x0c, 0x0d, 0x0e, 0x0f, 0x1c, 0x1d, 0x1e, 0x1f + 0x08, 0x09, 0x0a, 0x0b, 0x18, 0x19, 0x1a, 0x1b, + 0x0c, 0x0d, 0x0e, 0x0f, 0x1c, 0x1d, 0x1e, 0x1f }; return vec_perm (A, B, lowword); } -/*#define my_vmrglb my_vmrglb -#define my_vmrglh my_vmrglh -#define my_vmrglw my_vmrglw +/*#define ff_vmrglb ff_vmrglb +#define ff_vmrglh ff_vmrglh +#define ff_vmrglw ff_vmrglw */ #undef vec_mergel #define vec_mergel(a1, a2) \ __ch (__bin_args_eq (vector signed char, (a1), vector signed char, (a2)), \ - ((vector signed char) my_vmrglb ((vector signed char) (a1), (vector signed char) (a2))), \ + ((vector signed char) ff_vmrglb ((vector signed char) (a1), (vector signed char) (a2))), \ __ch (__bin_args_eq (vector unsigned char, (a1), vector unsigned char, (a2)), \ - ((vector unsigned char) my_vmrglb ((vector signed char) (a1), (vector signed char) (a2))), \ + ((vector unsigned char) ff_vmrglb ((vector signed char) (a1), (vector signed char) (a2))), \ __ch (__bin_args_eq (vector signed short, (a1), vector signed short, (a2)), \ - ((vector signed short) my_vmrglh ((vector signed short) (a1), (vector signed short) (a2))), \ + ((vector signed short) ff_vmrglh ((vector signed short) (a1), (vector signed short) (a2))), \ __ch (__bin_args_eq (vector unsigned short, (a1), vector unsigned short, (a2)), \ - ((vector unsigned short) my_vmrglh ((vector signed short) (a1), (vector signed short) (a2))), \ + ((vector unsigned short) ff_vmrglh ((vector signed short) (a1), (vector signed short) (a2))), \ __ch (__bin_args_eq (vector float, (a1), vector float, (a2)), \ - ((vector float) my_vmrglw ((vector signed int) (a1), (vector signed int) (a2))), \ + ((vector float) ff_vmrglw ((vector signed int) (a1), (vector signed int) (a2))), \ __ch (__bin_args_eq (vector signed int, (a1), vector signed int, (a2)), \ - ((vector signed int) my_vmrglw ((vector signed int) (a1), (vector signed int) (a2))), \ + ((vector signed int) ff_vmrglw ((vector signed int) (a1), (vector signed int) (a2))), \ __ch (__bin_args_eq (vector unsigned int, (a1), vector unsigned int, (a2)), \ - ((vector unsigned int) my_vmrglw ((vector signed int) (a1), (vector signed int) (a2))), \ + ((vector unsigned int) ff_vmrglw ((vector signed int) (a1), (vector signed int) (a2))), \ __altivec_link_error_invalid_argument ()))))))) #endif -#endif /* CONFIG_DARWIN */ +#endif /* SYS_DARWIN */ + +#ifndef __MWERKS__ +#define const_vector const vector +#else +#define const_vector vector +#endif -#endif /* _GCC_FIXES_ */ +#endif /* GCC_FIXES_H */