--- portab.h 2004/05/31 21:26:23 1.49.2.2 +++ portab.h 2004/04/12 14:05:08 1.51 @@ -21,7 +21,7 @@ * along with this program ; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: portab.h,v 1.49.2.2 2004/05/31 21:26:23 edgomez Exp $ + * $Id: portab.h,v 1.51 2004/04/12 14:05:08 edgomez Exp $ * ****************************************************************************/ @@ -43,7 +43,7 @@ ****************************************************************************/ /*---------------------------------------------------------------------------- - | For MSVC + | For MSVC *---------------------------------------------------------------------------*/ #if defined(_MSC_VER) || defined (__WATCOMC__) @@ -57,8 +57,8 @@ # define uint64_t unsigned __int64 /*---------------------------------------------------------------------------- - | For all other compilers, use the standard header file - | (compiler should be ISO C99 compatible, perhaps ISO C89 is enough) + | For all other compilers, use the standard header file + | (compiler should be ISO C99 compatible, perhaps ISO C89 is enough) *---------------------------------------------------------------------------*/ #else @@ -104,86 +104,85 @@ #if defined(_MSC_VER) /*---------------------------------------------------------------------------- - | Common msvc stuff + | Common msvc stuff *---------------------------------------------------------------------------*/ # include # include -/* Non ANSI mapping */ + /* Non ANSI mapping */ # define snprintf _snprintf # define vsnprintf _vsnprintf -/* - * This function must be declared/defined all the time because MSVC does - * not support C99 variable arguments macros. - * - * Btw, if the MS compiler does its job well, it should remove the nop - * DPRINTF function when not compiling in _DEBUG mode - */ + /* + * This function must be declared/defined all the time because MSVC does + * not support C99 variable arguments macros. + * + * Btw, if the MS compiler does its job well, it should remove the nop + * DPRINTF function when not compiling in _DEBUG mode + */ # ifdef _DEBUG -static __inline void DPRINTF(int level, char *fmt, ...) -{ - if (xvid_debug & level) { - va_list args; - char buf[DPRINTF_BUF_SZ]; - va_start(args, fmt); - vsprintf(buf, fmt, args); - va_end(args); - OutputDebugString(buf); - fprintf(stderr, "%s", buf); - } -} + static __inline void DPRINTF(int level, char *fmt, ...) + { + if (xvid_debug & level) { + va_list args; + char buf[DPRINTF_BUF_SZ]; + va_start(args, fmt); + vsprintf(buf, fmt, args); + OutputDebugString(buf); + fprintf(stderr, "%s", buf); + } + } # else -static __inline void DPRINTF(int level, char *fmt, ...) {} + static __inline void DPRINTF(int level, char *fmt, ...) {} # endif # if _MSC_VER <= 1200 # define DECLARE_ALIGNED_MATRIX(name,sizex,sizey,type,alignment) \ - type name##_storage[(sizex)*(sizey)+(alignment)-1]; \ -type * name = (type *) (((int32_t) name##_storage+(alignment - 1)) & ~((int32_t)(alignment)-1)) + type name##_storage[(sizex)*(sizey)+(alignment)-1]; \ + type * name = (type *) (((int32_t) name##_storage+(alignment - 1)) & ~((int32_t)(alignment)-1)) # else # define DECLARE_ALIGNED_MATRIX(name,sizex,sizey,type,alignment) \ - __declspec(align(alignment)) type name[(sizex)*(sizey)] + __declspec(align(alignment)) type name[(sizex)*(sizey)] # endif /*---------------------------------------------------------------------------- - | msvc x86 specific macros/functions + | msvc x86 specific macros/functions *---------------------------------------------------------------------------*/ # if defined(ARCH_IS_IA32) # define BSWAP(a) __asm mov eax,a __asm bswap eax __asm mov a, eax -static __inline int64_t read_counter(void) -{ - int64_t ts; - uint32_t ts1, ts2; - __asm { - rdtsc - mov ts1, eax - mov ts2, edx - } - ts = ((uint64_t) ts2 << 32) | ((uint64_t) ts1); - return ts; -} + static __inline int64_t read_counter(void) + { + int64_t ts; + uint32_t ts1, ts2; + __asm { + rdtsc + mov ts1, eax + mov ts2, edx + } + ts = ((uint64_t) ts2 << 32) | ((uint64_t) ts1); + return ts; + } /*---------------------------------------------------------------------------- - | msvc GENERIC (plain C only) - Probably alpha or some embedded device + | msvc GENERIC (plain C only) - Probably alpha or some embedded device *---------------------------------------------------------------------------*/ # elif defined(ARCH_IS_GENERIC) # define BSWAP(a) \ - ((a) = (((a) & 0xff) << 24) | (((a) & 0xff00) << 8) | \ - (((a) >> 8) & 0xff00) | (((a) >> 24) & 0xff)) + ((a) = (((a) & 0xff) << 24) | (((a) & 0xff00) << 8) | \ + (((a) >> 8) & 0xff00) | (((a) >> 24) & 0xff)) # include -static __inline int64_t read_counter(void) -{ - return (int64_t)clock(); -} + static __inline int64_t read_counter(void) + { + return (int64_t)clock(); + } /*---------------------------------------------------------------------------- - | msvc Not given architecture - This is probably an user who tries to build - | XviD the wrong way. + | msvc Not given architecture - This is probably an user who tries to build + | XviD the wrong way. *---------------------------------------------------------------------------*/ # else # error You are trying to compile XviD without defining the architecture type. @@ -199,7 +198,7 @@ #elif defined(__GNUC__) || defined(__ICC) /* Compiler test */ /*---------------------------------------------------------------------------- - | Common gcc stuff + | Common gcc stuff *---------------------------------------------------------------------------*/ /* @@ -208,107 +207,115 @@ */ # ifdef _DEBUG -/* Needed for all debuf fprintf calls */ + /* Needed for all debuf fprintf calls */ # include # include -static __inline void DPRINTF(int level, char *format, ...) -{ - va_list args; - va_start(args, format); - if(xvid_debug & level) { - vfprintf(stderr, format, args); - } - va_end(args); -} + static __inline void DPRINTF(int level, char *format, ...) + { + va_list args; + va_start(args, format); + if(xvid_debug & level) { + vfprintf(stderr, format, args); + } + } # else /* _DEBUG */ -static __inline void DPRINTF(int level, char *format, ...) {} + static __inline void DPRINTF(int level, char *format, ...) {} # endif /* _DEBUG */ # define DECLARE_ALIGNED_MATRIX(name,sizex,sizey,type,alignment) \ - type name##_storage[(sizex)*(sizey)+(alignment)-1]; \ -type * name = (type *) (((ptr_t) name##_storage+(alignment - 1)) & ~((ptr_t)(alignment)-1)) + type name##_storage[(sizex)*(sizey)+(alignment)-1]; \ + type * name = (type *) (((ptr_t) name##_storage+(alignment - 1)) & ~((ptr_t)(alignment)-1)) /*---------------------------------------------------------------------------- - | gcc IA32 specific macros/functions + | gcc IA32 specific macros/functions *---------------------------------------------------------------------------*/ # if defined(ARCH_IS_IA32) # define BSWAP(a) __asm__ ( "bswapl %0\n" : "=r" (a) : "0" (a) ); -static __inline int64_t read_counter(void) -{ - int64_t ts; - uint32_t ts1, ts2; - __asm__ __volatile__("rdtsc\n\t":"=a"(ts1), "=d"(ts2)); - ts = ((uint64_t) ts2 << 32) | ((uint64_t) ts1); - return ts; -} + static __inline int64_t read_counter(void) + { + int64_t ts; + uint32_t ts1, ts2; + __asm__ __volatile__("rdtsc\n\t":"=a"(ts1), "=d"(ts2)); + ts = ((uint64_t) ts2 << 32) | ((uint64_t) ts1); + return ts; + } /*---------------------------------------------------------------------------- - | gcc PPC and PPC Altivec specific macros/functions + | gcc PPC and PPC Altivec specific macros/functions *---------------------------------------------------------------------------*/ # elif defined(ARCH_IS_PPC) + +# if defined(HAVE_ALTIVEC_PARENTHESES_DECL) +# define AVV(x...) (x) +# elif defined(HAVE_ALTIVEC_BRACES_DECL) +# define AVV(x...) {x} +# else +# error Trying to compile PPC target without a vector declaration type. +# endif + # define BSWAP(a) __asm__ __volatile__ \ - ( "lwbrx %0,0,%1; eieio" : "=r" (a) : "r" (&(a)), "m" (a)); + ( "lwbrx %0,0,%1; eieio" : "=r" (a) : "r" (&(a)), "m" (a)); -static __inline unsigned long get_tbl(void) -{ - unsigned long tbl; - asm volatile ("mftb %0":"=r" (tbl)); - return tbl; -} - -static __inline unsigned long get_tbu(void) -{ - unsigned long tbl; - asm volatile ("mftbu %0":"=r" (tbl)); - return tbl; -} - -static __inline int64_t read_counter(void) -{ - unsigned long tb, tu; - do { - tu = get_tbu(); - tb = get_tbl(); - }while (tb != get_tbl()); - return (((int64_t) tu) << 32) | (int64_t) tb; -} + static __inline unsigned long get_tbl(void) + { + unsigned long tbl; + asm volatile ("mftb %0":"=r" (tbl)); + return tbl; + } + + static __inline unsigned long get_tbu(void) + { + unsigned long tbl; + asm volatile ("mftbu %0":"=r" (tbl)); + return tbl; + } + + static __inline int64_t read_counter(void) + { + unsigned long tb, tu; + do { + tu = get_tbu(); + tb = get_tbl(); + }while (tb != get_tbl()); + return (((int64_t) tu) << 32) | (int64_t) tb; + } /*---------------------------------------------------------------------------- - | gcc IA64 specific macros/functions + | gcc IA64 specific macros/functions *---------------------------------------------------------------------------*/ # elif defined(ARCH_IS_IA64) # define BSWAP(a) __asm__ __volatile__ \ - ("mux1 %1 = %0, @rev" ";;" \ - "shr.u %1 = %1, 32" : "=r" (a) : "r" (a)); + ("mux1 %1 = %0, @rev" ";;" \ + "shr.u %1 = %1, 32" : "=r" (a) : "r" (a)); -static __inline int64_t read_counter(void) -{ - unsigned long result; - __asm__ __volatile__("mov %0=ar.itc" : "=r"(result) :: "memory"); - return result; -} + static __inline int64_t read_counter(void) + { + unsigned long result; + __asm__ __volatile__("mov %0=ar.itc" : "=r"(result) :: "memory"); + return result; + } /*---------------------------------------------------------------------------- - | gcc GENERIC (plain C only) specific macros/functions + | gcc GENERIC (plain C only) specific macros/functions *---------------------------------------------------------------------------*/ # elif defined(ARCH_IS_GENERIC) # define BSWAP(a) \ - ((a) = (((a) & 0xff) << 24) | (((a) & 0xff00) << 8) | \ - (((a) >> 8) & 0xff00) | (((a) >> 24) & 0xff)) + ((a) = (((a) & 0xff) << 24) | (((a) & 0xff00) << 8) | \ + (((a) >> 8) & 0xff00) | (((a) >> 24) & 0xff)) # include -static __inline int64_t read_counter(void) -{ - return (int64_t)clock(); -} + static __inline int64_t read_counter(void) + { + return (int64_t)clock(); + } /*---------------------------------------------------------------------------- - | gcc Not given architecture - This is probably an user who tries to build - | XviD the wrong way. + | gcc Not given architecture - This is probably an user who tries to build + | XviD the wrong way. *---------------------------------------------------------------------------*/ # else # error You are trying to compile XviD without defining the architecture type. @@ -327,61 +334,60 @@ # include # ifdef _DEBUG -static __inline void DPRINTF(int level, char *fmt, ...) -{ - if (xvid_debug & level) { - va_list args; - char buf[DPRINTF_BUF_SZ]; - va_start(args, fmt); - vsprintf(buf, fmt, args); - va_end(args); - fprintf(stderr, "%s", buf); - } -} + static __inline void DPRINTF(int level, char *fmt, ...) + { + if (xvid_debug & level) { + va_list args; + char buf[DPRINTF_BUF_SZ]; + va_start(args, fmt); + vsprintf(buf, fmt, args); + fprintf(stderr, "%s", buf); + } + } # else /* _DEBUG */ -static __inline void DPRINTF(int level, char *format, ...) {} + static __inline void DPRINTF(int level, char *format, ...) {} # endif /* _DEBUG */ # define DECLARE_ALIGNED_MATRIX(name,sizex,sizey,type,alignment) \ - type name##_storage[(sizex)*(sizey)+(alignment)-1]; \ -type * name = (type *) (((int32_t) name##_storage+(alignment - 1)) & ~((int32_t)(alignment)-1)) + type name##_storage[(sizex)*(sizey)+(alignment)-1]; \ + type * name = (type *) (((int32_t) name##_storage+(alignment - 1)) & ~((int32_t)(alignment)-1)) /*---------------------------------------------------------------------------- - | watcom ia32 specific macros/functions + | watcom ia32 specific macros/functions *---------------------------------------------------------------------------*/ # if defined(ARCH_IS_IA32) # define BSWAP(a) __asm mov eax,a __asm bswap eax __asm mov a, eax -static __inline int64_t read_counter(void) -{ - uint64_t ts; - uint32_t ts1, ts2; - __asm { - rdtsc - mov ts1, eax - mov ts2, edx - } - ts = ((uint64_t) ts2 << 32) | ((uint64_t) ts1); - return ts; -} + static __inline int64_t read_counter(void) + { + uint64_t ts; + uint32_t ts1, ts2; + __asm { + rdtsc + mov ts1, eax + mov ts2, edx + } + ts = ((uint64_t) ts2 << 32) | ((uint64_t) ts1); + return ts; + } /*---------------------------------------------------------------------------- - | watcom GENERIC (plain C only) specific macros/functions. + | watcom GENERIC (plain C only) specific macros/functions. *---------------------------------------------------------------------------*/ # elif defined(ARCH_IS_GENERIC) # define BSWAP(x) \ - x = ((((x) & 0xff000000) >> 24) | \ - (((x) & 0x00ff0000) >> 8) | \ - (((x) & 0x0000ff00) << 8) | \ - (((x) & 0x000000ff) << 24)) + x = ((((x) & 0xff000000) >> 24) | \ + (((x) & 0x00ff0000) >> 8) | \ + (((x) & 0x0000ff00) << 8) | \ + (((x) & 0x000000ff) << 24)) -static int64_t read_counter() { return 0; } + static int64_t read_counter() { return 0; } /*---------------------------------------------------------------------------- - | watcom Not given architecture - This is probably an user who tries to build - | XviD the wrong way. + | watcom Not given architecture - This is probably an user who tries to build + | XviD the wrong way. *---------------------------------------------------------------------------*/ # else # error You are trying to compile XviD without defining the architecture type. @@ -393,45 +399,44 @@ ****************************************************************************/ #else /* Compiler test */ -/* - * Ok we know nothing about the compiler, so we fallback to ANSI C - * features, so every compiler should be happy and compile the code. - * - * This is (mostly) equivalent to ARCH_IS_GENERIC. - */ + /* + * Ok we know nothing about the compiler, so we fallback to ANSI C + * features, so every compiler should be happy and compile the code. + * + * This is (mostly) equivalent to ARCH_IS_GENERIC. + */ # ifdef _DEBUG -/* Needed for all debuf fprintf calls */ + /* Needed for all debuf fprintf calls */ # include # include -static __inline void DPRINTF(int level, char *format, ...) -{ - va_list args; - va_start(args, format); - if(xvid_debug & level) { - vfprintf(stderr, format, args); - } - va_end(args); -} + static __inline void DPRINTF(int level, char *format, ...) + { + va_list args; + va_start(args, format); + if(xvid_debug & level) { + vfprintf(stderr, format, args); + } + } # else /* _DEBUG */ -static __inline void DPRINTF(int level, char *format, ...) {} + static __inline void DPRINTF(int level, char *format, ...) {} # endif /* _DEBUG */ # define BSWAP(a) \ - ((a) = (((a) & 0xff) << 24) | (((a) & 0xff00) << 8) | \ - (((a) >> 8) & 0xff00) | (((a) >> 24) & 0xff)) + ((a) = (((a) & 0xff) << 24) | (((a) & 0xff00) << 8) | \ + (((a) >> 8) & 0xff00) | (((a) >> 24) & 0xff)) # include -static __inline int64_t read_counter(void) -{ - return (int64_t)clock(); -} + static __inline int64_t read_counter(void) + { + return (int64_t)clock(); + } # define DECLARE_ALIGNED_MATRIX(name,sizex,sizey,type,alignment) \ - type name[(sizex)*(sizey)] + type name[(sizex)*(sizey)] #endif /* Compiler test */