Move registration of DXE Core with PeCoffExtraActionLib after the lib constructors have been executed.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10778 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 11 insertions, 3 deletions

diff --git a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
index b18f92d408..3dfabd87e5 100644
--- a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
+++ b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
@@ -237,9 +237,10 @@ DxeMain (
   IN  VOID *HobStart

   )

 {

-  EFI_STATUS                         Status;

-  EFI_PHYSICAL_ADDRESS               MemoryBaseAddress;

-  UINT64                             MemoryLength;

+  EFI_STATUS                    Status;

+  EFI_PHYSICAL_ADDRESS          MemoryBaseAddress;

+  UINT64                        MemoryLength;

+  PE_COFF_LOADER_IMAGE_CONTEXT  ImageContext;

 

   //

   // Initialize Debug Agent to support source level debug in DXE phase

@@ -277,6 +278,13 @@ DxeMain (
   PERF_START (NULL,"DXE", NULL, 0) ;

 

   //

+  // Report DXE Core image information to the PE/COFF Extra Action Library

+  //

+  ImageContext.ImageAddress = (EFI_PHYSICAL_ADDRESS)(UINTN)gDxeCoreLoadedImage->ImageBase;

+  ImageContext.PdbPointer = PeCoffLoaderGetPdbPointer ((VOID*) (UINTN) ImageContext.ImageAddress);

+  PeCoffLoaderRelocateImageExtraAction (&ImageContext);

+

+  //

   // Initialize the Global Coherency Domain Services

   //

   Status = CoreInitializeGcdServices (&HobStart, MemoryBaseAddress, MemoryLength);