X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=MdePkg%2FInclude%2FIa32%2FProcessorBind.h;h=9874bd836d26c175d2fb569124071efe20e6e697;hp=a3567267d8db62fc23d841414e7b2f49f8f1207b;hb=d22ebbe39fcf3a7462492667345dabc401765454;hpb=d4cf6b6c976d07af769ad3bfeeccbcf833e72c32

diff --git a/MdePkg/Include/Ia32/ProcessorBind.h b/MdePkg/Include/Ia32/ProcessorBind.h
index a3567267d8..9874bd836d 100644
--- a/MdePkg/Include/Ia32/ProcessorBind.h
+++ b/MdePkg/Include/Ia32/ProcessorBind.h
@@ -1,14 +1,14 @@
 /** @file
   Processor or Compiler specific defines and types for IA-32 architecture.
 
-  Copyright (c) 2006 - 2009, Intel Corporation<BR>                                                         
-  All rights reserved. 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                                            
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+Copyright (c) 2006 - 2012, 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 that accompanies this distribution.  
+The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php.                                          
+    
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
 
 **/
 
@@ -16,7 +16,7 @@
 #define __PROCESSOR_BIND_H__
 
 ///
-/// Define the processor type so other code can make processor based choices
+/// Define the processor type so other code can make processor based choices.
 ///
 #define MDE_CPU_IA32
 
@@ -46,6 +46,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
 
 
@@ -90,180 +96,115 @@
 #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
-
-    //
-    // Assume standard IA-32 alignment. 
-    // Need to check portability of long long
-    //
-
-    ///
-    /// 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 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
-#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 signed value
+  /// 1-byte unsigned value.
   ///
-  typedef int8_t    INT8;
+  typedef unsigned char       UINT8;
   ///
-  /// 1-byte unsigned value
+  /// 1-byte Character.
   ///
-  typedef uint8_t   UINT8;
+  typedef char                CHAR8;
   ///
-  /// 2-byte signed value
+  /// 1-byte signed value.
   ///
-  typedef int16_t   INT16;
+  typedef signed char         INT8;
+#else  
   ///
-  /// 2-byte unsigned value
+  /// 8-byte unsigned value.
   ///
-  typedef uint16_t  UINT16;
+  typedef unsigned long long  UINT64;
   ///
-  /// 4-byte signed value
+  /// 8-byte signed value.
   ///
-  typedef int32_t   INT32;
+  typedef long long           INT64;
   ///
-  /// 4-byte unsigned value
+  /// 4-byte unsigned value.
   ///
-  typedef uint32_t  UINT32;
+  typedef unsigned int        UINT32;
   ///
-  /// 8-byte signed value
+  /// 4-byte signed value.
   ///
-  typedef int64_t   INT64;
+  typedef int                 INT32;
   ///
-  /// 8-byte unsigned value
+  /// 2-byte unsigned value.
   ///
-  typedef uint64_t  UINT64;
+  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;
+  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 signed char         INT8;
 #endif
 
 ///
-/// Unsigned value of native width.  (4 bytes on supported 32-bit processor instructions,
-/// 8 bytes on supported 64-bit processor instructions)
+/// Unsigned value of native width.  (4 bytes on supported 32-bit processor instructions;
+/// 8 bytes on supported 64-bit processor instructions.)
 ///
 typedef UINT32  UINTN;
 ///
-/// Signed value of native width.  (4 bytes on supported 32-bit processor instructions,
-/// 8 bytes on supported 64-bit processor instructions)
+/// Signed value of native width.  (4 bytes on supported 32-bit processor instructions;
+/// 8 bytes on supported 64-bit processor instructions.)
 ///
 typedef INT32   INTN;
 
@@ -281,12 +222,12 @@ typedef INT32   INTN;
 #define MAX_2_BITS  0xC0000000
 
 ///
-/// Maximum legal IA-32 address
+/// Maximum legal IA-32 address.
 ///
 #define MAX_ADDRESS   0xFFFFFFFF
 
 ///
-/// The stack alignment required for IA-32
+/// The stack alignment required for IA-32.
 ///
 #define CPU_STACK_ALIGNMENT   sizeof(UINTN)
 
@@ -301,53 +242,23 @@ typedef INT32   INTN;
   ///
 #elif defined(_MSC_EXTENSIONS)
   ///
-  /// Microsoft* compiler specific method for EFIAPI calling convension
+  /// Microsoft* compiler specific method for EFIAPI calling convention.
   /// 
   #define EFIAPI __cdecl  
-#else
-  #if defined(__GNUC__)
-    ///
-    /// GCC specific method for EFIAPI calling convension
-    /// 
-    #define EFIAPI __attribute__((cdecl))  
-  #endif  
-#endif
-
-//
-// The Microsoft* C compiler can removed references to unreferenced data items
-//  if the /OPT:REF linker option is used. We defined a macro as this is a 
-//  a non standard extension
-//
-#if defined(_MSC_EXTENSIONS)
+#elif defined(__GNUC__)
   ///
-  /// Remove global variable from the linked image if there are no references to 
-  /// it after all compiler and linker optimizations have been performed.
-  ///
-  #define GLOBAL_REMOVE_IF_UNREFERENCED __declspec(selectany)
+  /// GCC specific method for EFIAPI calling convention.
+  /// 
+  #define EFIAPI __attribute__((cdecl))  
 #else
   ///
-  /// Remove global variable from the linked image if there are no references to 
-  /// it after all compiler and linker optimizations have been performed.
+  /// The default for a non Microsoft* or GCC compiler is to assume the EFI ABI
+  /// is the standard. 
   ///
-  #define GLOBAL_REMOVE_IF_UNREFERENCED
+  #define EFIAPI
 #endif
 
-//
-// For symbol name in GNU assembly code, an extra "_" is necessary
-//
 #if defined(__GNUC__)
-  ///
-  /// Private worker functions for ASM_PFX()
-  ///
-  #define _CONCATENATE(a, b)  __CONCATENATE(a, b)
-  #define __CONCATENATE(a, b) a ## b
-
-  ///
-  /// The __USER_LABEL_PREFIX__ macro predefined by GNUC represents the prefix
-  /// on symbols in assembly language.
-  ///
-  #define ASM_PFX(name) _CONCATENATE (__USER_LABEL_PREFIX__, name)
-
   ///
   /// For GNU assembly code, .global or .globl can declare global symbols.
   /// Define this macro to unify the usage.