Print real entry point for IPF image.

Print DxeCore Entry point and image address.
Set FileHandle = NULL when not found FFS file in PeiService PeiFfsFindNextFile. 

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

1 files changed, 19 insertions, 2 deletions

diff --git a/MdeModulePkg/Core/Dxe/Image/Image.c b/MdeModulePkg/Core/Dxe/Image/Image.c
index 31b1445..99170dc 100644
--- a/MdeModulePkg/Core/Dxe/Image/Image.c
+++ b/MdeModulePkg/Core/Dxe/Image/Image.c
@@ -446,8 +446,25 @@ Returns:
     UINTN Index;

     UINTN StartIndex;

     CHAR8 EfiFileName[256];

-

-    DEBUG ((EFI_D_INFO | EFI_D_LOAD, "Loading driver at 0x%10p EntryPoint=0x%10p ", (VOID *)(UINTN)Image->ImageContext.ImageAddress, (VOID *)(UINTN)Image->ImageContext.EntryPoint));

+    

+    if (Image->ImageContext.Machine != IMAGE_FILE_MACHINE_IA64) {

+      DEBUG ((EFI_D_INFO | EFI_D_LOAD, 

+              "Loading driver at 0x%10p EntryPoint=0x%10p ", 

+              (VOID *)(UINTN)Image->ImageContext.ImageAddress, 

+              (VOID *)(UINTN)Image->ImageContext.EntryPoint));

+    } else {

+      //

+      // For IPF Image, the real entry point should be print.

+      //      

+      DEBUG ((EFI_D_INFO | EFI_D_LOAD, 

+              "Loading driver at 0x%10p EntryPoint=0x%10p ", 

+              (VOID *)(UINTN)Image->ImageContext.ImageAddress, 

+              (VOID *)(UINTN)(*(UINT64 *)(UINTN)Image->ImageContext.EntryPoint)));

+    }

+    

+    //

+    // Print Module Name by Pdb file path

+    //

     if (Image->ImageContext.PdbPointer != NULL) {

       StartIndex = 0;

       for (Index = 0; Image->ImageContext.PdbPointer[Index] != 0; Index++) {