MdePkg/ProcessorBind: add defines for page allocation granularity

[mirror_edk2.git] / MdePkg / Include / Ia32 / ProcessorBind.h

diff --git a/MdePkg/Include/Ia32/ProcessorBind.h b/MdePkg/Include/Ia32/ProcessorBind.h
index 0ffb2ee29ad8fa28938febc2975d44823e28d706..8ba2348261a2c812275b4f4736f0997a9b050ff9 100644 (file)
--- a/MdePkg/Include/Ia32/ProcessorBind.h
+++ b/MdePkg/Include/Ia32/ProcessorBind.h
@@ -1,14 +1,14 @@
 /** @file\r
   Processor or Compiler specific defines and types for IA-32 architecture.\r
 \r
-  Copyright (c) 2006 - 2010, Intel Corporation<BR>                                                         \r
-  All rights reserved. This program and the accompanying materials                          \r
-  are licensed and made available under the terms and conditions of the BSD License         \r
-  which accompanies this distribution.  The full text of the license may be found at        \r
-  http://opensource.org/licenses/bsd-license.php                                            \r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under \r
+the terms and conditions of the BSD License that accompanies this distribution.  \r
+The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php.                                          \r
+    \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
 \r
 **/\r
 \r
@@ -16,7 +16,7 @@
 #define __PROCESSOR_BIND_H__\r
 \r
 ///\r
-/// Define the processor type so other code can make processor based choices\r
+/// Define the processor type so other code can make processor based choices.\r
 ///\r
 #define MDE_CPU_IA32\r
 \r
@@ -79,7 +79,7 @@
 #pragma warning ( disable : 4057 )\r
 \r
 //\r
-// ASSERT(FALSE) or while (TRUE) are legal constructes so supress this warning\r
+// ASSERT(FALSE) or while (TRUE) are legal constructs so suppress this warning\r
 //\r
 #pragma warning ( disable : 4127 )\r
 \r
@@ -93,33 +93,53 @@
 //\r
 #pragma warning ( disable : 4206 )\r
 \r
+#if _MSC_VER == 1800 || _MSC_VER == 1900\r
+\r
+//\r
+// Disable these warnings for VS2013.\r
+//\r
+\r
+//\r
+// This warning is for potentially uninitialized local variable, and it may cause false \r
+// positive issues in VS2013 and VS2015 build\r
+//\r
+#pragma warning ( disable : 4701 )\r
+  \r
+//\r
+// This warning is for potentially uninitialized local pointer variable, and it may cause \r
+// false positive issues in VS2013 and VS2015 build\r
+//\r
+#pragma warning ( disable : 4703 )\r
+  \r
+#endif\r
+\r
 #endif\r
 \r
 \r
 #if defined(_MSC_EXTENSIONS)\r
 \r
   //\r
-  // use Microsoft C complier dependent integer width types \r
+  // use Microsoft C compiler dependent integer width types\r
   //\r
 \r
   ///\r
-  /// 8-byte unsigned value\r
+  /// 8-byte unsigned value.\r
   ///\r
   typedef unsigned __int64    UINT64;\r
   ///\r
-  /// 8-byte signed value\r
+  /// 8-byte signed value.\r
   ///\r
   typedef __int64             INT64;\r
   ///\r
-  /// 4-byte unsigned value\r
+  /// 4-byte unsigned value.\r
   ///\r
   typedef unsigned __int32    UINT32;\r
   ///\r
-  /// 4-byte signed value\r
+  /// 4-byte signed value.\r
   ///\r
   typedef __int32             INT32;\r
   ///\r
-  /// 2-byte unsigned value\r
+  /// 2-byte unsigned value.\r
   ///\r
   typedef unsigned short      UINT16;\r
   ///\r
@@ -128,7 +148,7 @@
   ///\r
   typedef unsigned short      CHAR16;\r
   ///\r
-  /// 2-byte signed value\r
+  /// 2-byte signed value.\r
   ///\r
   typedef short               INT16;\r
   ///\r
@@ -137,36 +157,36 @@
   ///\r
   typedef unsigned char       BOOLEAN;\r
   ///\r
-  /// 1-byte unsigned value\r
+  /// 1-byte unsigned value.\r
   ///\r
   typedef unsigned char       UINT8;\r
   ///\r
-  /// 1-byte Character\r
+  /// 1-byte Character.\r
   ///\r
   typedef char                CHAR8;\r
   ///\r
-  /// 1-byte signed value\r
+  /// 1-byte signed value.\r
   ///\r
-  typedef char                INT8;\r
+  typedef signed char         INT8;\r
 #else  \r
   ///\r
-  /// 8-byte unsigned value\r
+  /// 8-byte unsigned value.\r
   ///\r
   typedef unsigned long long  UINT64;\r
   ///\r
-  /// 8-byte signed value\r
+  /// 8-byte signed value.\r
   ///\r
   typedef long long           INT64;\r
   ///\r
-  /// 4-byte unsigned value\r
+  /// 4-byte unsigned value.\r
   ///\r
   typedef unsigned int        UINT32;\r
   ///\r
-  /// 4-byte signed value\r
+  /// 4-byte signed value.\r
   ///\r
   typedef int                 INT32;\r
   ///\r
-  /// 2-byte unsigned value\r
+  /// 2-byte unsigned value.\r
   ///\r
   typedef unsigned short      UINT16;\r
   ///\r
@@ -175,7 +195,7 @@
   ///\r
   typedef unsigned short      CHAR16;\r
   ///\r
-  /// 2-byte signed value\r
+  /// 2-byte signed value.\r
   ///\r
   typedef short               INT16;\r
   ///\r
@@ -184,7 +204,7 @@
   ///\r
   typedef unsigned char       BOOLEAN;\r
   ///\r
-  /// 1-byte unsigned value\r
+  /// 1-byte unsigned value.\r
   ///\r
   typedef unsigned char       UINT8;\r
   ///\r
@@ -194,17 +214,17 @@
   ///\r
   /// 1-byte signed value\r
   ///\r
-  typedef char                INT8;\r
+  typedef signed char         INT8;\r
 #endif\r
 \r
 ///\r
-/// Unsigned value of native width.  (4 bytes on supported 32-bit processor instructions,\r
-/// 8 bytes on supported 64-bit processor instructions)\r
+/// Unsigned value of native width.  (4 bytes on supported 32-bit processor instructions;\r
+/// 8 bytes on supported 64-bit processor instructions.)\r
 ///\r
 typedef UINT32  UINTN;\r
 ///\r
-/// Signed value of native width.  (4 bytes on supported 32-bit processor instructions,\r
-/// 8 bytes on supported 64-bit processor instructions)\r
+/// Signed value of native width.  (4 bytes on supported 32-bit processor instructions;\r
+/// 8 bytes on supported 64-bit processor instructions.)\r
 ///\r
 typedef INT32   INTN;\r
 \r
@@ -222,15 +242,27 @@ typedef INT32   INTN;
 #define MAX_2_BITS  0xC0000000\r
 \r
 ///\r
-/// Maximum legal IA-32 address\r
+/// Maximum legal IA-32 address.\r
 ///\r
 #define MAX_ADDRESS   0xFFFFFFFF\r
 \r
 ///\r
-/// The stack alignment required for IA-32\r
+/// Maximum legal IA-32 INTN and UINTN values.\r
+///\r
+#define MAX_INTN   ((INTN)0x7FFFFFFF)\r
+#define MAX_UINTN  ((UINTN)0xFFFFFFFF)\r
+\r
+///\r
+/// The stack alignment required for IA-32.\r
 ///\r
 #define CPU_STACK_ALIGNMENT   sizeof(UINTN)\r
 \r
+///\r
+/// Page allocation granularity for IA-32.\r
+///\r
+#define DEFAULT_PAGE_ALLOCATION_GRANULARITY   (0x1000)\r
+#define RUNTIME_PAGE_ALLOCATION_GRANULARITY   (0x1000)\r
+\r
 //\r
 // Modifier to ensure that all protocol member functions and EFI intrinsics\r
 // use the correct C calling convention. All protocol member functions and\r
@@ -242,16 +274,20 @@ typedef INT32   INTN;
   ///\r
 #elif defined(_MSC_EXTENSIONS)\r
   ///\r
-  /// Microsoft* compiler specific method for EFIAPI calling convension\r
+  /// Microsoft* compiler specific method for EFIAPI calling convention.\r
   /// \r
   #define EFIAPI __cdecl  \r
+#elif defined(__GNUC__)\r
+  ///\r
+  /// GCC specific method for EFIAPI calling convention.\r
+  /// \r
+  #define EFIAPI __attribute__((cdecl))  \r
 #else\r
-  #if defined(__GNUC__)\r
-    ///\r
-    /// GCC specific method for EFIAPI calling convension\r
-    /// \r
-    #define EFIAPI __attribute__((cdecl))  \r
-  #endif  \r
+  ///\r
+  /// The default for a non Microsoft* or GCC compiler is to assume the EFI ABI\r
+  /// is the standard. \r
+  ///\r
+  #define EFIAPI\r
 #endif\r
 \r
 #if defined(__GNUC__)\r
@@ -274,5 +310,9 @@ typedef INT32   INTN;
 **/\r
 #define FUNCTION_ENTRY_POINT(FunctionPointer) (VOID *)(UINTN)(FunctionPointer)\r
 \r
+#ifndef __USER_LABEL_PREFIX__\r
+#define __USER_LABEL_PREFIX__ _\r
+#endif\r
+\r
 #endif\r
 \r