diff options
| -rw-r--r-- | MdePkg/Library/BasePeCoffLib/x64/PeCoffLoaderEx.c | 49 | ||||
| -rw-r--r-- | Tools/CCode/Source/PeCoffLoader/X64/PeCoffLoaderEx.c | 53 |
2 files changed, 51 insertions, 51 deletions
diff --git a/MdePkg/Library/BasePeCoffLib/x64/PeCoffLoaderEx.c b/MdePkg/Library/BasePeCoffLib/x64/PeCoffLoaderEx.c index 7141adc..8628dc7 100644 --- a/MdePkg/Library/BasePeCoffLib/x64/PeCoffLoaderEx.c +++ b/MdePkg/Library/BasePeCoffLib/x64/PeCoffLoaderEx.c @@ -1,16 +1,14 @@ /** @file
x64 Specific relocation fixups.
- Copyright (c) 2006, Intel Corporation
- All rights reserved. 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.
-
- Module Name: PeCoffLoaderEx.c
+Copyright (c) 2005 - 2006 Intel Corporation. <BR>
+All rights reserved. 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.
**/
@@ -22,13 +20,15 @@ @param FixupData Pointer to a buffer to log the fixups
@param Adjust The offset to adjust the fixup
+ @retval RETURN_SUCCESS Success to perform relocation
+ @retval RETURN_UNSUPPORTED Unsupported.
**/
RETURN_STATUS
PeCoffLoaderRelocateImageEx (
- IN UINT16 *Reloc,
- IN OUT CHAR8 *Fixup,
- IN OUT CHAR8 **FixupData,
- IN UINT64 Adjust
+ IN UINT16 *Reloc,
+ IN OUT CHAR8 *Fixup,
+ IN OUT CHAR8 **FixupData,
+ IN UINT64 Adjust
)
{
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
space for runtime calls.
@@ -84,5 +84,22 @@ PeHotRelocateImageEx ( 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;
}
diff --git a/Tools/CCode/Source/PeCoffLoader/X64/PeCoffLoaderEx.c b/Tools/CCode/Source/PeCoffLoader/X64/PeCoffLoaderEx.c index 1e6cc34..30db3e3 100644 --- a/Tools/CCode/Source/PeCoffLoader/X64/PeCoffLoaderEx.c +++ b/Tools/CCode/Source/PeCoffLoader/X64/PeCoffLoaderEx.c @@ -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
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
@@ -9,48 +10,30 @@ 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.
-
-Module Name:
-
- PeCoffLoaderEx.c
-
-Abstract:
-
- x64 Specific relocation fixups
-
-Revision History
-
---*/
+**/
#include <Common/UefiBaseTypes.h>
#include <Common/EfiImage.h>
#include <Library/PeCoffLib.h>
+/**
+ Performs an x64 specific relocation fixup
-
-
+ @param Reloc Pointer to the relocation record
+ @param Fixup Pointer to the address to fix up
+ @param FixupData Pointer to a buffer to log the fixups
+ @param Adjust The offset to adjust the fixup
+
+ @retval RETURN_SUCCESS Success to perform relocation
+ @retval RETURN_UNSUPPORTED Unsupported.
+**/
RETURN_STATUS
PeCoffLoaderRelocateImageEx (
- IN UINT16 *Reloc,
- IN OUT CHAR8 *Fixup,
- IN OUT CHAR8 **FixupData,
- IN UINT64 Adjust
+ IN UINT16 *Reloc,
+ IN OUT CHAR8 *Fixup,
+ IN OUT CHAR8 **FixupData,
+ IN UINT64 Adjust
)
-/*++
-
-Routine Description:
- Performs an x64 specific relocation fixup
-
-Arguments:
- Reloc - Pointer to the relocation record
- Fixup - Pointer to the address to fix up
- FixupData - Pointer to a buffer to log the fixups
- Adjust - The offset to adjust the fixup
-
-Returns:
- None
-
---*/
{
UINT64 *F64;
|