Sync BaseTool trunk (version r2599) into EDKII BaseTools.

Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Heshen Chen <chen.heshen@intel.com>


git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14591 6f19259b-4bc3-4df7-8a09-765794883524

8 files changed, 338 insertions, 12 deletions

diff --git a/BaseTools/Source/C/Include/AArch64/ProcessorBind.h b/BaseTools/Source/C/Include/AArch64/ProcessorBind.h
new file mode 100644
index 0000000000..4d184c4c41
--- /dev/null
+++ b/BaseTools/Source/C/Include/AArch64/ProcessorBind.h
@@ -0,0 +1,159 @@
+/** @file

+  Processor or Compiler specific defines and types for AArch64.

+

+  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>

+  Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>

+  Portions copyright (c) 2013, ARM Ltd. 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.

+

+**/

+

+#ifndef __PROCESSOR_BIND_H__

+#define __PROCESSOR_BIND_H__

+

+///

+/// Define the processor type so other code can make processor based choices

+///

+#define MDE_CPU_AARCH64

+

+//

+// Make sure we are using the correct packing rules per EFI specification

+//

+#ifndef __GNUC__

+#pragma pack()

+#endif

+

+#if _MSC_EXTENSIONS

+  //

+  // use Microsoft* C complier dependent integer width types 

+  //

+  typedef unsigned __int64    UINT64;

+  typedef __int64             INT64;

+  typedef unsigned __int32    UINT32;

+  typedef __int32             INT32;

+  typedef unsigned short      UINT16;

+  typedef unsigned short      CHAR16;

+  typedef short               INT16;

+  typedef unsigned char       BOOLEAN;

+  typedef unsigned char       UINT8;

+  typedef char                CHAR8;

+  typedef signed char         INT8;

+#else

+  //

+  // Assume standard AARCH64 alignment.

+  //

+  typedef unsigned long long  UINT64;

+  typedef long long           INT64;

+  typedef unsigned int        UINT32;

+  typedef int                 INT32;

+  typedef unsigned short      UINT16;

+  typedef unsigned short      CHAR16;

+  typedef short               INT16;

+  typedef unsigned char       BOOLEAN;

+  typedef unsigned char       UINT8;

+  typedef char                CHAR8;

+  typedef signed char         INT8;

+

+  #define UINT8_MAX 0xff

+#endif

+

+///

+/// 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)

+///

+typedef INT64   INTN;

+

+//

+// Processor specific defines

+//

+

+///

+/// A value of native width with the highest bit set.

+///

+#define MAX_BIT      0x8000000000000000

+

+///

+/// A value of native width with the two highest bits set.

+///

+#define MAX_2_BITS   0xC000000000000000

+

+///

+/// Maximum legal AARCH64  address

+///

+#define MAX_ADDRESS  0xFFFFFFFFFFFFFFFF

+

+///

+/// The stack alignment required for AARCH64

+///

+#define CPU_STACK_ALIGNMENT  16

+

+//

+// 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.

+//

+#define EFIAPI

+

+#if defined(__GNUC__)

+  ///

+  /// For GNU assembly code, .global or .globl can declare global symbols.

+  /// Define this macro to unify the usage.

+  ///

+  #define ASM_GLOBAL .globl

+

+  #if !defined(__APPLE__)

+    ///

+    /// ARM EABI defines that the linker should not manipulate call relocations

+    /// (do bl/blx conversion) unless the target symbol has function type.

+    /// CodeSourcery 2010.09 started requiring the .type to function properly

+    ///

+    #define INTERWORK_FUNC(func__)   .type ASM_PFX(func__), %function

+

+    #define GCC_ASM_EXPORT(func__)  \

+             .global  _CONCATENATE (__USER_LABEL_PREFIX__, func__)    ;\

+             .type ASM_PFX(func__), %function  

+

+    #define GCC_ASM_IMPORT(func__)  \

+             .extern  _CONCATENATE (__USER_LABEL_PREFIX__, func__)

+             

+  #else

+    //

+    // .type not supported by Apple Xcode tools 

+    //

+    #define INTERWORK_FUNC(func__)  

+

+    #define GCC_ASM_EXPORT(func__)  \

+             .globl  _CONCATENATE (__USER_LABEL_PREFIX__, func__)    \

+  

+    #define GCC_ASM_IMPORT(name)  

+

+  #endif

+#endif

+

+/**

+  Return the pointer to the first instruction of a function given a function pointer.

+  On ARM CPU 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)

+

+#endif

+

diff --git a/BaseTools/Source/C/Include/Arm/ProcessorBind.h b/BaseTools/Source/C/Include/Arm/ProcessorBind.h
new file mode 100644
index 0000000000..1ca26ab6f3
--- /dev/null
+++ b/BaseTools/Source/C/Include/Arm/ProcessorBind.h
@@ -0,0 +1,158 @@
+/** @file
+  Processor or Compiler specific defines and types for ARM.
+
+  Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
+  Portions copyright (c) 2008 - 2009, Apple Inc. 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.             
+
+**/
+
+#ifndef __PROCESSOR_BIND_H__
+#define __PROCESSOR_BIND_H__
+
+///
+/// Define the processor type so other code can make processor based choices
+///
+#define MDE_CPU_ARM
+
+//
+// Make sure we are using the correct packing rules per EFI specification
+//
+#ifndef __GNUC__
+#pragma pack()
+#endif
+
+#if _MSC_EXTENSIONS 
+  //
+  // use Microsoft* C complier dependent integer width types 
+  //
+  typedef unsigned __int64    UINT64;
+  typedef __int64             INT64;
+  typedef unsigned __int32    UINT32;
+  typedef __int32             INT32;
+  typedef unsigned short      UINT16;
+  typedef unsigned short      CHAR16;
+  typedef short               INT16;
+  typedef unsigned char       BOOLEAN;
+  typedef unsigned char       UINT8;
+  typedef char                CHAR8;
+  typedef signed char         INT8;
+#else
+  //
+  // Assume standard ARM alignment. 
+  //
+  typedef unsigned long long  UINT64;
+  typedef long long           INT64;
+  typedef unsigned int        UINT32;
+  typedef int                 INT32;
+  typedef unsigned short      UINT16;
+  typedef unsigned short      CHAR16;
+  typedef short               INT16;
+  typedef unsigned char       BOOLEAN;
+  typedef unsigned char       UINT8;
+  typedef char                CHAR8;
+  typedef signed char         INT8;
+
+  #define UINT8_MAX 0xff
+#endif
+
+///
+/// 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)
+///
+typedef INT32   INTN;
+
+//
+// Processor specific defines
+//
+
+///
+/// A value of native width with the highest bit set.
+///
+#define MAX_BIT      0x80000000
+
+///
+/// A value of native width with the two highest bits set.
+///
+#define MAX_2_BITS   0xC0000000
+
+///
+/// Maximum legal ARM address
+///
+#define MAX_ADDRESS  0xFFFFFFFF
+
+///
+/// The stack alignment required for ARM
+///
+#define CPU_STACK_ALIGNMENT  sizeof(UINT64)
+
+//
+// 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.
+//
+#define EFIAPI    
+
+#if defined(__GNUC__)
+  ///
+  /// For GNU assembly code, .global or .globl can declare global symbols.
+  /// Define this macro to unify the usage.
+  ///
+  #define ASM_GLOBAL .globl
+
+  #if !defined(__APPLE__)
+    ///
+    /// ARM EABI defines that the linker should not manipulate call relocations
+    /// (do bl/blx conversion) unless the target symbol has function type.
+    /// CodeSourcery 2010.09 started requiring the .type to function properly
+    ///
+    #define INTERWORK_FUNC(func__)   .type ASM_PFX(func__), %function
+
+    #define GCC_ASM_EXPORT(func__)  \
+             .global  _CONCATENATE (__USER_LABEL_PREFIX__, func__)    ;\
+             .type ASM_PFX(func__), %function  
+
+    #define GCC_ASM_IMPORT(func__)  \
+             .extern  _CONCATENATE (__USER_LABEL_PREFIX__, func__)
+             
+  #else
+    //
+    // .type not supported by Apple Xcode tools 
+    //
+    #define INTERWORK_FUNC(func__)  
+
+    #define GCC_ASM_EXPORT(func__)  \
+             .globl  _CONCATENATE (__USER_LABEL_PREFIX__, func__)    \
+  
+    #define GCC_ASM_IMPORT(name)  
+
+  #endif
+#endif
+
+/**
+  Return the pointer to the first instruction of a function given a function pointer.
+  On ARM CPU 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)
+
+#endif
+
+
diff --git a/BaseTools/Source/C/Include/Common/BuildVersion.h b/BaseTools/Source/C/Include/Common/BuildVersion.h
index 5b50a5c28e..764bebfa93 100644
--- a/BaseTools/Source/C/Include/Common/BuildVersion.h
+++ b/BaseTools/Source/C/Include/Common/BuildVersion.h
@@ -14,4 +14,4 @@
 

 **/

 

-#define __BUILD_VERSION "Build 2524"

+#define __BUILD_VERSION ""

diff --git a/BaseTools/Source/C/Include/Common/UefiInternalFormRepresentation.h b/BaseTools/Source/C/Include/Common/UefiInternalFormRepresentation.h
index 82d391ce3a..3cd22d1347 100644
--- a/BaseTools/Source/C/Include/Common/UefiInternalFormRepresentation.h
+++ b/BaseTools/Source/C/Include/Common/UefiInternalFormRepresentation.h
@@ -783,9 +783,9 @@ typedef struct _EFI_IFR_IMAGE {
   EFI_IMAGE_ID             Id;

 } EFI_IFR_IMAGE;

 

-typedef struct _EFI_IFR_MODAL {

+typedef struct _EFI_IFR_MODAL_TAG {

   EFI_IFR_OP_HEADER        Header;

-} EFI_IFR_MODAL;

+} EFI_IFR_MODAL_TAG;

 

 typedef struct _EFI_IFR_LOCKED {

   EFI_IFR_OP_HEADER        Header;

@@ -803,6 +803,12 @@ typedef struct _EFI_IFR_DEFAULT {
   EFI_IFR_TYPE_VALUE       Value;

 } EFI_IFR_DEFAULT;

 

+typedef struct _EFI_IFR_DEFAULT_2 {

+  EFI_IFR_OP_HEADER        Header;

+  UINT16                   DefaultId;

+  UINT8                    Type;

+} EFI_IFR_DEFAULT_2;

+

 typedef struct _EFI_IFR_VALUE {

   EFI_IFR_OP_HEADER        Header;

 } EFI_IFR_VALUE;

diff --git a/BaseTools/Source/C/Include/Common/UefiMultiPhase.h b/BaseTools/Source/C/Include/Common/UefiMultiPhase.h
index 11c587e862..7c487471a8 100644
--- a/BaseTools/Source/C/Include/Common/UefiMultiPhase.h
+++ b/BaseTools/Source/C/Include/Common/UefiMultiPhase.h
@@ -1,7 +1,7 @@
 /** @file

   This includes some definitions introduced in UEFI that will be used in both PEI and DXE phases.

 

-  Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>

+  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 which accompanies this

@@ -117,9 +117,9 @@ typedef struct _WIN_CERTIFICATE {
 // WIN_CERTIFICATE_UEFI_GUID.CertData

 // 

 typedef struct _EFI_CERT_BLOCK_RSA_2048_SHA256 {

-  UINT32  HashType;

-  UINT8   PublicKey[256];

-  UINT8   Signature[256];

+  EFI_GUID  HashType;

+  UINT8     PublicKey[256];

+  UINT8     Signature[256];

 } EFI_CERT_BLOCK_RSA_2048_SHA256;

 

 

@@ -127,7 +127,7 @@ typedef struct _EFI_CERT_BLOCK_RSA_2048_SHA256 {
    

   @param Hdr  This is the standard WIN_CERTIFICATE header, where

               wCertificateType is set to

-              WIN_CERT_TYPE_UEFI_GUID.

+              WIN_CERT_TYPE_EFI_GUID.

 

   @param CertType   This is the unique id which determines the

                     format of the CertData. In this case, the

diff --git a/BaseTools/Source/C/Include/Ia32/ProcessorBind.h b/BaseTools/Source/C/Include/Ia32/ProcessorBind.h
index 20d559e2fd..f1ed522b42 100644
--- a/BaseTools/Source/C/Include/Ia32/ProcessorBind.h
+++ b/BaseTools/Source/C/Include/Ia32/ProcessorBind.h
@@ -1,7 +1,7 @@
 /** @file

   Processor or Compiler specific defines and types for x64.

 

-  Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>

+  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 which accompanies this

@@ -70,7 +70,7 @@
   #if _MSC_EXTENSIONS 

     

     //

-    // use Microsoft* C complier dependent interger width types 

+    // use Microsoft* C complier dependent integer width types 

     //

     typedef unsigned __int64    UINT64;

     typedef __int64             INT64;

diff --git a/BaseTools/Source/C/Include/IndustryStandard/PeImage.h b/BaseTools/Source/C/Include/IndustryStandard/PeImage.h
index 8eaf4c3e78..7e7c0ea46a 100644
--- a/BaseTools/Source/C/Include/IndustryStandard/PeImage.h
+++ b/BaseTools/Source/C/Include/IndustryStandard/PeImage.h
@@ -5,6 +5,7 @@
   @bug Fix text - doc as defined in MSFT EFI specification.

 

   Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>

+  Portions copyright (c) 2011 - 2013, ARM Ltd. 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

@@ -48,6 +49,7 @@
 #define IMAGE_FILE_MACHINE_X64      0x8664

 #define IMAGE_FILE_MACHINE_ARM      0x01c0  // Thumb only

 #define IMAGE_FILE_MACHINE_ARMT     0x01c2  // 32bit Mixed ARM and Thumb/Thumb 2  Little Endian

+#define IMAGE_FILE_MACHINE_ARM64    0xAA64  // 64bit ARM Architecture, Little Endian

 

 //

 // Support old names for backward compatible

@@ -58,6 +60,7 @@
 #define EFI_IMAGE_MACHINE_EBC       IMAGE_FILE_MACHINE_EBC  

 #define EFI_IMAGE_MACHINE_X64       IMAGE_FILE_MACHINE_X64

 #define EFI_IMAGE_MACHINE_ARMT      IMAGE_FILE_MACHINE_ARMT

+#define EFI_IMAGE_MACHINE_AARCH64   IMAGE_FILE_MACHINE_ARM64

 

 #define EFI_IMAGE_DOS_SIGNATURE     0x5A4D      // MZ

 #define EFI_IMAGE_OS2_SIGNATURE     0x454E      // NE

diff --git a/BaseTools/Source/C/Include/X64/ProcessorBind.h b/BaseTools/Source/C/Include/X64/ProcessorBind.h
index 0bc02f043a..6f03dfa67d 100644
--- a/BaseTools/Source/C/Include/X64/ProcessorBind.h
+++ b/BaseTools/Source/C/Include/X64/ProcessorBind.h
@@ -1,7 +1,7 @@
 /** @file

   Processor or Compiler specific defines and types x64 (Intel(r) EM64T, AMD64).

 

-  Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>

+  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 which accompanies this

@@ -73,7 +73,7 @@
     

 

     //

-    // use Microsoft C complier dependent interger width types 

+    // use Microsoft C complier dependent integer width types 

     //

     typedef unsigned __int64    UINT64;

     typedef __int64             INT64;