tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-09-25 02:37:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

BaseUeImageLib: Refactored out unused code.

Browse Source
This commit is contained in:
Mikhail Krichanov 2023-09-29 11:49:40 +03:00 committed by MikhailKrichanov
parent e33395096c
commit 923004dd69
2 changed files with 20 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
MdePkg/Library/BaseUeImageLib/UeImageLib.c
View File

@ -27,8 +27,6 @@ struct UE_LOADER_RUNTIME_CONTEXT_ {
UINT64 *FixupData; UINT64 *FixupData;
UINT32 UnchainedRelocsSize; UINT32 UnchainedRelocsSize;
UINT8 *UnchainedRelocs; UINT8 *UnchainedRelocs;
UINT32 RelocTableSize;
UINT8 RelocTable[];
}; };
typedef union { typedef union {
@ -430,14 +428,11 @@ UeLoaderGetRuntimeContextSize (
{ {
ASSERT (Context != NULL); ASSERT (Context != NULL);
ASSERT (Size != NULL); ASSERT (Size != NULL);
//
// FIXME: Do we need bookkeeping? Can we prevent relocs to writable segments? *Size = sizeof (UE_LOADER_RUNTIME_CONTEXT);
//
*Size = sizeof (UE_LOADER_RUNTIME_CONTEXT) + Context->RelocTableSize;
return RETURN_SUCCESS; return RETURN_SUCCESS;
} }
// FIXME:!!!
/** /**
Apply an image relocation fixup. Apply an image relocation fixup.
@ -716,12 +711,12 @@ UnchainReloc (
STATIC STATIC
RETURN_STATUS RETURN_STATUS
InternalProcessRelocChain ( InternalProcessRelocChain (
IN OUT VOID *Image, IN OUT VOID *Image,
IN UINT32 ImageSize, IN UINT32 ImageSize,
IN UINT8 Machine, IN UINT8 Machine,
IN UINT16 FirstRelocType, IN UINT16 FirstRelocType,
IN UINT32 *ChainStart, IN UINT32 *ChainStart,
IN UINT64 Adjust, IN UINT64 Adjust,
IN OUT UE_LOADER_RUNTIME_CONTEXT *RuntimeContext OPTIONAL IN OUT UE_LOADER_RUNTIME_CONTEXT *RuntimeContext OPTIONAL
) )
{ {
@ -848,16 +843,16 @@ InternalProcessRelocChain (
STATIC STATIC
RETURN_STATUS RETURN_STATUS
InternaRelocateImage ( InternaRelocateImage (
IN OUT VOID *Image, IN OUT VOID *Image,
IN UINT32 ImageSize, IN UINT32 ImageSize,
IN UINT8 Machine, IN UINT8 Machine,
IN UINT64 OldBaseAddress, IN UINT64 OldBaseAddress,
IN CONST VOID *RelocTable, IN CONST VOID *RelocTable,
IN UINT32 RelocTableSize, IN UINT32 RelocTableSize,
IN BOOLEAN Chaining, IN BOOLEAN Chaining,
IN UINT64 BaseAddress, IN UINT64 BaseAddress,
OUT UE_LOADER_RUNTIME_CONTEXT *RuntimeContext OPTIONAL, OUT UE_LOADER_RUNTIME_CONTEXT *RuntimeContext OPTIONAL,
IN BOOLEAN IsRuntime IN BOOLEAN IsRuntime
) )
{ {
RETURN_STATUS Status; RETURN_STATUS Status;
@ -1056,7 +1051,7 @@ RETURN_STATUS
UeRelocateImage ( UeRelocateImage (
IN OUT UE_LOADER_IMAGE_CONTEXT *Context, IN OUT UE_LOADER_IMAGE_CONTEXT *Context,
IN UINT64 BaseAddress, IN UINT64 BaseAddress,
OUT UE_LOADER_RUNTIME_CONTEXT *RuntimeContext OPTIONAL, OUT UE_LOADER_RUNTIME_CONTEXT *RuntimeContext OPTIONAL,
IN UINT32 RuntimeContextSize IN UINT32 RuntimeContextSize
) )
{ {
@ -1077,15 +1072,7 @@ UeRelocateImage (
Chaining = (UeHdr->ImageInfo & UE_HEADER_IMAGE_INFO_CHAINED_FIXUPS) != 0; Chaining = (UeHdr->ImageInfo & UE_HEADER_IMAGE_INFO_CHAINED_FIXUPS) != 0;
if (RuntimeContext != NULL) { if (RuntimeContext != NULL) {
RuntimeContext->Machine = Context->Machine; RuntimeContext->Machine = Context->Machine;
RuntimeContext->RelocTableSize = Context->RelocTableSize;
ASSERT (Context->RelocTableSize <= RuntimeContextSize - sizeof (*RuntimeContext));
CopyMem (
RuntimeContext->RelocTable,
Context->FileBuffer + Context->LoadTablesFileOffset,
Context->RelocTableSize
);
} }
return InternaRelocateImage ( return InternaRelocateImage (
@ -1112,7 +1099,6 @@ UeRelocateImageForRuntime (
{ {
ASSERT (RuntimeContext != NULL); ASSERT (RuntimeContext != NULL);
// FIXME: Relocs to writable segments?
return InternaRelocateImage ( return InternaRelocateImage (
Image, Image,
ImageSize, ImageSize,

3
MdePkg/Library/BaseUefiImageLib/BaseUefiImageOnlyNonFvLib.inf
View File

@ -39,9 +39,8 @@
[FixedPcd] [FixedPcd]
gEfiMdePkgTokenSpaceGuid.PcdImageLoaderAlignmentPolicy gEfiMdePkgTokenSpaceGuid.PcdImageLoaderAlignmentPolicy
gEfiMdePkgTokenSpaceGuid.PcdImageLoaderLoadHeader gEfiMdePkgTokenSpaceGuid.PcdImageLoaderLoadHeader
gEfiMdePkgTokenSpaceGuid.PcdImageLoaderRemoveXForWX
gEfiMdePkgTokenSpaceGuid.PcdDebugRaisePropertyMask gEfiMdePkgTokenSpaceGuid.PcdDebugRaisePropertyMask
gEfiMdePkgTokenSpaceGuid.PcdImageLoaderRemoveXForWX
gEfiMdePkgTokenSpaceGuid.PcdUefiImageFormatSupportNonFv gEfiMdePkgTokenSpaceGuid.PcdUefiImageFormatSupportNonFv
gEfiMdePkgTokenSpaceGuid.PcdUefiImageFormatSupportFv gEfiMdePkgTokenSpaceGuid.PcdUefiImageFormatSupportFv