Reviewed-By: Olivier Martin <olivier.mar...@arm.com> Harry had to do a similar clean-up when he added support for LLVM: https://github.com/ARM-software/edk2/commit/54cb35d53e691a856381efa2c0756d7bd7e2347a
-----Original Message----- From: Ard Biesheuvel [mailto:ard.biesheu...@linaro.org] Sent: 03 July 2015 10:40 To: edk2-devel@lists.sourceforge.net; michael.d.kin...@intel.com; jiewen....@intel.com; liming....@intel.com; jordan.l.jus...@intel.com Cc: ler...@redhat.com; Olivier Martin; Ard Biesheuvel Subject: [PATCH 1/6] MdePkg/BasePeCoffLib: remove redundant PeCoffLoaderEx.c for AARCH64 The AARCH64 specific implementations of PeCoffLoaderRelocateImageEx and PeHotRelocateImageEx only handle EFI_IMAGE_REL_BASED_DIR64 relocations. Since these are already handled by the respective callers, this is essentially dead code and can be removed. So add IMAGE_FILE_MACHINE_ARM64 support to the list of supported machines of the generic version, and use it for AARCH64 as well. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel <ard.biesheu...@linaro.org> --- MdePkg/Library/BasePeCoffLib/AArch64/PeCoffLoaderEx.c | 127 -------------------- MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf | 5 +- MdePkg/Library/BasePeCoffLib/PeCoffLoaderEx.c | 4 +- 3 files changed, 3 insertions(+), 133 deletions(-) diff --git a/MdePkg/Library/BasePeCoffLib/AArch64/PeCoffLoaderEx.c b/MdePkg/Library/BasePeCoffLib/AArch64/PeCoffLoaderEx.c deleted file mode 100644 index 7e4b4db45328..000000000000 --- a/MdePkg/Library/BasePeCoffLib/AArch64/PeCoffLoaderEx.c +++ /dev/null @@ -1,127 +0,0 @@ -/** @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 *Fixup64; - - switch ((*Reloc) >> 12) { - - case EFI_IMAGE_REL_BASED_DIR64: - Fixup64 = (UINT64 *) Fixup; - *Fixup64 = *Fixup64 + (UINT64) Adjust; - if (*FixupData != NULL) { - *FixupData = ALIGN_POINTER(*FixupData, sizeof(UINT64)); - *(UINT64 *)(*FixupData) = *Fixup64; - *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 576d72826c32..ff0580fbdf56 100644 --- a/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf +++ b/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf @@ -40,7 +40,7 @@ [Sources] BasePeCoffLibInternals.h BasePeCoff.c -[Sources.IA32, Sources.X64, Sources.EBC] +[Sources.IA32, Sources.X64, Sources.EBC, Sources.AARCH64] PeCoffLoaderEx.c [Sources.IPF] @@ -49,9 +49,6 @@ [Sources.IPF] [Sources.ARM] Arm/PeCoffLoaderEx.c -[Sources.AARCH64] - AArch64/PeCoffLoaderEx.c - [Packages] MdePkg/MdePkg.dec diff --git a/MdePkg/Library/BasePeCoffLib/PeCoffLoaderEx.c b/MdePkg/Library/BasePeCoffLib/PeCoffLoaderEx.c index 2ed58844d5d4..01825c85392b 100644 --- a/MdePkg/Library/BasePeCoffLib/PeCoffLoaderEx.c +++ b/MdePkg/Library/BasePeCoffLib/PeCoffLoaderEx.c @@ -44,7 +44,7 @@ PeCoffLoaderRelocateImageEx ( loading and relocating of the image type. It's up to the caller to support the entry point. - The IA32/X64 version PE/COFF loader/relocater both support IA32, X64 and EBC images. + The generic version PE/COFF loader/relocater supports IA32, X64, AARCH64 and EBC images. @param Machine The machine type from the PE Header. @@ -57,7 +57,7 @@ PeCoffLoaderImageFormatSupported ( ) { if ((Machine == IMAGE_FILE_MACHINE_I386) || (Machine == IMAGE_FILE_MACHINE_X64) || - (Machine == IMAGE_FILE_MACHINE_EBC)) { + (Machine == IMAGE_FILE_MACHINE_ARM64) || (Machine == + IMAGE_FILE_MACHINE_EBC)) { return TRUE; } -- 1.9.1 -- IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you. ARM Limited, Registered office 110 Fulbourn Road, Cambridge CB1 9NJ, Registered in England & Wales, Company No: 2557590 ARM Holdings plc, Registered office 110 Fulbourn Road, Cambridge CB1 9NJ, Registered in England & Wales, Company No: 2548782 ------------------------------------------------------------------------------ Don't Limit Your Business. Reach for the Cloud. GigeNET's Cloud Solutions provide you with the tools and support that you need to offload your IT needs and focus on growing your business. Configured For All Businesses. Start Your Cloud Today. https://www.gigenetcloud.com/ _______________________________________________ edk2-devel mailing list edk2-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/edk2-devel
