Handle new relocation type EFI_IMAGE_REL_BASED_DIR64 for X64.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2075 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
klu2 2006-12-08 03:43:57 +00:00
parent 1082de3167
commit 265c22cc33
2 changed files with 53 additions and 53 deletions

View File

@ -1,16 +1,14 @@
/** @file /** @file
x64 Specific relocation fixups. x64 Specific relocation fixups.
Copyright (c) 2006, Intel Corporation Copyright (c) 2005 - 2006 Intel Corporation. <BR>
All rights reserved. This program and the accompanying materials All rights reserved. This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
http://opensource.org/licenses/bsd-license.php http://opensource.org/licenses/bsd-license.php
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
Module Name: PeCoffLoaderEx.c
**/ **/
@ -22,13 +20,15 @@
@param FixupData Pointer to a buffer to log the fixups @param FixupData Pointer to a buffer to log the fixups
@param Adjust The offset to adjust the fixup @param Adjust The offset to adjust the fixup
@retval RETURN_SUCCESS Success to perform relocation
@retval RETURN_UNSUPPORTED Unsupported.
**/ **/
RETURN_STATUS RETURN_STATUS
PeCoffLoaderRelocateImageEx ( PeCoffLoaderRelocateImageEx (
IN UINT16 *Reloc, IN UINT16 *Reloc,
IN OUT CHAR8 *Fixup, IN OUT CHAR8 *Fixup,
IN OUT CHAR8 **FixupData, IN OUT CHAR8 **FixupData,
IN UINT64 Adjust IN UINT64 Adjust
) )
{ {
return RETURN_UNSUPPORTED; return RETURN_UNSUPPORTED;
@ -64,7 +64,7 @@ PeCoffLoaderImageFormatSupported (
/** /**
Performs an Itanium-based specific re-relocation fixup and is a no-op on other Performs an X64 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 instruction sets. This is used to re-relocated the image into the EFI virtual
space for runtime calls. space for runtime calls.
@ -84,5 +84,22 @@ PeHotRelocateImageEx (
IN UINT64 Adjust IN UINT64 Adjust
) )
{ {
return RETURN_UNSUPPORTED; UINT64 *F64;
switch ((*Reloc) >> 12) {
case EFI_IMAGE_REL_BASED_DIR64:
F64 = (UINT64 *) Fixup;
*FixupData = ALIGN_POINTER(*FixupData, sizeof(UINT64));
if (*(UINT64 *)(*FixupData) == *F64) {
*F64 = *F64 + (UINT64) Adjust;
}
*FixupData = *FixupData + sizeof(UINT64);
break;
default:
return RETURN_UNSUPPORTED;
}
return RETURN_SUCCESS;
} }

View File

@ -1,6 +1,7 @@
/*++ /**@file
x64 Specific relocation fixups.
Copyright 2005, Intel Corporation Copyright (c) 2005 - 2006 Intel Corporation. <BR>
All rights reserved. This program and the accompanying materials All rights reserved. This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -9,48 +10,30 @@ http://opensource.org/licenses/bsd-license.php
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
Module Name:
PeCoffLoaderEx.c
Abstract:
x64 Specific relocation fixups
Revision History
--*/
#include <Common/UefiBaseTypes.h> #include <Common/UefiBaseTypes.h>
#include <Common/EfiImage.h> #include <Common/EfiImage.h>
#include <Library/PeCoffLib.h> #include <Library/PeCoffLib.h>
/**
RETURN_STATUS
PeCoffLoaderRelocateImageEx (
IN UINT16 *Reloc,
IN OUT CHAR8 *Fixup,
IN OUT CHAR8 **FixupData,
IN UINT64 Adjust
)
/*++
Routine Description:
Performs an x64 specific relocation fixup Performs an x64 specific relocation fixup
Arguments: @param Reloc Pointer to the relocation record
Reloc - Pointer to the relocation record @param Fixup Pointer to the address to fix up
Fixup - Pointer to the address to fix up @param FixupData Pointer to a buffer to log the fixups
FixupData - Pointer to a buffer to log the fixups @param Adjust The offset to adjust the fixup
Adjust - The offset to adjust the fixup
@retval RETURN_SUCCESS Success to perform relocation
Returns: @retval RETURN_UNSUPPORTED Unsupported.
None **/
RETURN_STATUS
--*/ PeCoffLoaderRelocateImageEx (
IN UINT16 *Reloc,
IN OUT CHAR8 *Fixup,
IN OUT CHAR8 **FixupData,
IN UINT64 Adjust
)
{ {
UINT64 *F64; UINT64 *F64;