--- portab.h 2003/03/28 07:21:37 1.46.2.5 +++ portab.h 2004/05/31 21:36:23 1.52 @@ -3,27 +3,25 @@ * XVID MPEG-4 VIDEO CODEC * - Portable macros, types and inlined assembly - * - * Copyright(C) 2002 Michael Militzer - * 2002 Peter Ross - * 2002 Edouard Gomez + * Copyright(C) 2002 Michael Militzer + * 2002-2003 Peter Ross + * 2002-2003 Edouard Gomez * - * This file is part of XviD, a free MPEG-4 video encoder/decoder - * - * XviD is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software ; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation ; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of + * but WITHOUT ANY WARRANTY ; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * 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.46.2.5 2003/03/28 07:21:37 suxen_drol Exp $ + * $Id: portab.h,v 1.52 2004/05/31 21:36:23 edgomez Exp $ * ****************************************************************************/ @@ -34,35 +32,18 @@ * Common things ****************************************************************************/ -/* Debug level masks */ -#define DPRINTF_ERROR 0x00000001 -#define DPRINTF_STARTCODE 0x00000002 -#define DPRINTF_HEADER 0x00000004 -#define DPRINTF_TIMECODE 0x00000008 -#define DPRINTF_MB 0x00000010 -#define DPRINTF_COEFF 0x00000020 -#define DPRINTF_MV 0x00000040 -#define DPRINTF_RC 0x00000080 -#define DPRINTF_DEBUG 0x80000000 - -/* debug level for this library */ -#ifdef _DEBUG -#ifndef DPRINTF_LEVEL -#define DPRINTF_LEVEL 0x8000000f -#endif -#else -#define DPRINTF_LEVEL 0 -#endif - /* Buffer size for msvc implementation because it outputs to DebugOutput */ +#if defined(_DEBUG) +extern unsigned int xvid_debug; #define DPRINTF_BUF_SZ 1024 +#endif /***************************************************************************** * Types used in XviD sources ****************************************************************************/ /*---------------------------------------------------------------------------- - | For MSVC + | For MSVC *---------------------------------------------------------------------------*/ #if defined(_MSC_VER) || defined (__WATCOMC__) @@ -76,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 @@ -87,27 +68,27 @@ #endif /***************************************************************************** - * Some things that are only architecture dependant + * Some things that are only architecture dependant ****************************************************************************/ #if defined(ARCH_IS_32BIT) # define CACHE_LINE 64 # define ptr_t uint32_t # define intptr_t int32_t -# if _MSC_VER < 1300 -# define uintptr_t uint32_t -# else +# if defined(_MSC_VER) && _MSC_VER >= 1300 && !defined(__INTEL_COMPILER) # include -# endif +# else +# define uintptr_t uint32_t +# endif #elif defined(ARCH_IS_64BIT) # define CACHE_LINE 64 # define ptr_t uint64_t # define intptr_t int64_t -# if _MSC_VER < 1300 -# define uintptr_t uint64_t -# else +# if defined (_MSC_VER) && _MSC_VER >= 1300 && !defined(__INTEL_COMPILER) # include -# endif +# else +# define uintptr_t uint64_t +# endif #else # error You are trying to compile XviD without defining address bus size. #endif @@ -123,85 +104,86 @@ #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 (DPRINTF_LEVEL & level) { - va_list args; - char buf[DPRINTF_BUF_SZ]; - va_start(args, fmt); - vsprintf(buf, fmt, args); - OutputDebugString(buf); - fprintf(stderr, "%s\n", 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); + va_end(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. @@ -217,7 +199,7 @@ #elif defined(__GNUC__) || defined(__ICC) /* Compiler test */ /*---------------------------------------------------------------------------- - | Common gcc stuff + | Common gcc stuff *---------------------------------------------------------------------------*/ /* @@ -234,9 +216,8 @@ { va_list args; va_start(args, format); - if(DPRINTF_LEVEL & level) { + if(xvid_debug & level) { vfprintf(stderr, format, args); - fprintf(stderr, "\n"); } } @@ -268,6 +249,15 @@ | 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)); @@ -345,60 +335,61 @@ # include # ifdef _DEBUG - static __inline void DPRINTF(int level, char *fmt, ...) - { - if (DPRINTF_LEVEL & level) { - va_list args; - char buf[DPRINTF_BUF_SZ]; - va_start(args, fmt); - vsprintf(buf, fmt, args); - fprintf(stderr, "%s\n", 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); + va_end(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. @@ -410,45 +401,45 @@ ****************************************************************************/ #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(DPRINTF_LEVEL & level) { - vfprintf(stderr, format, args); - fprintf(stderr, "\n"); - } - } +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); +} # 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 */