MdePkg: Added ARM Aarch64 support to PE/COFF support

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Harry Liebel <Harry.Liebel@arm.com>
Signed-off-by: Olivier Martin <olivier.martin@arm.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>


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

3 files changed, 133 insertions, 2 deletions

diff --git a/MdePkg/Include/IndustryStandard/PeImage.h b/MdePkg/Include/IndustryStandard/PeImage.h
index c0e812873..1abe72971 100644
--- a/MdePkg/Include/IndustryStandard/PeImage.h
+++ b/MdePkg/Include/IndustryStandard/PeImage.h
@@ -4,7 +4,7 @@
   EFI_IMAGE_NT_HEADERS64 is for PE32+. 

 

   This file is coded to the Visual Studio, Microsoft Portable Executable and 

-  Common Object File Format Specification, Revision 8.0 - May 16, 2006. 

+  Common Object File Format Specification, Revision 8.3 - February 6, 2013.

   This file also includes some definitions in PI Specification, Revision 1.0.

 

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

@@ -39,6 +39,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define IMAGE_FILE_MACHINE_EBC             0x0EBC

 #define IMAGE_FILE_MACHINE_X64             0x8664

 #define IMAGE_FILE_MACHINE_ARMTHUMB_MIXED  0x01c2

+#define IMAGE_FILE_MACHINE_ARM64           0xAA64

 

 //

 // EXE file formats

diff --git a/MdePkg/Library/BasePeCoffLib/AArch64/PeCoffLoaderEx.c b/MdePkg/Library/BasePeCoffLib/AArch64/PeCoffLoaderEx.c
new file mode 100644
index 000000000..e14fce095
--- /dev/null
+++ b/MdePkg/Library/BasePeCoffLib/AArch64/PeCoffLoaderEx.c
@@ -0,0 +1,127 @@
+/** @file

+  Specific relocation fixups for ARM architecture.

+

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

+  Portions copyright (c) 2008 - 2010, Apple Inc. 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 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.

+

+**/

+

+#include "BasePeCoffLibInternals.h"

+#include <Library/BaseLib.h>

+

+// Note: Currently only large memory model is supported by UEFI relocation code.

+

+/**

+  Performs an AARCH64-based specific relocation fixup and is a no-op on other

+  instruction sets.

+

+  @param  Reloc       The pointer to the relocation record.

+  @param  Fixup       The pointer to the address to fix up.

+  @param  FixupData   The pointer to a buffer to log the fixups.

+  @param  Adjust      The offset to adjust the fixup.

+

+  @return Status code.

+

+**/

+RETURN_STATUS

+PeCoffLoaderRelocateImageEx (

+  IN UINT16      *Reloc,

+  IN OUT CHAR8   *Fixup,

+  IN OUT CHAR8   **FixupData,

+  IN UINT64      Adjust

+  )

+{

+  UINT64      *F64;

+

+  switch ((*Reloc) >> 12) {

+

+    case EFI_IMAGE_REL_BASED_DIR64:

+      F64 = (UINT64 *) Fixup;

+      *F64 = *F64 + (UINT64) Adjust;

+      if (*FixupData != NULL) {

+        *FixupData = ALIGN_POINTER(*FixupData, sizeof(UINT64));

+        *(UINT64 *)(*FixupData) = *F64;

+        *FixupData = *FixupData + sizeof(UINT64);

+      }

+      break;

+

+    default:

+      return RETURN_UNSUPPORTED;

+  }

+

+  return RETURN_SUCCESS;

+}

+

+/**

+  Returns TRUE if the machine type of PE/COFF image is supported. Supported

+  does not mean the image can be executed it means the PE/COFF loader supports

+  loading and relocating of the image type. It's up to the caller to support

+  the entry point.

+

+  @param  Machine   Machine type from the PE Header.

+

+  @return TRUE if this PE/COFF loader can load the image

+

+**/

+BOOLEAN

+PeCoffLoaderImageFormatSupported (

+  IN  UINT16  Machine

+  )

+{

+  if ((Machine == IMAGE_FILE_MACHINE_ARM64) || (Machine ==  IMAGE_FILE_MACHINE_EBC)) {

+    return TRUE;

+  }

+

+  return FALSE;

+}

+

+/**

+  Performs an ARM-based specific re-relocation fixup and is a no-op on other

+  instruction sets. This is used to re-relocated the image into the EFI virtual

+  space for runtime calls.

+

+  @param  Reloc       The pointer to the relocation record.

+  @param  Fixup       The pointer to the address to fix up.

+  @param  FixupData   The pointer to a buffer to log the fixups.

+  @param  Adjust      The offset to adjust the fixup.

+

+  @return Status code.

+

+**/

+RETURN_STATUS

+PeHotRelocateImageEx (

+  IN UINT16      *Reloc,

+  IN OUT CHAR8   *Fixup,

+  IN OUT CHAR8   **FixupData,

+  IN UINT64      Adjust

+  )

+{

+  UINT64  *Fixup64;

+

+  switch ((*Reloc) >> 12) {

+  case EFI_IMAGE_REL_BASED_DIR64:

+    Fixup64     = (UINT64 *) Fixup;

+    *FixupData  = ALIGN_POINTER (*FixupData, sizeof (UINT64));

+    if (*(UINT64 *) (*FixupData) == *Fixup64) {

+      *Fixup64 = *Fixup64 + (UINT64) Adjust;

+    }

+

+    *FixupData = *FixupData + sizeof (UINT64);

+    break;

+

+  default:

+    DEBUG ((EFI_D_ERROR, "PeHotRelocateEx:unknown fixed type\n"));

+    return RETURN_UNSUPPORTED;

+  }

+

+  return RETURN_SUCCESS;

+}

diff --git a/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf b/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
index 470ae8840..1cc979bd3 100644
--- a/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
+++ b/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
@@ -32,7 +32,7 @@
 

 

 #

-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC ARM

+#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC ARM AARCH64

 #

 

 [Sources]

@@ -48,6 +48,9 @@
 [Sources.ARM]

   Arm/PeCoffLoaderEx.c

 

+[Sources.AARCH64]

+  AArch64/PeCoffLoaderEx.c

+

 [Packages]

   MdePkg/MdePkg.dec