From b32a39b3287e8f03b7701619e140f814a0a61a48 Mon Sep 17 00:00:00 2001
From: lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Wed, 29 Nov 2006 02:54:20 +0000
Subject: Output DxeCore Entrypoint in DxeIpl module, and make dxecore module
 can correctly output >4G module entry point address.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2033 6f19259b-4bc3-4df7-8a09-765794883524
---
 EdkModulePkg/Core/Dxe/Hand/handle.c             | 2 +-
 EdkModulePkg/Core/Dxe/Image/Image.c             | 4 ++--
 EdkModulePkg/Core/DxeIplPeim/DxeLoad.c          | 2 +-
 MdePkg/Include/Guid/FileInfo.h                  | 2 +-
 MdePkg/Include/Guid/FileSystemInfo.h            | 2 +-
 MdePkg/Include/Guid/FileSystemVolumeLabelInfo.h | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/EdkModulePkg/Core/Dxe/Hand/handle.c b/EdkModulePkg/Core/Dxe/Hand/handle.c
index f958bff63f..f0dea716df 100644
--- a/EdkModulePkg/Core/Dxe/Hand/handle.c
+++ b/EdkModulePkg/Core/Dxe/Hand/handle.c
@@ -449,7 +449,7 @@ Returns:
   //
   // Print debug message
   //
-  DEBUG((EFI_D_ERROR | EFI_D_INFO, "InstallProtocolInterface: %g %x\n", Protocol, Interface));
+  DEBUG((EFI_D_ERROR | EFI_D_INFO, "InstallProtocolInterface: %g %p\n", Protocol, Interface));
 
   Status = EFI_OUT_OF_RESOURCES;
   Prot = NULL;
diff --git a/EdkModulePkg/Core/Dxe/Image/Image.c b/EdkModulePkg/Core/Dxe/Image/Image.c
index 7810e6b093..9d585a94ea 100644
--- a/EdkModulePkg/Core/Dxe/Image/Image.c
+++ b/EdkModulePkg/Core/Dxe/Image/Image.c
@@ -456,7 +456,7 @@ Returns:
     UINTN StartIndex;
     CHAR8 EfiFileName[256];
 
-    DEBUG ((EFI_D_INFO | EFI_D_LOAD, "Loading driver at 0x%08x EntryPoint=0x%08x ", (UINTN)Image->ImageContext.ImageAddress, (UINTN)Image->ImageContext.EntryPoint));
+    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.PdbPointer != NULL) {
       StartIndex = 0;
       for (Index = 0; Image->ImageContext.PdbPointer[Index] != 0; Index++) {
@@ -979,7 +979,7 @@ Returns:
     //
     DEBUG_CODE_BEGIN ();
       if (EFI_ERROR (Image->Status)) {
-        DEBUG ((EFI_D_ERROR, "Error: Image at %08X start failed: %x\n", Image->Info.ImageBase, Image->Status));
+        DEBUG ((EFI_D_ERROR, "Error: Image at %10p start failed: %r\n", Image->Info.ImageBase, Image->Status));
       }
     DEBUG_CODE_END ();
 
diff --git a/EdkModulePkg/Core/DxeIplPeim/DxeLoad.c b/EdkModulePkg/Core/DxeIplPeim/DxeLoad.c
index 3b04ed1b10..8dbc3763d6 100644
--- a/EdkModulePkg/Core/DxeIplPeim/DxeLoad.c
+++ b/EdkModulePkg/Core/DxeIplPeim/DxeLoad.c
@@ -309,7 +309,7 @@ Returns:
       );
   }
 
-  DEBUG ((EFI_D_INFO, "DXE Core Entry\n"));
+  DEBUG ((EFI_D_INFO, "DXE Core Entry Point 0x%08x\n", (UINTN) DxeCoreEntryPoint));
   HandOffToDxeCore (DxeCoreEntryPoint, HobList);
   //
   // If we get here, then the DXE Core returned.  This is an error
diff --git a/MdePkg/Include/Guid/FileInfo.h b/MdePkg/Include/Guid/FileInfo.h
index 55cf6ae38e..01cccf97ad 100644
--- a/MdePkg/Include/Guid/FileInfo.h
+++ b/MdePkg/Include/Guid/FileInfo.h
@@ -1,5 +1,5 @@
 /** @file
-  SimpleFileSystem protocol as defined in the EFI 1.0 specification.
+  SimpleFileSystem guid and data structure as defined in the EFI 1.0 specification.
 
   The SimpleFileSystem protocol is the programatic access to the FAT (12,16,32) 
   file system specified in EFI 1.0. It can also be used to abstract any 
diff --git a/MdePkg/Include/Guid/FileSystemInfo.h b/MdePkg/Include/Guid/FileSystemInfo.h
index f6e7488a08..a890c3871c 100644
--- a/MdePkg/Include/Guid/FileSystemInfo.h
+++ b/MdePkg/Include/Guid/FileSystemInfo.h
@@ -1,5 +1,5 @@
 /** @file
-  FileSystemInfo protocol as defined in the EFI 1.0 specification.
+  FileSystemInfo guid and data structure as defined in the EFI 1.0 specification.
 
   Copyright (c) 2006, Intel Corporation                                                         
   All rights reserved. This program and the accompanying materials                          
diff --git a/MdePkg/Include/Guid/FileSystemVolumeLabelInfo.h b/MdePkg/Include/Guid/FileSystemVolumeLabelInfo.h
index baba2764db..53236a616a 100644
--- a/MdePkg/Include/Guid/FileSystemVolumeLabelInfo.h
+++ b/MdePkg/Include/Guid/FileSystemVolumeLabelInfo.h
@@ -1,5 +1,5 @@
 /** @file
-  FileSystemVolumeLabelInfo protocol as defined in the EFI 1.0 specification.
+  FileSystemVolumeLabelInfo guid and data structure as defined in the EFI 1.0 specification.
 
   Copyright (c) 2006, Intel Corporation                                                         
   All rights reserved. This program and the accompanying materials                          
-- 
cgit v1.2.3