[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.30, Sun Sep 22 17:59:13 2002 UTC revision 1.36, Sat Nov 23 18:11:58 2002 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   *  Copyright(C) 2002 Michael Militzer <isibaar@xvid.org>
7     *               2002 Peter Ross <pross@xvid.org>
8     *               2002 Edouard Gomez <ed.gomez@wanadoo.fr>
9   *   *
10   *  This program is an implementation of a part of one or more MPEG-4   *  This file is part of XviD, a free MPEG-4 video encoder/decoder
  *  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.  
11   *   *
12   *  This program is free software ; you can redistribute it and/or modify   *  XviD is free software; you can redistribute it and/or modify it
13   *  it under the terms of the GNU General Public License as published by   *  under the terms of the GNU General Public License as published by
14   *  the Free Software Foundation ; either version 2 of the License, or   *  the Free Software Foundation ; either version 2 of the License, or
15   *  (at your option) any later version.   *  (at your option) any later version.
16   *   *
# Line 28  Line 23 
23   *  along with this program ; if not, write to the Free Software   *  along with this program ; if not, write to the Free Software
24   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
25   *   *
26     *  Under section 8 of the GNU General Public License, the copyright
27     *  holders of XVID explicitly forbid distribution in the following
28     *  countries:
29     *
30     *    - Japan
31     *    - United States of America
32     *
33     *  Linking XviD statically or dynamically with other modules is making a
34     *  combined work based on XviD.  Thus, the terms and conditions of the
35     *  GNU General Public License cover the whole combination.
36     *
37     *  As a special exception, the copyright holders of XviD give you
38     *  permission to link XviD with independent modules that communicate with
39     *  XviD solely through the VFW1.1 and DShow interfaces, regardless of the
40     *  license terms of these independent modules, and to copy and distribute
41     *  the resulting combined work under terms of your choice, provided that
42     *  every copy of the combined work is accompanied by a complete copy of
43     *  the source code of XviD (the version of XviD used to produce the
44     *  combined work), being distributed under the terms of the GNU General
45     *  Public License plus this exception.  An independent module is a module
46     *  which is not derived from or based on XviD.
47     *
48     *  Note that people who make modified versions of XviD are not obligated
49     *  to grant this special exception for their modified versions; it is
50     *  their choice whether to do so.  The GNU General Public License gives
51     *  permission to release a modified version without this exception; this
52     *  exception also makes it possible to release a modified version which
53     *  carries forward this exception.
54     *
55   * $Id$   * $Id$
56   *   *
57   ****************************************************************************/   ****************************************************************************/
# Line 86  Line 110 
110   | Fallback when using gcc   | Fallback when using gcc
111   *---------------------------------------------------------------------------*/   *---------------------------------------------------------------------------*/
112    
113  #elif defined(__GNUC__)  #elif defined(__GNUC__) || defined(__ICC__)
114    
115  #    define int8_t   char  #    define int8_t   char
116  #    define uint8_t  unsigned char  #    define uint8_t  unsigned char
# Line 109  Line 133 
133   *  Some things that are only architecture dependant   *  Some things that are only architecture dependant
134   ****************************************************************************/   ****************************************************************************/
135    
136  #if defined(ARCH_X86) || defined(ARCH_PPC) || defined(ARCH_MIPS)  #if defined(ARCH_X86) || defined(ARCH_PPC) || defined(ARCH_MIPS)  || defined(ARCH_SPARC)
137  #    define CACHE_LINE  16  #    define CACHE_LINE  16
138  #    define ptr_t uint32_t  #    define ptr_t uint32_t
139  #elif defined(ARCH_IA64) || defined(ARCH_SPARC)  #elif defined(ARCH_IA64)
140  #    define CACHE_LINE  32  #    define CACHE_LINE  32
141  #    define ptr_t uint64_t  #    define ptr_t uint64_t
142  #else  #else
# Line 166  Line 190 
190   | msvc x86 specific macros/functions   | msvc x86 specific macros/functions
191   *---------------------------------------------------------------------------*/   *---------------------------------------------------------------------------*/
192  #    if defined(ARCH_X86)  #    if defined(ARCH_X86)
193  #        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 \  
              }  
194  #        define EMMS() __asm {emms}  #        define EMMS() __asm {emms}
195    
196               static __inline int64_t read_counter(void)               static __inline int64_t read_counter(void)
# Line 201  Line 220 
220   *  GNU CC compiler stuff   *  GNU CC compiler stuff
221   ****************************************************************************/   ****************************************************************************/
222    
223  #elif defined(__GNUC__) /* Compiler test */  #elif defined(__GNUC__) || defined(__ICC__) /* Compiler test */
224    
225  /*----------------------------------------------------------------------------  /*----------------------------------------------------------------------------
226   | Common gcc stuff   | Common gcc stuff

Legend:
Removed from v.1.30  
changed lines
  Added in v.1.36

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