X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=MdePkg%2FInclude%2FEbc%2FProcessorBind.h;h=2ddab9995eb7869607f89559e90632bd15c57bc5;hp=da8b1a6d802a995420fd833e8cb69c1f0c1af59b;hb=HEAD;hpb=08855193cafebaa2e071ffb5f083bcb3cb6d4df0

diff --git a/MdePkg/Include/Ebc/ProcessorBind.h b/MdePkg/Include/Ebc/ProcessorBind.h
index da8b1a6d80..2ddab9995e 100644
--- a/MdePkg/Include/Ebc/ProcessorBind.h
+++ b/MdePkg/Include/Ebc/ProcessorBind.h
@@ -4,14 +4,8 @@
   We currently only have one EBC compiler so there may be some Intel compiler
   specific functions in this file.
 
-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 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.             
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
@@ -30,95 +24,105 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 ///
 /// 1-byte signed value
 ///
-typedef signed char           INT8;
+typedef signed char INT8;
 ///
 /// Logical Boolean.  1-byte value containing 0 for FALSE or a 1 for TRUE.  Other
 /// values are undefined.
 ///
-typedef unsigned char         BOOLEAN;
+typedef unsigned char BOOLEAN;
 ///
 /// 1-byte unsigned value.
 ///
-typedef unsigned char         UINT8;
+typedef unsigned char UINT8;
 ///
 /// 1-byte Character.
 ///
-typedef char                  CHAR8;
+typedef char CHAR8;
 ///
 /// 2-byte signed value.
 ///
-typedef short                 INT16;
+typedef short INT16;
 ///
 /// 2-byte unsigned value.
 ///
-typedef unsigned short        UINT16;
+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;
+typedef unsigned short CHAR16;
 ///
 /// 4-byte signed value.
 ///
-typedef int                   INT32;
+typedef int INT32;
 ///
 /// 4-byte unsigned value.
 ///
-typedef unsigned int          UINT32;
+typedef unsigned int UINT32;
 ///
 /// 8-byte signed value.
 ///
-typedef __int64               INT64;
+typedef __int64 INT64;
 ///
 /// 8-byte unsigned value.
 ///
-typedef unsigned __int64      UINT64;
+typedef unsigned __int64 UINT64;
 
 ///
 /// Signed value of native width.  (4 bytes on supported 32-bit processor instructions,
 /// 8 bytes on supported 64-bit processor instructions)
 /// "long" type scales to the processor native size with EBC compiler
 ///
-typedef long                  INTN;
+typedef long INTN;
 ///
 /// The unsigned value of native width.  (4 bytes on supported 32-bit processor instructions;
 /// 8 bytes on supported 64-bit processor instructions)
 /// "long" type scales to the processor native size with the EBC compiler.
 ///
-typedef unsigned long         UINTN;
+typedef unsigned long UINTN;
 
 ///
 /// A value of native width with the highest bit set.
 /// Scalable macro to set the most significant bit in a natural number.
 ///
-#define MAX_BIT     (1ULL << (sizeof (INTN) * 8 - 1)) 
+#define MAX_BIT  ((UINTN)((1ULL << (sizeof (INTN) * 8 - 1))))
 ///
 /// A value of native width with the two highest bits set.
 /// Scalable macro to set the most 2 significant bits in a natural number.
 ///
-#define MAX_2_BITS  (3ULL << (sizeof (INTN) * 8 - 2))
+#define MAX_2_BITS  ((UINTN)(3ULL << (sizeof (INTN) * 8 - 2)))
 
 ///
 /// Maximum legal EBC address
 ///
-#define MAX_ADDRESS   ((UINTN) ~0)
+#define MAX_ADDRESS  ((UINTN)(~0ULL >> (64 - sizeof (INTN) * 8)))
+
+///
+/// Maximum usable address at boot time (48 bits using 4 KB pages)
+///
+#define MAX_ALLOC_ADDRESS  MAX_ADDRESS
 
 ///
 /// Maximum legal EBC INTN and UINTN values.
 ///
-#define MAX_UINTN  ((UINTN) ~0)
-#define MAX_INTN   ((INTN)~MAX_BIT)
+#define MAX_UINTN  ((UINTN)(~0ULL >> (64 - sizeof (INTN) * 8)))
+#define MAX_INTN   ((INTN)(~0ULL >> (65 - sizeof (INTN) * 8)))
+
+///
+/// Minimum legal EBC INTN value.
+///
+#define MIN_INTN  (((INTN)-MAX_INTN) - 1)
 
 ///
 /// The stack alignment required for EBC
 ///
-#define CPU_STACK_ALIGNMENT   sizeof(UINTN)
+#define CPU_STACK_ALIGNMENT  sizeof(UINTN)
 
 ///
 /// Page allocation granularity for EBC
 ///
-#define DEFAULT_PAGE_ALLOCATION_GRANULARITY   (0x1000)
-#define RUNTIME_PAGE_ALLOCATION_GRANULARITY   (0x1000)
+#define DEFAULT_PAGE_ALLOCATION_GRANULARITY  (0x1000)
+#define RUNTIME_PAGE_ALLOCATION_GRANULARITY  (0x1000)
 
 ///
 /// Modifier to ensure that all protocol member functions and EFI intrinsics
@@ -126,27 +130,26 @@ typedef unsigned long         UINTN;
 /// EFI intrinsics are required to modify their member functions with EFIAPI.
 ///
 #ifdef EFIAPI
-  ///
-  /// If EFIAPI is already defined, then we use that definition.
-  ///
+///
+/// If EFIAPI is already defined, then we use that definition.
+///
 #else
-#define EFIAPI    
+#define EFIAPI
 #endif
 
 /**
   Return the pointer to the first instruction of a function given a function pointer.
-  On EBC architectures, these two pointer values are the same, 
+  On EBC architectures, these two pointer values are the same,
   so the implementation of this macro is very simple.
-  
+
   @param  FunctionPointer   A pointer to a function.
 
   @return The pointer to the first instruction of a function given a function pointer.
 **/
-#define FUNCTION_ENTRY_POINT(FunctionPointer) (VOID *)(UINTN)(FunctionPointer)
+#define FUNCTION_ENTRY_POINT(FunctionPointer)  (VOID *)(UINTN)(FunctionPointer)
 
 #ifndef __USER_LABEL_PREFIX__
 #define __USER_LABEL_PREFIX__
 #endif
 
-#endif 
-
+#endif