X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=MdePkg%2FInclude%2FIpf%2FProcessorBind.h;h=51885ca6135941c5e3d45183ed9126fe772ff840;hp=eb31c3f7bdb31b4eed26250964cfa49396576180;hb=08855193cafebaa2e071ffb5f083bcb3cb6d4df0;hpb=5cfbd055878dcca6f3e4081fc5c8805fd2ce7107

diff --git a/MdePkg/Include/Ipf/ProcessorBind.h b/MdePkg/Include/Ipf/ProcessorBind.h
index eb31c3f7bd..51885ca613 100644
--- a/MdePkg/Include/Ipf/ProcessorBind.h
+++ b/MdePkg/Include/Ipf/ProcessorBind.h
@@ -1,14 +1,14 @@
 /** @file
-  Processor or Compiler specific defines and types for Intel Itanium(TM).
+  Processor or Compiler specific defines and types for Intel Itanium(TM) processors.
 
-  Copyright (c) 2006 - 2008, 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
+Copyright (c) 2006 - 2013, 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.
 
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 **/
 
@@ -17,7 +17,7 @@
 
 
 ///
-/// 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_IPF
 
@@ -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
 
 
@@ -78,13 +84,13 @@
 #pragma warning ( disable : 4054 )
 
 //
-// ASSERT(FALSE) or while (TRUE) are legal constructes so supress this warning
+// ASSERT(FALSE) or while (TRUE) are legal constructs so suppress this warning
 //
 #pragma warning ( disable : 4127 )
 
 //
 // Can not cast a function pointer to a data pointer. We need to do this on
-// IPF to get access to the PLABEL.
+// Itanium processors to get access to the PLABEL.
 //
 #pragma warning ( disable : 4514 )
 
@@ -100,231 +106,114 @@
 
 #endif
 
-
-#if defined(__STDC_VERSION__) && (__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 compiler dependent integer width types
   //
-  #include <stdint.h>
 
   ///
-  /// Logical Boolean.  1-byte value containing 0 for FALSE or a 1 for TRUE.  Other
-  /// values are undefined.
+  /// 8-byte unsigned value.
+  ///
+  typedef unsigned __int64    UINT64;
   ///
-  typedef uint8_t   BOOLEAN;
+  /// 8-byte signed value.
   ///
-  /// 1-byte signed value
+  typedef __int64             INT64;
   ///
-  typedef int8_t    INT8;
+  /// 4-byte unsigned value.
   ///
-  /// 1-byte unsigned value
+  typedef unsigned __int32    UINT32;
   ///
-  typedef uint8_t   UINT8;
+  /// 4-byte signed value.
   ///
-  /// 2-byte signed value
+  typedef __int32             INT32;
   ///
-  typedef int16_t   INT16;
+  /// 2-byte unsigned value.
   ///
-  /// 2-byte unsigned value
+  typedef unsigned short      UINT16;
   ///
-  typedef uint16_t  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.
   ///
-  /// 4-byte signed value
+  typedef unsigned short      CHAR16;
   ///
-  typedef int32_t   INT32;
+  /// 2-byte signed value.
   ///
-  /// 4-byte unsigned value
+  typedef short               INT16;
   ///
-  typedef uint32_t  UINT32;
+  /// Logical Boolean.  1-byte value containing 0 for FALSE or a 1 for TRUE.  Other
+  /// values are undefined.
   ///
-  /// 8-byte signed value
+  typedef unsigned char       BOOLEAN;
   ///
-  typedef int64_t   INT64;
+  /// 1-byte unsigned value.
   ///
-  /// 8-byte unsigned value
+  typedef unsigned char       UINT8;
   ///
-  typedef uint64_t  UINT64;
+  /// 1-byte Character.
   ///
-  /// 1-byte Character
+  typedef char                CHAR8;
   ///
-  typedef char      CHAR8;
+  /// 1-byte signed value.
+  ///
+  typedef signed char         INT8;
+#else
+  ///
+  /// 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 uint16_t  CHAR16;
-
+  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 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 UINT64  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 INT64   INTN;
 
@@ -343,50 +232,51 @@ typedef INT64   INTN;
 #define MAX_2_BITS  0xC000000000000000ULL
 
 ///
-/// Maximum legal Itanium-based address
+/// The maximum legal Itanium-based address
 ///
 #define MAX_ADDRESS   0xFFFFFFFFFFFFFFFFULL
 
+///
+/// Maximum legal Itanium-based INTN and UINTN values.
+///
+#define MAX_INTN   ((INTN)0x7FFFFFFFFFFFFFFFULL)
+#define MAX_UINTN  ((UINTN)0xFFFFFFFFFFFFFFFFULL)
+
 ///
 /// Per the Itanium Software Conventions and Runtime Architecture Guide,
 /// section 3.3.4, IPF stack must always be 16-byte aligned.
 ///
 #define CPU_STACK_ALIGNMENT   16
 
+///
+/// Page allocation granularity for Itanium
+///
+#define DEFAULT_PAGE_ALLOCATION_GRANULARITY   (0x1000)
+#define RUNTIME_PAGE_ALLOCATION_GRANULARITY   (0x2000)
+
 //
 // Modifier to ensure that all protocol member functions and EFI intrinsics
 // use the correct C calling convention. All protocol member functions and
 // EFI intrinsics are required to modify their member functions with EFIAPI.
 //
-#if defined(_MSC_EXTENSIONS)
+#ifdef EFIAPI
+  ///
+  /// If EFIAPI is already defined, then we use that definition.
   ///
-  /// Microsoft* compiler specific method for EFIAPI calling convension
+#elif defined(_MSC_EXTENSIONS)
+  ///
+  /// Microsoft* compiler-specific method for EFIAPI calling convention.
   /// 
   #define EFIAPI __cdecl
 #else
   #define EFIAPI
 #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)
-  ///
-  /// 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)
-#else
-  ///
-  /// 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
-#endif
+///
+/// For GNU assembly code, .global or .globl can declare global symbols.
+/// Define this macro to unify the usage.
+///
+#define ASM_GLOBAL .globl
 
 ///
 /// A pointer to a function in IPF points to a plabel.
@@ -408,7 +298,7 @@ typedef struct {
 
 /**
   Return the pointer to the first instruction of a function given a function pointer.
-  For Itanium CPUs, all function calls are made through a PLABEL, so a pointer to a function 
+  For Itanium processors, all function calls are made through a PLABEL, so a pointer to a function 
   is actually a pointer to a PLABEL.  The pointer to the first instruction of the function 
   is contained within the PLABEL.  This macro may be used to retrieve a pointer to the first 
   instruction of a function independent of the CPU architecture being used.  This is very 
@@ -421,5 +311,9 @@ typedef struct {
 **/
 #define FUNCTION_ENTRY_POINT(FunctionPointer) (VOID *)(UINTN)(((EFI_PLABEL *)(FunctionPointer))->EntryPoint)
 
+#ifndef __USER_LABEL_PREFIX__
+#define __USER_LABEL_PREFIX__
+#endif
+
 #endif