X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=MdeModulePkg%2FCore%2FDxe%2FDxeMain%2FDxeMain.c;fp=MdeModulePkg%2FCore%2FDxe%2FDxeMain%2FDxeMain.c;h=a458d6b64fee8415c33799d3d545e3e58e73b8c4;hp=20ff02f663b288da232a85bcceae8012219d14fd;hb=31ffa077fc8b21bfdecf4c75e2e9e2520dea0741;hpb=2a8b78cfd5f9e0f7f7a8c7111813054fb9040554 diff --git a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c index 20ff02f663..a458d6b64f 100644 --- a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c +++ b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c @@ -290,19 +290,6 @@ DxeMain ( Status = CoreInitializeImageServices (HobStart); ASSERT_EFI_ERROR (Status); - // - // Report DXE Core image information to the PE/COFF Extra Action Library - // - ZeroMem (&ImageContext, sizeof (ImageContext)); - ImageContext.ImageAddress = (EFI_PHYSICAL_ADDRESS)(UINTN)gDxeCoreLoadedImage->ImageBase; - ImageContext.PdbPointer = PeCoffLoaderGetPdbPointer ((VOID*)(UINTN)ImageContext.ImageAddress); - ImageContext.SizeOfHeaders = PeCoffGetSizeOfHeaders ((VOID*)(UINTN)ImageContext.ImageAddress); - Status = PeCoffLoaderGetEntryPoint ((VOID*)(UINTN)ImageContext.ImageAddress, &EntryPoint); - if (Status == EFI_SUCCESS) { - ImageContext.EntryPoint = (EFI_PHYSICAL_ADDRESS)(UINTN)EntryPoint; - } - PeCoffLoaderRelocateImageExtraAction (&ImageContext); - // // Initialize the Global Coherency Domain Services // @@ -316,6 +303,19 @@ DxeMain ( PERF_END (NULL,"PEI", NULL, 0) ; PERF_START (NULL,"DXE", NULL, 0) ; + // + // Report DXE Core image information to the PE/COFF Extra Action Library + // + ZeroMem (&ImageContext, sizeof (ImageContext)); + ImageContext.ImageAddress = (EFI_PHYSICAL_ADDRESS)(UINTN)gDxeCoreLoadedImage->ImageBase; + ImageContext.PdbPointer = PeCoffLoaderGetPdbPointer ((VOID*)(UINTN)ImageContext.ImageAddress); + ImageContext.SizeOfHeaders = PeCoffGetSizeOfHeaders ((VOID*)(UINTN)ImageContext.ImageAddress); + Status = PeCoffLoaderGetEntryPoint ((VOID*)(UINTN)ImageContext.ImageAddress, &EntryPoint); + if (Status == EFI_SUCCESS) { + ImageContext.EntryPoint = (EFI_PHYSICAL_ADDRESS)(UINTN)EntryPoint; + } + PeCoffLoaderRelocateImageExtraAction (&ImageContext); + // // Install the DXE Services Table into the EFI System Tables's Configuration Table //