--- portab.h 2003/02/16 01:41:24 1.44 +++ portab.h 2004/04/12 14:05:08 1.51 @@ -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.44 2003/02/16 01:41:24 edgomez Exp $ + * $Id: portab.h,v 1.51 2004/04/12 14:05:08 edgomez Exp $ * ****************************************************************************/ @@ -34,26 +32,11 @@ * 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 0x000000ff -#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 @@ -89,11 +72,23 @@ ****************************************************************************/ #if defined(ARCH_IS_32BIT) -# define CACHE_LINE 16 +# define CACHE_LINE 64 # define ptr_t uint32_t +# define intptr_t int32_t +# 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 32 +# define CACHE_LINE 64 # define ptr_t uint64_t +# define intptr_t int64_t +# if defined (_MSC_VER) && _MSC_VER >= 1300 && !defined(__INTEL_COMPILER) +# include +# else +# define uintptr_t uint64_t +# endif #else # error You are trying to compile XviD without defining address bus size. #endif @@ -129,19 +124,17 @@ # 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); vsprintf(buf, fmt, args); OutputDebugString(buf); - fprintf(stderr, "%s\n", 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 @@ -160,20 +153,18 @@ # if defined(ARCH_IS_IA32) # define BSWAP(a) __asm mov eax,a __asm bswap eax __asm mov a, eax -# ifdef _PROFILING_ - 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 } -# endif + ts = ((uint64_t) ts2 << 32) | ((uint64_t) ts1); + return ts; + } /*---------------------------------------------------------------------------- | msvc GENERIC (plain C only) - Probably alpha or some embedded device @@ -183,13 +174,11 @@ ((a) = (((a) & 0xff) << 24) | (((a) & 0xff00) << 8) | \ (((a) >> 8) & 0xff00) | (((a) >> 24) & 0xff)) -# ifdef _PROFILING_ -# include - static __inline int64_t read_counter(void) - { - return (int64_t)clock(); - } -# endif +# 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 @@ -226,11 +215,10 @@ { va_list args; va_start(args, format); - if(DPRINTF_LEVEL & level) { + if(xvid_debug & level) { vfprintf(stderr, format, args); - fprintf(stderr, "\n"); - } - } + } + } # else /* _DEBUG */ static __inline void DPRINTF(int level, char *format, ...) {} @@ -247,49 +235,54 @@ # if defined(ARCH_IS_IA32) # define BSWAP(a) __asm__ ( "bswapl %0\n" : "=r" (a) : "0" (a) ); -# ifdef _PROFILING_ - 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; - } -# endif + 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 + # define BSWAP(a) __asm__ __volatile__ \ ( "lwbrx %0,0,%1; eieio" : "=r" (a) : "r" (&(a)), "m" (a)); -# ifdef _PROFILING_ - static __inline unsigned long get_tbl(void) - { - unsigned long tbl; - asm volatile ("mftb %0":"=r" (tbl)); - return tbl; - } + 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 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; - } -# endif + 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 @@ -299,14 +292,12 @@ ("mux1 %1 = %0, @rev" ";;" \ "shr.u %1 = %1, 32" : "=r" (a) : "r" (a)); -# ifdef _PROFILING_ - static __inline int64_t read_counter(void) - { - unsigned long result; - __asm__ __volatile__("mov %0=ar.itc" : "=r"(result) :: "memory"); - return result; - } -# endif + 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 @@ -316,13 +307,11 @@ ((a) = (((a) & 0xff) << 24) | (((a) & 0xff00) << 8) | \ (((a) >> 8) & 0xff00) | (((a) >> 24) & 0xff)) -# ifdef _PROFILING_ -# include - static __inline int64_t read_counter(void) - { - return (int64_t)clock(); - } -# endif +# include + static __inline int64_t read_counter(void) + { + return (int64_t)clock(); + } /*---------------------------------------------------------------------------- | gcc Not given architecture - This is probably an user who tries to build @@ -345,21 +334,21 @@ # 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); + 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) \ +# 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)) @@ -370,7 +359,6 @@ # define BSWAP(a) __asm mov eax,a __asm bswap eax __asm mov a, eax -# ifdef _PROFILING_ static __inline int64_t read_counter(void) { uint64_t ts; @@ -383,22 +371,19 @@ ts = ((uint64_t) ts2 << 32) | ((uint64_t) ts1); return ts; } -# endif /*---------------------------------------------------------------------------- | watcom GENERIC (plain C only) specific macros/functions. *---------------------------------------------------------------------------*/ -# elif defined(ARCH_IS_GENERIC) +# elif defined(ARCH_IS_GENERIC) -# define BSWAP(x) \ - x = ((((x) & 0xff000000) >> 24) | \ - (((x) & 0x00ff0000) >> 8) | \ - (((x) & 0x0000ff00) << 8) | \ - (((x) & 0x000000ff) << 24)) +# define BSWAP(x) \ + x = ((((x) & 0xff000000) >> 24) | \ + (((x) & 0x00ff0000) >> 8) | \ + (((x) & 0x0000ff00) << 8) | \ + (((x) & 0x000000ff) << 24)) -# ifdef _PROFILING_ static int64_t read_counter() { return 0; } -# endif /*---------------------------------------------------------------------------- | watcom Not given architecture - This is probably an user who tries to build @@ -415,11 +400,11 @@ #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 @@ -431,11 +416,10 @@ { va_list args; va_start(args, format); - if(DPRINTF_LEVEL & level) { + if(xvid_debug & level) { vfprintf(stderr, format, args); - fprintf(stderr, "\n"); - } - } + } + } # else /* _DEBUG */ static __inline void DPRINTF(int level, char *format, ...) {} @@ -445,15 +429,13 @@ ((a) = (((a) & 0xff) << 24) | (((a) & 0xff00) << 8) | \ (((a) >> 8) & 0xff00) | (((a) >> 24) & 0xff)) -# ifdef _PROFILING_ -# include - static __inline int64_t read_counter(void) - { - return (int64_t)clock(); - } -# endif +# include + static __inline int64_t read_counter(void) + { + return (int64_t)clock(); + } -# define DECLARE_ALIGNED_MATRIX(name,sizex,sizey,type,alignment) \ +# define DECLARE_ALIGNED_MATRIX(name,sizex,sizey,type,alignment) \ type name[(sizex)*(sizey)] #endif /* Compiler test */