--- portab.h 2002/10/19 11:41:11 1.33 +++ portab.h 2006/05/28 07:52:45 1.56 @@ -3,16 +3,9 @@ * XVID MPEG-4 VIDEO CODEC * - Portable macros, types and inlined assembly - * - * Copyright(C) 2002 Michael Militzer - * - * This program is an implementation of a part of one or more MPEG-4 - * Video tools as specified in ISO/IEC 14496-2 standard. Those intending - * to use this software module in hardware or software products are - * advised that its use may infringe existing patents or copyrights, and - * any such use would be at such party's own risk. The original - * developer of this software module and his/her company, and subsequent - * editors and their companies, will have no liability for use of this - * software or modifications or derivatives thereof. + * Copyright(C) 2002 Michael Militzer + * 2002-2003 Peter Ross + * 2002-2003 Edouard Gomez * * 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 @@ -28,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.33 2002/10/19 11:41:11 edgomez Exp $ + * $Id: portab.h,v 1.56 2006/05/28 07:52:45 suxen_drol Exp $ * ****************************************************************************/ @@ -39,40 +32,21 @@ * 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_DEBUG 0x80000000 - -/* debug level for this library */ -#define DPRINTF_LEVEL 0 - -/* Buffer size for non C99 compliant compilers (msvc) */ +/* 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 ****************************************************************************/ /*---------------------------------------------------------------------------- - | Standard Unix include file (sorry, we put all unix into "linux" case) + | For MSVC *---------------------------------------------------------------------------*/ -#if defined(LINUX) || defined(BEOS) || defined(FREEBSD) - -/* All (u)int(size)_t types are defined here */ -# include - -/*---------------------------------------------------------------------------- - | msvc (lacks such a header file) - *---------------------------------------------------------------------------*/ - -#elif defined(_MSC_VER) +#if defined(_MSC_VER) || defined (__WATCOMC__) # define int8_t char # define uint8_t unsigned char # define int16_t short @@ -83,40 +57,42 @@ # define uint64_t unsigned __int64 /*---------------------------------------------------------------------------- - | Fallback when using gcc + | For all other compilers, use the standard header file + | (compiler should be ISO C99 compatible, perhaps ISO C89 is enough) *---------------------------------------------------------------------------*/ -#elif defined(__GNUC__) - -# define int8_t char -# define uint8_t unsigned char -# define int16_t short -# define uint16_t unsigned short -# define int32_t int -# define uint32_t unsigned int -# define int64_t long long -# define uint64_t unsigned long long +#else -/*---------------------------------------------------------------------------- - | Ok, we don't know how to define these types... error - *---------------------------------------------------------------------------*/ +# include -#else -# error Do not know how to define (u)int(size)_t types #endif /***************************************************************************** * Some things that are only architecture dependant ****************************************************************************/ -#if defined(ARCH_X86) || defined(ARCH_PPC) || defined(ARCH_MIPS) || defined(ARCH_SPARC) -# define CACHE_LINE 16 +#if defined(ARCH_IS_32BIT) +# define CACHE_LINE 64 # define ptr_t uint32_t -#elif defined(ARCH_IA64) -# define CACHE_LINE 32 +# define intptr_t int32_t +# define _INTPTR_T_DEFINED +# if defined(_MSC_VER) && _MSC_VER >= 1300 && !defined(__INTEL_COMPILER) +# include +# 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 +# define _INTPTR_T_DEFINED +# if defined (_MSC_VER) && _MSC_VER >= 1300 && !defined(__INTEL_COMPILER) +# include +# else +# define uintptr_t uint64_t +# endif #else -# error Architecture not supported. +# error You are trying to compile XviD without defining address bus size. #endif /***************************************************************************** @@ -130,63 +106,89 @@ #if defined(_MSC_VER) /*---------------------------------------------------------------------------- - | Common msvc stuff + | Common msvc stuff *---------------------------------------------------------------------------*/ -#include -#include +# include +# include + +/* 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 - */ - 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); - } - } +/* + * 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); + } +} +# else +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_X86) +# if defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64) # define BSWAP(a) __asm mov eax,a __asm bswap eax __asm mov a, eax -# define EMMS() __asm {emms} - 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 unknown architecture + | 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)) + +# include +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. *---------------------------------------------------------------------------*/ # else -# error Architecture not supported. +# error You are trying to compile XviD without defining the architecture type. # endif @@ -196,10 +198,10 @@ * GNU CC compiler stuff ****************************************************************************/ -#elif defined(__GNUC__) /* Compiler test */ +#elif defined(__GNUC__) || defined(__ICC) /* Compiler test */ /*---------------------------------------------------------------------------- - | Common gcc stuff + | Common gcc stuff *---------------------------------------------------------------------------*/ /* @@ -208,131 +210,241 @@ */ # ifdef _DEBUG - /* Needed for all debuf fprintf calls */ +/* Needed for all debuf fprintf calls */ # include +# include -# define DPRINTF(level, format, ...) \ - do {\ - if(DPRINTF_LEVEL & level)\ - fprintf(stderr, format"\n", ##__VA_ARGS__);\ - }while(0); +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 */ -# define DPRINTF(level, 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 x86 specific macros/functions + | gcc IA32 specific macros/functions *---------------------------------------------------------------------------*/ -# if defined(ARCH_X86) +# if defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64) # define BSWAP(a) __asm__ ( "bswapl %0\n" : "=r" (a) : "0" (a) ); -# define EMMS() __asm__ ("emms\n\t"); - 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 + *---------------------------------------------------------------------------*/ +# 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 -/*---------------------------------------------------------------------------- - | gcc PPC and PPC Altivec specific macros/functions - *---------------------------------------------------------------------------*/ -# elif defined(ARCH_PPC) # define BSWAP(a) __asm__ __volatile__ \ - ( "lwbrx %0,0,%1; eieio" : "=r" (a) : "r" (&(a)), "m" (a)); -# define EMMS() + ( "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_IA64) +# elif defined(ARCH_IS_IA64) # define BSWAP(a) __asm__ __volatile__ \ - ("mux1 %1 = %0, @rev" ";;" \ - "shr.u %1 = %1, 32" : "=r" (a) : "r" (a)); -# define EMMS() + ("mux1 %0 = %1, @rev" ";;" \ + "shr.u %0 = %0, 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 SPARC specific macros/functions + | gcc GENERIC (plain C only) specific macros/functions *---------------------------------------------------------------------------*/ -# elif defined(ARCH_SPARC) +# elif defined(ARCH_IS_GENERIC) # define BSWAP(a) \ - ((a) = (((a) & 0xff) << 24) | (((a) & 0xff00) << 8) | \ - (((a) >> 8) & 0xff00) | (((a) >> 24) & 0xff)) -# define EMMS() + ((a) = (((a) & 0xff) << 24) | (((a) & 0xff00) << 8) | \ + (((a) >> 8) & 0xff00) | (((a) >> 24) & 0xff)) - static __inline int64_t read_counter(void) - { - return 0; - } +# include +static __inline int64_t read_counter(void) +{ + return (int64_t)clock(); +} /*---------------------------------------------------------------------------- - | gcc MIPS specific macros/functions + | gcc Not given architecture - This is probably an user who tries to build + | XviD the wrong way. *---------------------------------------------------------------------------*/ -# elif defined(ARCH_MIPS) -# define BSWAP(a) \ - ((a) = (((a) & 0xff) << 24) | (((a) & 0xff00) << 8) | \ - (((a) >> 8) & 0xff00) | (((a) >> 24) & 0xff)) -# define EMMS() +# else +# error You are trying to compile XviD without defining the architecture type. +# endif + + - static __inline int64_t read_counter(void) - { - return 0; - } + +/***************************************************************************** + * Open WATCOM C/C++ compiler + ****************************************************************************/ + +#elif defined(__WATCOMC__) + +# include +# 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); + } +} +# else /* _DEBUG */ +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)) + +/*---------------------------------------------------------------------------- + | 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; +} /*---------------------------------------------------------------------------- - | XviD + gcc unsupported Architecture + | 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)) + +static int64_t read_counter() { return 0; } + +/*---------------------------------------------------------------------------- + | watcom Not given architecture - This is probably an user who tries to build + | XviD the wrong way. *---------------------------------------------------------------------------*/ # else -# error Architecture not supported. -# endif /* Architecture checking */ +# error You are trying to compile XviD without defining the architecture type. +# endif + /***************************************************************************** * Unknown compiler ****************************************************************************/ #else /* Compiler test */ -# error Compiler not supported +/* + * 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 */ +# 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); +} + +# else /* _DEBUG */ +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)) + +# include +static __inline int64_t read_counter(void) +{ + return (int64_t)clock(); +} + +# define DECLARE_ALIGNED_MATRIX(name,sizex,sizey,type,alignment) \ + type name[(sizex)*(sizey)] #endif /* Compiler test */ -#endif +#endif /* PORTAB_H */