[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.54.2.1, Mon Jul 10 15:05:30 2006 UTC revision 1.60, Tue Mar 9 10:00:14 2010 UTC
# Line 3  Line 3 
3   *  XVID MPEG-4 VIDEO CODEC   *  XVID MPEG-4 VIDEO CODEC
4   *  - Portable macros, types and inlined assembly -   *  - Portable macros, types and inlined assembly -
5   *   *
6   *  Copyright(C) 2002      Michael Militzer <isibaar@xvid.org>   *  Copyright(C) 2002-2010 Michael Militzer <isibaar@xvid.org>
7   *               2002-2003 Peter Ross <pross@xvid.org>   *               2002-2003 Peter Ross <pross@xvid.org>
8   *               2002-2003 Edouard Gomez <ed.gomez@free.fr>   *               2002-2003 Edouard Gomez <ed.gomez@free.fr>
9   *   *
# Line 39  Line 39 
39  #endif  #endif
40    
41  /*****************************************************************************  /*****************************************************************************
42   *  Types used in XviD sources   *  Types used in Xvid sources
43   ****************************************************************************/   ****************************************************************************/
44    
45  /*----------------------------------------------------------------------------  /*----------------------------------------------------------------------------
# Line 68  Line 68 
68  #endif  #endif
69    
70  /*****************************************************************************  /*****************************************************************************
71     *  Some things that are OS dependant
72     ****************************************************************************/
73    
74    #ifdef WIN32
75    
76    # include <windows.h>
77    # define pthread_t                              HANDLE
78    # define pthread_create(t,u,f,d) *(t)=CreateThread(NULL,0,f,d,0,NULL)
79    # define pthread_join(t,s)              { WaitForSingleObject(t,INFINITE); \
80                                                                            CloseHandle(t); }
81    # define sched_yield()                  Sleep(0);
82    static __inline int pthread_num_processors_np()
83    {
84            DWORD p_aff, s_aff, r = 0;
85            GetProcessAffinityMask(GetCurrentProcess(), (PDWORD_PTR) &p_aff, (PDWORD_PTR) &s_aff);
86            for(; p_aff != 0; p_aff>>=1) r += p_aff&1;
87            return r;
88    }
89    
90    #elif defined(__amigaos4__)
91    
92    # include <pthread.h>
93    # include <proto/dos.h>
94    # define sched_yield() IDOS->Delay(1)
95    
96    #elif defined(SYS_BEOS)
97    
98    # include <kernel/OS.h>
99    # define pthread_t                              thread_id
100    # define pthread_create(t,u,f,d) { *(t)=spawn_thread(f,"",10,d); \
101                                                                    resume_thread(*(t)); }
102    # define pthread_join(t,s)              wait_for_thread(t,(long*)s)
103    # define sched_yield()                  snooze(0) /* is this correct? */
104    
105    #else
106    # include <pthread.h>
107    #endif
108    
109    /*****************************************************************************
110   *  Some things that are only architecture dependant   *  Some things that are only architecture dependant
111   ****************************************************************************/   ****************************************************************************/
112    
# Line 75  Line 114 
114  #    define CACHE_LINE 64  #    define CACHE_LINE 64
115  #    define ptr_t uint32_t  #    define ptr_t uint32_t
116  #    define intptr_t int32_t  #    define intptr_t int32_t
117    #    define _INTPTR_T_DEFINED
118  #    if defined(_MSC_VER) && _MSC_VER >= 1300 && !defined(__INTEL_COMPILER)  #    if defined(_MSC_VER) && _MSC_VER >= 1300 && !defined(__INTEL_COMPILER)
119  #        include <stdarg.h>  #        include <stdarg.h>
120  #    else  #    else
# Line 84  Line 124 
124  #    define CACHE_LINE  64  #    define CACHE_LINE  64
125  #    define ptr_t uint64_t  #    define ptr_t uint64_t
126  #    define intptr_t int64_t  #    define intptr_t int64_t
127    #    define _INTPTR_T_DEFINED
128  #    if defined (_MSC_VER) && _MSC_VER >= 1300 && !defined(__INTEL_COMPILER)  #    if defined (_MSC_VER) && _MSC_VER >= 1300 && !defined(__INTEL_COMPILER)
129  #        include <stdarg.h>  #        include <stdarg.h>
130  #    else  #    else
131  #        define uintptr_t uint64_t  #        define uintptr_t uint64_t
132  #    endif  #    endif
133  #else  #else
134  #    error You are trying to compile XviD without defining address bus size.  #    error You are trying to compile Xvid without defining address bus size.
135  #endif  #endif
136    
137  /*****************************************************************************  /*****************************************************************************
# Line 130  Line 171 
171                  va_start(args, fmt);                  va_start(args, fmt);
172                  vsprintf(buf, fmt, args);                  vsprintf(buf, fmt, args);
173                  va_end(args);                  va_end(args);
174                  OutputDebugString(buf);                  OutputDebugStringA(buf);
175                  fprintf(stderr, "%s", buf);                  fprintf(stderr, "%s", buf);
176          }          }
177  }  }
# Line 151  Line 192 
192  /*----------------------------------------------------------------------------  /*----------------------------------------------------------------------------
193    | msvc x86 specific macros/functions    | msvc x86 specific macros/functions
194   *---------------------------------------------------------------------------*/   *---------------------------------------------------------------------------*/
195  #    if defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64)  #    if defined(ARCH_IS_IA32)
196  #        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
197    
198  static __inline int64_t read_counter(void)  static __inline int64_t read_counter(void)
# Line 167  Line 208 
208          return ts;          return ts;
209  }  }
210    
211    #    elif defined(ARCH_IS_X86_64)
212    
213    #    include <intrin.h>
214    
215    #    define BSWAP(a) ((a) = _byteswap_ulong(a))
216    
217    static __inline int64_t read_counter(void) { return __rdtsc(); }
218    
219  /*----------------------------------------------------------------------------  /*----------------------------------------------------------------------------
220    | msvc GENERIC (plain C only) - Probably alpha or some embedded device    | msvc GENERIC (plain C only) - Probably alpha or some embedded device
221   *---------------------------------------------------------------------------*/   *---------------------------------------------------------------------------*/
# Line 183  Line 232 
232    
233  /*----------------------------------------------------------------------------  /*----------------------------------------------------------------------------
234    | msvc Not given architecture - This is probably an user who tries to build    | msvc Not given architecture - This is probably an user who tries to build
235    | XviD the wrong way.    | Xvid the wrong way.
236   *---------------------------------------------------------------------------*/   *---------------------------------------------------------------------------*/
237  #    else  #    else
238  #        error You are trying to compile XviD without defining the architecture type.  #        error You are trying to compile Xvid without defining the architecture type.
239  #    endif  #    endif
240    
241    
# Line 317  Line 366 
366    
367  /*----------------------------------------------------------------------------  /*----------------------------------------------------------------------------
368    | gcc Not given architecture - This is probably an user who tries to build    | gcc Not given architecture - This is probably an user who tries to build
369    | XviD the wrong way.    | Xvid the wrong way.
370   *---------------------------------------------------------------------------*/   *---------------------------------------------------------------------------*/
371  #    else  #    else
372  #        error You are trying to compile XviD without defining the architecture type.  #        error You are trying to compile Xvid without defining the architecture type.
373  #    endif  #    endif
374    
375    
# Line 358  Line 407 
407  /*----------------------------------------------------------------------------  /*----------------------------------------------------------------------------
408    | watcom ia32 specific macros/functions    | watcom ia32 specific macros/functions
409   *---------------------------------------------------------------------------*/   *---------------------------------------------------------------------------*/
410  #    if defined(ARCH_IS_IA32)  #    if defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64)
411    
412  #        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
413    
# Line 390  Line 439 
439    
440  /*----------------------------------------------------------------------------  /*----------------------------------------------------------------------------
441    | watcom Not given architecture - This is probably an user who tries to build    | watcom Not given architecture - This is probably an user who tries to build
442    | XviD the wrong way.    | Xvid the wrong way.
443   *---------------------------------------------------------------------------*/   *---------------------------------------------------------------------------*/
444  #    else  #    else
445  #        error You are trying to compile XviD without defining the architecture type.  #        error You are trying to compile Xvid without defining the architecture type.
446  #    endif  #    endif
447    
448    

Legend:
Removed from v.1.54.2.1  
changed lines
  Added in v.1.60

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