--- portab.h 2003/01/04 06:14:32 1.26.2.4 +++ portab.h 2003/05/17 13:26:51 1.46.2.6 @@ -5,7 +5,7 @@ * * Copyright(C) 2002 Michael Militzer * 2002 Peter Ross - * 2002 Edouard Gomez + * 2002 Edouard Gomez * * This file is part of XviD, a free MPEG-4 video encoder/decoder * @@ -23,36 +23,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * Under section 8 of the GNU General Public License, the copyright - * holders of XVID explicitly forbid distribution in the following - * countries: - * - * - Japan - * - United States of America - * - * Linking XviD statically or dynamically with other modules is making a - * combined work based on XviD. Thus, the terms and conditions of the - * GNU General Public License cover the whole combination. - * - * As a special exception, the copyright holders of XviD give you - * permission to link XviD with independent modules that communicate with - * XviD solely through the VFW1.1 and DShow interfaces, regardless of the - * license terms of these independent modules, and to copy and distribute - * the resulting combined work under terms of your choice, provided that - * every copy of the combined work is accompanied by a complete copy of - * the source code of XviD (the version of XviD used to produce the - * combined work), being distributed under the terms of the GNU General - * Public License plus this exception. An independent module is a module - * which is not derived from or based on XviD. - * - * Note that people who make modified versions of XviD are not obligated - * to grant this special exception for their modified versions; it is - * their choice whether to do so. The GNU General Public License gives - * permission to release a modified version without this exception; this - * exception also makes it possible to release a modified version which - * carries forward this exception. - * - * $Id: portab.h,v 1.26.2.4 2003/01/04 06:14:32 suxen_drol Exp $ + * $Id: portab.h,v 1.46.2.6 2003/05/17 13:26:51 suxen_drol Exp $ * ****************************************************************************/ @@ -63,45 +34,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_RC 0x00000080 -#define DPRINTF_DEBUG 0x80000000 - -/* debug level for this library */ -#ifdef _DEBUG -#define DPRINTF_LEVEL (DPRINTF_RC|0x0000000f) -#else -#define DPRINTF_LEVEL DPRINTF_RC -#endif - -/* 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 @@ -112,42 +59,40 @@ # 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__) || defined(__ICC) - -# 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 + * 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 +# if _MSC_VER < 1300 +# define uintptr_t uint32_t +# else +# include +# 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 +# include +# endif #else -/* todo: fix cache_line 0 operation */ -# define CACHE_LINE 16 -# define ptr_t uint32_t +# error You are trying to compile XviD without defining address bus size. #endif /***************************************************************************** @@ -164,16 +109,24 @@ | 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 + * 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) { + if (xvid_debug & level) { va_list args; char buf[DPRINTF_BUF_SZ]; va_start(args, fmt); @@ -182,6 +135,9 @@ fprintf(stderr, "%s\n", buf); } } +# else + static __inline void DPRINTF(int level, char *fmt, ...) {} +# endif # if _MSC_VER <= 1200 # define DECLARE_ALIGNED_MATRIX(name,sizex,sizey,type,alignment) \ @@ -196,37 +152,42 @@ /*---------------------------------------------------------------------------- | msvc x86 specific macros/functions *---------------------------------------------------------------------------*/ -# if defined(ARCH_X86) +# if defined(ARCH_IS_IA32) # define BSWAP(a) __asm mov eax,a __asm bswap eax __asm mov a, eax -# define EMMS() __asm {emms} -# define FEMMS() __asm {femms} - 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 *---------------------------------------------------------------------------*/ -# else -/* ANSI C version of BSWAP */ -#define BSWAP(x) \ - x = ((((x) & 0xff000000) >> 24) | \ - (((x) & 0x00ff0000) >> 8) | \ - (((x) & 0x0000ff00) << 8) | \ - (((x) & 0x000000ff) << 24)) +# 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(); + } -#define EMMS() -#define FEMMS() +/*---------------------------------------------------------------------------- + | 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. # endif @@ -250,30 +211,32 @@ /* 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); + fprintf(stderr, "\n"); + } + } # 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)) /*---------------------------------------------------------------------------- - | gcc x86 specific macros/functions + | gcc IA32 specific macros/functions *---------------------------------------------------------------------------*/ -# if defined(ARCH_X86) +# if defined(ARCH_IS_IA32) # define BSWAP(a) __asm__ ( "bswapl %0\n" : "=r" (a) : "0" (a) ); -# define EMMS() __asm__ ("emms\n\t"); -# define FEMMS() __asm__ ("femms\n\t"); static __inline int64_t read_counter(void) { @@ -287,11 +250,9 @@ /*---------------------------------------------------------------------------- | gcc PPC and PPC Altivec specific macros/functions *---------------------------------------------------------------------------*/ -# elif defined(ARCH_PPC) +# elif defined(ARCH_IS_PPC) # define BSWAP(a) __asm__ __volatile__ \ ( "lwbrx %0,0,%1; eieio" : "=r" (a) : "r" (&(a)), "m" (a)); -# define EMMS() -# define FEMMS() static __inline unsigned long get_tbl(void) { @@ -320,72 +281,159 @@ /*---------------------------------------------------------------------------- | 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() -# define FEMMS() - static __inline int64_t read_counter(void) { + 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() -# define FEMMS() +# include static __inline int64_t read_counter(void) { - return 0; + 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() -# define FEMMS() +# else +# error You are trying to compile XviD without defining the architecture type. +# endif + + + + +/***************************************************************************** + * 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); + fprintf(stderr, "%s\n", 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) { - return 0; + 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 -/* ANSI C version of BSWAP */ -#define BSWAP(x) \ - x = ((((x) & 0xff000000) >> 24) | \ - (((x) & 0x00ff0000) >> 8) | \ - (((x) & 0x0000ff00) << 8) | \ - (((x) & 0x000000ff) << 24)) - -#define EMMS() -#define FEMMS() -# 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); + fprintf(stderr, "\n"); + } + } + +# 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 */