X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=MdePkg%2FInclude%2FX64%2FProcessorBind.h;h=974545a2c5ca65acf79a36fa4f61c4d4c2432d65;hp=106f6164d257ab2789e185ca49eaacef8b846791;hb=9df063a06aef048c042498e2f542fb693e93493a;hpb=8992ce066e2b0f8e74a2df30639c9cc6b04dc4df

diff --git a/MdePkg/Include/X64/ProcessorBind.h b/MdePkg/Include/X64/ProcessorBind.h
index 106f6164d2..974545a2c5 100644
--- a/MdePkg/Include/X64/ProcessorBind.h
+++ b/MdePkg/Include/X64/ProcessorBind.h
@@ -1,8 +1,8 @@
 /** @file
   Processor or Compiler specific defines and types x64 (Intel 64, AMD64).
 
-  Copyright (c) 2006 - 2009, Intel Corporation<BR>                                                         
-  All rights reserved. This program and the accompanying materials                          
+  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+  This program and the accompanying materials                          
   are licensed and made available under the terms and conditions of the BSD License         
   which accompanies this distribution.  The full text of the license may be found at        
   http://opensource.org/licenses/bsd-license.php                                            
@@ -47,6 +47,12 @@
 //
 #pragma warning ( disable : 1419 )
 
+//
+// Disable ICC's remark #593: "Variable" was set but never used.
+// This is legal ANSI C code so we disable the remark that is turned on with /W4
+//
+#pragma warning ( disable : 593 )
+
 #endif
 
 
@@ -91,220 +97,104 @@
 #endif
 
 
-#if !defined(__GNUC__) && (__STDC_VERSION__ < 199901L)
-  //
-  // No ANSI C 2000 stdint.h integer width declarations, so define equivalents
-  //
- 
-  #if defined(_MSC_EXTENSIONS)
-    //
-    // use Microsoft C complier dependent integer width types 
-    //
-
-    ///
-    /// 8-byte unsigned value
-    ///
-    typedef unsigned __int64    UINT64;
-    ///
-    /// 8-byte signed value
-    ///
-    typedef __int64             INT64;
-    ///
-    /// 4-byte unsigned value
-    ///
-    typedef unsigned __int32    UINT32;
-    ///
-    /// 4-byte signed value
-    ///
-    typedef __int32             INT32;
-    ///
-    /// 2-byte unsigned value
-    ///
-    typedef unsigned short      UINT16;
-    ///
-    /// 2-byte Character.  Unless otherwise specified all strings are stored in the
-    /// UTF-16 encoding format as defined by Unicode 2.1 and ISO/IEC 10646 standards.
-    ///
-    typedef unsigned short      CHAR16;
-    ///
-    /// 2-byte signed value
-    ///
-    typedef short               INT16;
-    ///
-    /// Logical Boolean.  1-byte value containing 0 for FALSE or a 1 for TRUE.  Other
-    /// values are undefined.
-    ///
-    typedef unsigned char       BOOLEAN;
-    ///
-    /// 1-byte unsigned value
-    ///
-    typedef unsigned char       UINT8;
-    ///
-    /// 1-byte Character
-    ///
-    typedef char                CHAR8;
-    ///
-    /// 1-byte signed value
-    ///
-    typedef char                INT8;
-  #else
-    #if defined(_EFI_P64)
-      //
-      // P64 - pointers being 64-bit and longs and ints are 32-bits.
-      //
-
-      ///
-      /// 8-byte unsigned value
-      ///
-      typedef unsigned long long  UINT64;
-      ///
-      /// 8-byte signed value
-      ///
-      typedef long long           INT64;
-      ///
-      /// 4-byte unsigned value
-      ///
-      typedef unsigned int        UINT32;
-      ///
-      /// 4-byte signed value
-      ///
-      typedef int                 INT32;
-      ///
-      /// 2-byte Character.  Unless otherwise specified all strings are stored in the
-      /// UTF-16 encoding format as defined by Unicode 2.1 and ISO/IEC 10646 standards.
-      ///
-      typedef unsigned short      CHAR16;
-      ///
-      /// 2-byte unsigned value
-      ///
-      typedef unsigned short      UINT16;
-      ///
-      /// 2-byte signed value
-      ///
-      typedef short               INT16;
-      ///
-      /// Logical Boolean.  1-byte value containing 0 for FALSE or a 1 for TRUE.  Other
-      /// values are undefined.
-      ///
-      typedef unsigned char       BOOLEAN;
-      ///
-      /// 1-byte unsigned value
-      ///
-      typedef unsigned char       UINT8;
-      ///
-      /// 1-byte Character
-      ///
-      typedef char                CHAR8;
-      ///
-      /// 1-byte signed value
-      ///
-      typedef char                INT8;
-    #else
-      //
-      // Assume LP64 - longs and pointers are 64-bit. Ints are 32-bit.
-      //
-
-      ///
-      /// 8-byte unsigned value
-      ///
-      typedef unsigned long   UINT64;
-      ///
-      /// 8-byte signed value
-      ///
-      typedef long            INT64;
-      ///
-      /// 4-byte unsigned value
-      ///
-      typedef unsigned int    UINT32;
-      ///
-      /// 4-byte signed value
-      ///
-      typedef int             INT32;
-      ///
-      /// 2-byte unsigned value
-      ///
-      typedef unsigned short  UINT16;
-      ///
-      /// 2-byte Character.  Unless otherwise specified all strings are stored in the
-      /// UTF-16 encoding format as defined by Unicode 2.1 and ISO/IEC 10646 standards.
-      ///
-      typedef unsigned short  CHAR16;
-      ///
-      /// 2-byte signed value
-      ///
-      typedef short           INT16;
-      ///
-      /// Logical Boolean.  1-byte value containing 0 for FALSE or a 1 for TRUE.  Other
-      /// values are undefined.
-      ///
-      typedef unsigned char   BOOLEAN;
-      ///
-      /// 1-byte unsigned value
-      ///
-      typedef unsigned char   UINT8;
-      ///
-      /// 1-byte Character
-      ///
-      typedef char            CHAR8;
-      ///
-      /// 1-byte signed value
-      ///
-      typedef char            INT8;
-    #endif
-  #endif
-#else
+#if defined(_MSC_EXTENSIONS)
   //
-  // Use ANSI C 2000 stdint.h integer width declarations
+  // use Microsoft C complier dependent integer width types 
   //
-  #include <stdint.h>
 
+  ///
+  /// 8-byte unsigned value
+  ///
+  typedef unsigned __int64    UINT64;
+  ///
+  /// 8-byte signed value
+  ///
+  typedef __int64             INT64;
+  ///
+  /// 4-byte unsigned value
+  ///
+  typedef unsigned __int32    UINT32;
+  ///
+  /// 4-byte signed value
+  ///
+  typedef __int32             INT32;
+  ///
+  /// 2-byte unsigned value
+  ///
+  typedef unsigned short      UINT16;
+  ///
+  /// 2-byte Character.  Unless otherwise specified all strings are stored in the
+  /// UTF-16 encoding format as defined by Unicode 2.1 and ISO/IEC 10646 standards.
+  ///
+  typedef unsigned short      CHAR16;
+  ///
+  /// 2-byte signed value
+  ///
+  typedef short               INT16;
   ///
   /// Logical Boolean.  1-byte value containing 0 for FALSE or a 1 for TRUE.  Other
   /// values are undefined.
   ///
-  typedef uint8_t   BOOLEAN;
+  typedef unsigned char       BOOLEAN;
+  ///
+  /// 1-byte unsigned value
+  ///
+  typedef unsigned char       UINT8;
+  ///
+  /// 1-byte Character
+  ///
+  typedef char                CHAR8;
   ///
   /// 1-byte signed value
   ///
-  typedef int8_t    INT8;
+  typedef char                INT8;
+#else
   ///
-  /// 1-byte unsigned value
+  /// 8-byte unsigned value
   ///
-  typedef uint8_t   UINT8;
+  typedef unsigned long long  UINT64;
   ///
-  /// 2-byte signed value
+  /// 8-byte signed value
   ///
-  typedef int16_t   INT16;
+  typedef long long           INT64;
   ///
-  /// 2-byte unsigned value
+  /// 4-byte unsigned value
   ///
-  typedef uint16_t  UINT16;
+  typedef unsigned int        UINT32;
   ///
   /// 4-byte signed value
   ///
-  typedef int32_t   INT32;
+  typedef int                 INT32;
   ///
-  /// 4-byte unsigned value
+  /// 2-byte unsigned value
   ///
-  typedef uint32_t  UINT32;
+  typedef unsigned short      UINT16;
   ///
-  /// 8-byte signed value
+  /// 2-byte Character.  Unless otherwise specified all strings are stored in the
+  /// UTF-16 encoding format as defined by Unicode 2.1 and ISO/IEC 10646 standards.
   ///
-  typedef int64_t   INT64;
+  typedef unsigned short      CHAR16;
   ///
-  /// 8-byte unsigned value
+  /// 2-byte signed value
+  ///
+  typedef short               INT16;
+  ///
+  /// Logical Boolean.  1-byte value containing 0 for FALSE or a 1 for TRUE.  Other
+  /// values are undefined.
   ///
-  typedef uint64_t  UINT64;
+  typedef unsigned char       BOOLEAN;
+  ///
+  /// 1-byte unsigned value
+  ///
+  typedef unsigned char       UINT8;
   ///
   /// 1-byte Character
   ///
-  typedef char      CHAR8;
+  typedef char                CHAR8;
   ///
-  /// 2-byte Character.  Unless otherwise specified all strings are stored in the
-  /// UTF-16 encoding format as defined by Unicode 2.1 and ISO/IEC 10646 standards.
+  /// 1-byte signed value
   ///
-  typedef uint16_t  CHAR16;
-
+  typedef char                INT8;
 #endif
 
 ///