[cvs] / xvidcore / src / portab.h Repository:
ViewVC logotype

Diff of /xvidcore/src/portab.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.26.2.8, Sat Feb 15 08:39:17 2003 UTC revision 1.35, Sat Nov 16 23:38:16 2002 UTC
# Line 71  Line 71 
71  #define DPRINTF_MB                      0x00000010  #define DPRINTF_MB                      0x00000010
72  #define DPRINTF_COEFF           0x00000020  #define DPRINTF_COEFF           0x00000020
73  #define DPRINTF_MV                      0x00000040  #define DPRINTF_MV                      0x00000040
 #define DPRINTF_RC                      0x00000080  
74  #define DPRINTF_DEBUG           0x80000000  #define DPRINTF_DEBUG           0x80000000
75    
76  /* debug level for this library */  /* debug level for this library */
77  #ifdef _DEBUG  #define DPRINTF_LEVEL           0
 #define DPRINTF_LEVEL           (DPRINTF_RC|0x0000007F)  
 #else  
 #define DPRINTF_LEVEL           DPRINTF_RC  
 #endif  
78    
79  /* Buffer size for non C99 compliant compilers (msvc) */  /* Buffer size for non C99 compliant compilers (msvc) */
80  #define DPRINTF_BUF_SZ  1024  #define DPRINTF_BUF_SZ  1024
# Line 101  Line 96 
96   | msvc (lacks such a header file)   | msvc (lacks such a header file)
97   *---------------------------------------------------------------------------*/   *---------------------------------------------------------------------------*/
98    
99  #elif defined(_MSC_VER) || defined (__WATCOMC__)  #elif defined(_MSC_VER)
100  #    define int8_t   char  #    define int8_t   char
101  #    define uint8_t  unsigned char  #    define uint8_t  unsigned char
102  #    define int16_t  short  #    define int16_t  short
# Line 115  Line 110 
110   | Fallback when using gcc   | Fallback when using gcc
111   *---------------------------------------------------------------------------*/   *---------------------------------------------------------------------------*/
112    
113  #elif defined(__GNUC__) || defined(__ICC)  #elif defined(__GNUC__)
114    
115  #    define int8_t   char  #    define int8_t   char
116  #    define uint8_t  unsigned char  #    define uint8_t  unsigned char
# Line 145  Line 140 
140  #    define CACHE_LINE  32  #    define CACHE_LINE  32
141  #    define ptr_t uint64_t  #    define ptr_t uint64_t
142  #else  #else
143  /* todo: fix cache_line 0 operation */  #    error Architecture not supported.
 #    define CACHE_LINE  16  
 #    define ptr_t uint32_t  
144  #endif  #endif
145    
146  /*****************************************************************************  /*****************************************************************************
# Line 167  Line 160 
160  #include <windows.h>  #include <windows.h>
161  #include <stdio.h>  #include <stdio.h>
162    
         /* non-ansi function mapping */  
 #       define snprintf _snprintf  
 #       define vsnprintf _vsnprintf  
   
163      /*      /*
164       * This function must be declared/defined all the time because MSVC does       * This function must be declared/defined all the time because MSVC does
165       * not support C99 variable arguments macros       * not support C99 variable arguments macros
# Line 202  Line 191 
191   *---------------------------------------------------------------------------*/   *---------------------------------------------------------------------------*/
192  #    if defined(ARCH_X86)  #    if defined(ARCH_X86)
193  #        define BSWAP(a) __asm mov eax,a __asm bswap eax __asm mov a, eax  #        define BSWAP(a) __asm mov eax,a __asm bswap eax __asm mov a, eax
194    #        define EMMS() __asm {emms}
195    
196               static __inline int64_t read_counter(void)               static __inline int64_t read_counter(void)
197               {               {
# Line 220  Line 210 
210   | msvc unknown architecture   | msvc unknown architecture
211   *---------------------------------------------------------------------------*/   *---------------------------------------------------------------------------*/
212  #    else  #    else
213  /* ANSI C version of BSWAP */  #        error Architecture not supported.
 #define BSWAP(x) \  
  x = ((((x) & 0xff000000) >> 24) | \  
      (((x) & 0x00ff0000) >>  8) | \  
      (((x) & 0x0000ff00) <<  8) | \  
      (((x) & 0x000000ff) << 24))  
   
214  #    endif  #    endif
215    
216    
# Line 236  Line 220 
220   *  GNU CC compiler stuff   *  GNU CC compiler stuff
221   ****************************************************************************/   ****************************************************************************/
222    
223  #elif defined(__GNUC__) || defined(__ICC) /* Compiler test */  #elif defined(__GNUC__) /* Compiler test */
224    
225  /*----------------------------------------------------------------------------  /*----------------------------------------------------------------------------
226   | Common gcc stuff   | Common gcc stuff
# Line 272  Line 256 
256   *---------------------------------------------------------------------------*/   *---------------------------------------------------------------------------*/
257  #    if defined(ARCH_X86)  #    if defined(ARCH_X86)
258  #        define BSWAP(a) __asm__ ( "bswapl %0\n" : "=r" (a) : "0" (a) );  #        define BSWAP(a) __asm__ ( "bswapl %0\n" : "=r" (a) : "0" (a) );
259    #        define EMMS() __asm__ ("emms\n\t");
260    
261           static __inline int64_t read_counter(void)           static __inline int64_t read_counter(void)
262           {           {
# Line 288  Line 273 
273  #    elif defined(ARCH_PPC)  #    elif defined(ARCH_PPC)
274  #        define BSWAP(a) __asm__ __volatile__ \  #        define BSWAP(a) __asm__ __volatile__ \
275                  ( "lwbrx %0,0,%1; eieio" : "=r" (a) : "r" (&(a)), "m" (a));                  ( "lwbrx %0,0,%1; eieio" : "=r" (a) : "r" (&(a)), "m" (a));
276    #        define EMMS()
277    
278           static __inline unsigned long get_tbl(void)           static __inline unsigned long get_tbl(void)
279           {           {
# Line 320  Line 306 
306  #        define BSWAP(a)  __asm__ __volatile__ \  #        define BSWAP(a)  __asm__ __volatile__ \
307                  ("mux1 %1 = %0, @rev" ";;" \                  ("mux1 %1 = %0, @rev" ";;" \
308                   "shr.u %1 = %1, 32" : "=r" (a) : "r" (a));                   "shr.u %1 = %1, 32" : "=r" (a) : "r" (a));
309    #        define EMMS()
310    
311           static __inline int64_t read_counter(void) {           static __inline int64_t read_counter(void) {
312               unsigned long result;               unsigned long result;
# Line 334  Line 321 
321  #        define BSWAP(a) \  #        define BSWAP(a) \
322                  ((a) = (((a) & 0xff) << 24)  | (((a) & 0xff00) << 8) | \                  ((a) = (((a) & 0xff) << 24)  | (((a) & 0xff00) << 8) | \
323                         (((a) >> 8) & 0xff00) | (((a) >> 24) & 0xff))                         (((a) >> 8) & 0xff00) | (((a) >> 24) & 0xff))
324    #        define EMMS()
325    
326           static __inline int64_t read_counter(void)           static __inline int64_t read_counter(void)
327           {           {
# Line 347  Line 335 
335  #        define BSWAP(a) \  #        define BSWAP(a) \
336                  ((a) = (((a) & 0xff) << 24)  | (((a) & 0xff00) << 8) | \                  ((a) = (((a) & 0xff) << 24)  | (((a) & 0xff00) << 8) | \
337                         (((a) >> 8) & 0xff00) | (((a) >> 24) & 0xff))                         (((a) >> 8) & 0xff00) | (((a) >> 24) & 0xff))
338    #        define EMMS()
339    
340           static __inline int64_t read_counter(void)           static __inline int64_t read_counter(void)
341           {           {
# Line 357  Line 346 
346   | XviD + gcc unsupported Architecture   | XviD + gcc unsupported Architecture
347   *---------------------------------------------------------------------------*/   *---------------------------------------------------------------------------*/
348  #    else  #    else
349  /* ANSI C version of BSWAP */  #        error Architecture not supported.
 #define BSWAP(x) \  
  x = ((((x) & 0xff000000) >> 24) | \  
      (((x) & 0x00ff0000) >>  8) | \  
      (((x) & 0x0000ff00) <<  8) | \  
      (((x) & 0x000000ff) << 24))  
   
350  #    endif /* Architecture checking */  #    endif /* Architecture checking */
351    
352  /*****************************************************************************  /*****************************************************************************
  *  OPEN WATCOM C/C++ compiler  
  ****************************************************************************/  
 #elif defined(__WATCOMC__)  
   
 #       include <stdio.h>  
 #       include <stdarg.h>  
   
     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);  
                 }  
         }  
   
 #       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 x86 specific macros/functions  
  *---------------------------------------------------------------------------*/  
 #       if defined(ARCH_X86)  
   
 #               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;  
                 }  
   
 /*----------------------------------------------------------------------------  
  | watcom unsupported architecture  
  *---------------------------------------------------------------------------*/  
 #       else  
   
 #               define BSWAP(x) \  
                         x = ((((x) & 0xff000000) >> 24) | \  
                                 (((x) & 0x00ff0000) >>  8) | \  
                                 (((x) & 0x0000ff00) <<  8) | \  
                                 (((x) & 0x000000ff) << 24))  
   
                 static int64_t read_counter() { return 0; }  
   
 #       endif  
 /*****************************************************************************  
353   *  Unknown compiler   *  Unknown compiler
354   ****************************************************************************/   ****************************************************************************/
355  #else /* Compiler test */  #else /* Compiler test */

Legend:
Removed from v.1.26.2.8  
changed lines
  Added in v.1.35

No admin address has been configured
ViewVC Help
Powered by ViewVC 1.0.4