BaseTools: Clean up source files

[mirror_edk2.git] / BaseTools / Source / C / Include / IndustryStandard / PeImage.h

diff --git a/BaseTools/Source/C/Include/IndustryStandard/PeImage.h b/BaseTools/Source/C/Include/IndustryStandard/PeImage.h
index de0e90e223d112f6243bd7ddfd2af8e477d9ee72..6ce7fe527f84a14070a6f55ceba778b2b5955bd5 100644 (file)
--- a/BaseTools/Source/C/Include/IndustryStandard/PeImage.h
+++ b/BaseTools/Source/C/Include/IndustryStandard/PeImage.h
@@ -4,18 +4,17 @@
 \r
   @bug Fix text - doc as defined in MSFT EFI specification.\r
 \r
-  Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  Portions copyright (c) 2011 - 2013, ARM Ltd. All rights reserved.<BR>\r
 \r
   This program and the accompanying materials are licensed and made available\r
   under the terms and conditions of the BSD License which accompanies this\r
-  distribution.  The full text of the license may be found at:\r
+  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
 \r
-  File Name:  PeImage.h\r
-\r
 **/\r
 \r
 #ifndef __PE_IMAGE_H__\r
@@ -48,16 +47,18 @@
 #define IMAGE_FILE_MACHINE_X64      0x8664\r
 #define IMAGE_FILE_MACHINE_ARM      0x01c0  // Thumb only\r
 #define IMAGE_FILE_MACHINE_ARMT     0x01c2  // 32bit Mixed ARM and Thumb/Thumb 2  Little Endian\r
+#define IMAGE_FILE_MACHINE_ARM64    0xAA64  // 64bit ARM Architecture, Little Endian\r
 \r
 //\r
 // Support old names for backward compatible\r
 //\r
-#define EFI_IMAGE_MACHINE_IA32      IMAGE_FILE_MACHINE_I386 \r
-#define EFI_IMAGE_MACHINE_IA64      IMAGE_FILE_MACHINE_IA64  \r
-#define EFI_IMAGE_MACHINE_IPF       IMAGE_FILE_MACHINE_IA64  \r
-#define EFI_IMAGE_MACHINE_EBC       IMAGE_FILE_MACHINE_EBC  \r
+#define EFI_IMAGE_MACHINE_IA32      IMAGE_FILE_MACHINE_I386\r
+#define EFI_IMAGE_MACHINE_IA64      IMAGE_FILE_MACHINE_IA64\r
+#define EFI_IMAGE_MACHINE_IPF       IMAGE_FILE_MACHINE_IA64\r
+#define EFI_IMAGE_MACHINE_EBC       IMAGE_FILE_MACHINE_EBC\r
 #define EFI_IMAGE_MACHINE_X64       IMAGE_FILE_MACHINE_X64\r
 #define EFI_IMAGE_MACHINE_ARMT      IMAGE_FILE_MACHINE_ARMT\r
+#define EFI_IMAGE_MACHINE_AARCH64   IMAGE_FILE_MACHINE_ARM64\r
 \r
 #define EFI_IMAGE_DOS_SIGNATURE     0x5A4D      // MZ\r
 #define EFI_IMAGE_OS2_SIGNATURE     0x454E      // NE\r
@@ -474,23 +475,23 @@ typedef struct {
 //\r
 // x64 processor relocation types.\r
 //\r
-#define IMAGE_REL_AMD64_ABSOLUTE       0x0000\r
-#define IMAGE_REL_AMD64_ADDR64   0x0001\r
-#define IMAGE_REL_AMD64_ADDR32   0x0002\r
-#define IMAGE_REL_AMD64_ADDR32NB       0x0003\r
-#define IMAGE_REL_AMD64_REL32      0x0004\r
-#define IMAGE_REL_AMD64_REL32_1          0x0005\r
-#define IMAGE_REL_AMD64_REL32_2          0x0006\r
-#define IMAGE_REL_AMD64_REL32_3          0x0007\r
-#define IMAGE_REL_AMD64_REL32_4          0x0008\r
-#define IMAGE_REL_AMD64_REL32_5          0x0009\r
-#define IMAGE_REL_AMD64_SECTION          0x000A\r
-#define IMAGE_REL_AMD64_SECREL   0x000B\r
-#define IMAGE_REL_AMD64_SECREL7          0x000C\r
-#define IMAGE_REL_AMD64_TOKEN      0x000D\r
-#define IMAGE_REL_AMD64_SREL32   0x000E\r
-#define IMAGE_REL_AMD64_PAIR       0x000F\r
-#define IMAGE_REL_AMD64_SSPAN32          0x0010\r
+#define IMAGE_REL_AMD64_ABSOLUTE  0x0000\r
+#define IMAGE_REL_AMD64_ADDR64    0x0001\r
+#define IMAGE_REL_AMD64_ADDR32    0x0002\r
+#define IMAGE_REL_AMD64_ADDR32NB  0x0003\r
+#define IMAGE_REL_AMD64_REL32      0x0004\r
+#define IMAGE_REL_AMD64_REL32_1    0x0005\r
+#define IMAGE_REL_AMD64_REL32_2    0x0006\r
+#define IMAGE_REL_AMD64_REL32_3    0x0007\r
+#define IMAGE_REL_AMD64_REL32_4    0x0008\r
+#define IMAGE_REL_AMD64_REL32_5    0x0009\r
+#define IMAGE_REL_AMD64_SECTION    0x000A\r
+#define IMAGE_REL_AMD64_SECREL    0x000B\r
+#define IMAGE_REL_AMD64_SECREL7    0x000C\r
+#define IMAGE_REL_AMD64_TOKEN      0x000D\r
+#define IMAGE_REL_AMD64_SREL32    0x000E\r
+#define IMAGE_REL_AMD64_PAIR      0x000F\r
+#define IMAGE_REL_AMD64_SSPAN32    0x0010\r
 \r
 ///\r
 /// Based relocation format.\r
@@ -511,11 +512,11 @@ typedef struct {
 #define EFI_IMAGE_REL_BASED_HIGHLOW       3\r
 #define EFI_IMAGE_REL_BASED_HIGHADJ       4\r
 #define EFI_IMAGE_REL_BASED_MIPS_JMPADDR  5\r
+#define EFI_IMAGE_REL_BASED_ARM_MOV32A    5\r
+#define EFI_IMAGE_REL_BASED_ARM_MOV32T    7\r
 #define EFI_IMAGE_REL_BASED_IA64_IMM64    9\r
 #define EFI_IMAGE_REL_BASED_DIR64         10\r
 \r
-#define EFI_IMAGE_REL_BASED_ARM_THUMB_MOVW  11\r
-#define EFI_IMAGE_REL_BASED_ARM_THUMB_MOVT  12\r
 \r
 ///\r
 /// Line number format.\r
@@ -645,7 +646,7 @@ typedef struct {
 ///\r
 /// Debug Data Structure defined by Apple Mach-O to Coff utility\r
 ///\r
-#define CODEVIEW_SIGNATURE_MTOC  EFI_SIGNATURE_32('M', 'T', 'O', 'C')\r
+#define CODEVIEW_SIGNATURE_MTOC  SIGNATURE_32('M', 'T', 'O', 'C')\r
 typedef struct {\r
   UINT32    Signature;                       ///< "MTOC"\r
   EFI_GUID  MachOUuid;\r