Diff of /trunk/xvidcore/src/portab.h

-revision 513, Sun Sep 22 16:59:57 2002 UTC
+revision 2147, Tue Oct 18 22:02:10 2016 UTC
 Line 3
   *  XVID MPEG-4 VIDEO CODEC
   *  - Portable macros, types and inlined assembly -
   *
-  *  Copyright(C) 2002 Michael Militzer
+  *  Copyright(C) 2002-2010 Michael Militzer <isibaar@xvid.org>
-  *
+  *               2002-2003 Peter Ross <pross@xvid.org>
-  *  This program is an implementation of a part of one or more MPEG-4
+  *               2002-2003 Edouard Gomez <ed.gomez@free.fr>
-  *  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.
   *
   *  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
-Line 28
+Line 21
   *  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.28 2002-09-22 16:59:57 edgomez Exp $
+  * $Id$
   *
   ****************************************************************************/
-Line 39
+Line 32
   *  Common things
   ****************************************************************************/
- /* Debug level masks */
+ /* Buffer size for msvc implementation because it outputs to DebugOutput */
- #define DPRINTF_ERROR           0x00000001
+ #if defined(_DEBUG)
- #define DPRINTF_STARTCODE       0x00000002
+ extern unsigned int xvid_debug;
- #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) */
  #define DPRINTF_BUF_SZ  1024
+ #endif
  /*****************************************************************************
-  *  Types used in XviD sources
+  *  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 <inttypes.h>
- /*----------------------------------------------------------------------------
-  | 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
-Line 83
+Line 57
  #    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__)
+ #else
- #    define int8_t   char
+ #    include <inttypes.h>
- #    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
- /*----------------------------------------------------------------------------
+ #endif
-  | Ok, we don't know how to define these types... error
-  *---------------------------------------------------------------------------*/
+ /*****************************************************************************
+  *  Some things that are OS dependant
+  ****************************************************************************/
+ #ifdef WIN32
+ # include <windows.h>
+ # define pthread_t                              HANDLE
+ # define pthread_create(t,u,f,d) *(t)=CreateThread(NULL,0,f,d,0,NULL)
+ # define pthread_join(t,s)              { WaitForSingleObject(t,INFINITE); \
+                                                                         CloseHandle(t); }
+ # define sched_yield()                  Sleep(0);
+ static __inline int pthread_num_processors_np()
+ {
+         DWORD p_aff, s_aff, r = 0;
+         GetProcessAffinityMask(GetCurrentProcess(), (PDWORD_PTR) &p_aff, (PDWORD_PTR) &s_aff);
+         for(; p_aff != 0; p_aff>>=1) r += p_aff&1;
+         return r;
+ }
+ #elif defined(__amigaos4__)
+ # include <pthread.h>
+ # include <proto/exec.h>
+ static __inline void amiga_yield(void)
+ {
+         /* SetTaskPri() on the currently running task triggers a reschedule */
+         struct Task *me = IExec->FindTask(NULL);
+         IExec->SetTaskPri(me, me->tc_Node.ln_Pri);
+ }
+ # define sched_yield() amiga_yield()
+ #elif defined(SYS_BEOS)
+ # include <kernel/OS.h>
+ # define pthread_t                              thread_id
+ # define pthread_create(t,u,f,d) { *(t)=spawn_thread(f,"",10,d); \
+                                                                 resume_thread(*(t)); }
+ # define pthread_join(t,s)              wait_for_thread(t,(long*)s)
+ # define sched_yield()                  snooze(0) /* is this correct? */
  #else
- #    error Do not know how to define (u)int(size)_t types
+ # include <pthread.h>
  #endif
  /*****************************************************************************
   *  Some things that are only architecture dependant
   ****************************************************************************/
- #if defined(ARCH_X86) || defined(ARCH_PPC) || defined(ARCH_MIPS)
+ #if defined(ARCH_IS_32BIT)
- #    define CACHE_LINE  16
+ #    define CACHE_LINE 64
  #    define ptr_t uint32_t
- #elif defined(ARCH_IA64) || defined(ARCH_SPARC)
+ #    define intptr_t int32_t
- #    define CACHE_LINE  32
+ #    define _INTPTR_T_DEFINED
+ #    if defined(_MSC_VER) && _MSC_VER >= 1300 && !defined(__INTEL_COMPILER)
+ #        include <stdarg.h>
+ #    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 <stdarg.h>
+ #    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
  /*****************************************************************************
-Line 136
+Line 158
  #include <windows.h>
  #include <stdio.h>
+ /* 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);
              vsprintf(buf, fmt, args);
-             OutputDebugString(buf);
+                 va_end(args);
-             fprintf(stderr, "%s\n", buf);
+                 OutputDebugStringA(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) \
-Line 165
+Line 199
  /*----------------------------------------------------------------------------
   | msvc x86 specific macros/functions
   *---------------------------------------------------------------------------*/
- #    if defined(ARCH_X86)
+ #    if defined(ARCH_IS_IA32)
- #        define BSWAP(a)
+ #        define BSWAP(a) __asm mov eax,a __asm bswap eax __asm mov a, eax
-              __asm { \
-                  mov eax,a \
-                  bswap eax \
-                  mov a, eax \
-              }
- #        define EMMS() __asm {emms}
               static __inline int64_t read_counter(void)
               {
-Line 187
+Line 215
                   return ts;
               }
+ #    elif defined(ARCH_IS_X86_64)
+ #    include <intrin.h>
+ #    define BSWAP(a) ((a) = _byteswap_ulong(a))
+ static __inline int64_t read_counter(void) { return __rdtsc(); }
+ /*----------------------------------------------------------------------------
+   | 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 <time.h>
+ static __inline int64_t read_counter(void)
+ {
+         return (int64_t)clock();
+ }
  /*----------------------------------------------------------------------------
-  | msvc unknown architecture
+   | 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
-Line 201
+Line 252
   *  GNU CC compiler stuff
   ****************************************************************************/
- #elif defined(__GNUC__) /* Compiler test */
+ #elif defined(__GNUC__) || defined(__ICC) /* Compiler test */
  /*----------------------------------------------------------------------------
   | Common gcc stuff
-Line 215
+Line 266
          /* Needed for all debuf fprintf calls */
  #       include <stdio.h>
+ #       include <stdarg.h>
- #       define DPRINTF(level, format, ...) \
+ static __inline void DPRINTF(int level, char *format, ...)
-             do {\
+ {
-                 if(DPRINTF_LEVEL & level)\
+         va_list args;
-                     fprintf(stderr, format"\n", ##__VA_ARGS__);\
+         va_start(args, format);
-             }while(0);
+         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 */
- #    ifdef _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))
- #    else
- #        define DECLARE_ALIGNED_MATRIX(name,sizex,sizey,type,alignment) \
-                 __attribute__ ((__aligned__(CACHE_LINE))) type name[(sizex)*(sizey)]
- #    endif
  /*----------------------------------------------------------------------------
-  | 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)
           {
-Line 255
+Line 305
  /*----------------------------------------------------------------------------
   | gcc PPC and PPC Altivec specific macros/functions
   *---------------------------------------------------------------------------*/
- #    elif defined(ARCH_PPC)
+ #    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));
- #        define EMMS()
           static __inline unsigned long get_tbl(void)
           {
-Line 287
+Line 345
  /*----------------------------------------------------------------------------
   | gcc IA64 specific macros/functions
   *---------------------------------------------------------------------------*/
- #    elif defined(ARCH_IA64)
+ #    elif defined(ARCH_IS_IA64)
  #        define BSWAP(a)  __asm__ __volatile__ \
-                 ("mux1 %1 = %0, @rev" ";;" \
+         ("mux1 %0 = %1, @rev" ";;" \
-                  "shr.u %1 = %1, 32" : "=r" (a) : "r" (a));
+          "shr.u %0 = %0, 32" : "=r" (a) : "r" (a));
- #        define EMMS()
-          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) = (((a) & 0xff) << 24)  | (((a) & 0xff00) << 8) | \
                         (((a) >> 8) & 0xff00) | (((a) >> 24) & 0xff))
- #        define EMMS()
+ #        include <time.h>
           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)
+ #    else
- #        define BSWAP(a) \
+ #        error You are trying to compile Xvid without defining the architecture type.
-                 ((a) = (((a) & 0xff) << 24)  | (((a) & 0xff00) << 8) |
+ #    endif
-                        (((a) >> 8) & 0xff00) | (((a) >> 24) & 0xff))
- #        define EMMS()
+ /*****************************************************************************
+  *  Open WATCOM C/C++ compiler
+  ****************************************************************************/
+ #elif defined(__WATCOMC__)
+ #    include <stdio.h>
+ #    include <stdarg.h>
+ #    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) || defined(ARCH_IS_X86_64)
+ #        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
- #        error Architecture not supported.
+ #        error You are trying to compile Xvid without defining the architecture type.
- #    endif /* Architecture checking */
+ #    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 <stdio.h>
+ #       include <stdarg.h>
+ 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 <time.h>
+ 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 */

 Legend:



Removed from v.513
 


changed lines


 
Added in v.2147
 Legend:



Removed from v.513
 


changed lines


 
Added in v.2147
-Removed from v.513
+Added in v.2147

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