--- portab.h 2003/04/04 22:10:38 1.42.2.1 +++ portab.h 2003/02/16 01:41:24 1.44 @@ -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.42.2.1 2003/04/04 22:10:38 edgomez Exp $ + * $Id: portab.h,v 1.44 2003/02/16 01:41:24 edgomez Exp $ * ****************************************************************************/ @@ -64,17 +35,22 @@ ****************************************************************************/ /* 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 +#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 */ -#define DPRINTF_LEVEL 0 +#ifdef _DEBUG +#define DPRINTF_LEVEL 0x000000ff +#else +#define DPRINTF_LEVEL 0 +#endif /* Buffer size for msvc implementation because it outputs to DebugOutput */ #define DPRINTF_BUF_SZ 1024 @@ -87,7 +63,7 @@ | For MSVC *---------------------------------------------------------------------------*/ -#if defined(_MSC_VER) +#if defined(_MSC_VER) || defined (__WATCOMC__) # define int8_t char # define uint8_t unsigned char # define int16_t short @@ -113,10 +89,10 @@ ****************************************************************************/ #if defined(ARCH_IS_32BIT) -# define CACHE_LINE 64 +# define CACHE_LINE 16 # define ptr_t uint32_t #elif defined(ARCH_IS_64BIT) -# define CACHE_LINE 64 +# define CACHE_LINE 32 # define ptr_t uint64_t #else # error You are trying to compile XviD without defining address bus size. @@ -136,8 +112,12 @@ | 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 @@ -179,7 +159,6 @@ *---------------------------------------------------------------------------*/ # if defined(ARCH_IS_IA32) # define BSWAP(a) __asm mov eax,a __asm bswap eax __asm mov a, eax -# define EMMS() __asm {emms} # ifdef _PROFILING_ static __inline int64_t read_counter(void) @@ -203,7 +182,6 @@ # define BSWAP(a) \ ((a) = (((a) & 0xff) << 24) | (((a) & 0xff00) << 8) | \ (((a) >> 8) & 0xff00) | (((a) >> 24) & 0xff)) -# define EMMS() # ifdef _PROFILING_ # include @@ -268,7 +246,6 @@ *---------------------------------------------------------------------------*/ # if defined(ARCH_IS_IA32) # define BSWAP(a) __asm__ ( "bswapl %0\n" : "=r" (a) : "0" (a) ); -# define EMMS() __asm__ ("emms\n\t"); # ifdef _PROFILING_ static __inline int64_t read_counter(void) @@ -287,7 +264,6 @@ # elif defined(ARCH_IS_PPC) # define BSWAP(a) __asm__ __volatile__ \ ( "lwbrx %0,0,%1; eieio" : "=r" (a) : "r" (&(a)), "m" (a)); -# define EMMS() # ifdef _PROFILING_ static __inline unsigned long get_tbl(void) @@ -322,7 +298,6 @@ # define BSWAP(a) __asm__ __volatile__ \ ("mux1 %1 = %0, @rev" ";;" \ "shr.u %1 = %1, 32" : "=r" (a) : "r" (a)); -# define EMMS() # ifdef _PROFILING_ static __inline int64_t read_counter(void) @@ -340,7 +315,6 @@ # define BSWAP(a) \ ((a) = (((a) & 0xff) << 24) | (((a) & 0xff00) << 8) | \ (((a) >> 8) & 0xff00) | (((a) >> 24) & 0xff)) -# define EMMS() # ifdef _PROFILING_ # include @@ -358,6 +332,83 @@ # 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 (DPRINTF_LEVEL & 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 + +# ifdef _PROFILING_ + 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; + } +# endif + +/*---------------------------------------------------------------------------- + | 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)) + +# ifdef _PROFILING_ + static int64_t read_counter() { return 0; } +# endif + +/*---------------------------------------------------------------------------- + | 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. +# endif + + /***************************************************************************** * Unknown compiler ****************************************************************************/ @@ -394,8 +445,6 @@ ((a) = (((a) & 0xff) << 24) | (((a) & 0xff00) << 8) | \ (((a) >> 8) & 0xff00) | (((a) >> 24) & 0xff)) -# define EMMS() - # ifdef _PROFILING_ # include static __inline int64_t read_counter(void) @@ -410,4 +459,4 @@ #endif /* Compiler test */ -#endif +#endif /* PORTAB_H */