Output DxeCore Entrypoint in DxeIpl module, and make dxecore module can correctly...

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

diff --git a/EdkModulePkg/Core/Dxe/Hand/handle.c b/EdkModulePkg/Core/Dxe/Hand/handle.c
index f958bff63ffa06be8c502173d9524c9cb708c1e3..f0dea716df991d28c98f70ff7cbe2a827e5cb62a 100644 (file)
--- a/EdkModulePkg/Core/Dxe/Hand/handle.c
+++ b/EdkModulePkg/Core/Dxe/Hand/handle.c
@@ -449,7 +449,7 @@ Returns:
   //\r
   // Print debug message\r
   //\r
   //\r
   // Print debug message\r
   //\r

-  DEBUG((EFI_D_ERROR | EFI_D_INFO, "InstallProtocolInterface: %g %x\n", Protocol, Interface));\r
+  DEBUG((EFI_D_ERROR | EFI_D_INFO, "InstallProtocolInterface: %g %p\n", Protocol, Interface));\r

 \r
   Status = EFI_OUT_OF_RESOURCES;\r
   Prot = NULL;\r
 \r
   Status = EFI_OUT_OF_RESOURCES;\r
   Prot = NULL;\r

diff --git a/EdkModulePkg/Core/Dxe/Image/Image.c b/EdkModulePkg/Core/Dxe/Image/Image.c
index 7810e6b09393291c5e1a8d5bd5bf35114d72b2fc..9d585a94ea4b52ea8a5fafa219fc2af9c2b36554 100644 (file)
--- a/EdkModulePkg/Core/Dxe/Image/Image.c
+++ b/EdkModulePkg/Core/Dxe/Image/Image.c
@@ -456,7 +456,7 @@ Returns:
     UINTN StartIndex;\r
     CHAR8 EfiFileName[256];\r
 \r
     UINTN StartIndex;\r
     CHAR8 EfiFileName[256];\r
 \r

-    DEBUG ((EFI_D_INFO | EFI_D_LOAD, "Loading driver at 0x%08x EntryPoint=0x%08x ", (UINTN)Image->ImageContext.ImageAddress, (UINTN)Image->ImageContext.EntryPoint));\r
+    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));\r

     if (Image->ImageContext.PdbPointer != NULL) {\r
       StartIndex = 0;\r
       for (Index = 0; Image->ImageContext.PdbPointer[Index] != 0; Index++) {\r
     if (Image->ImageContext.PdbPointer != NULL) {\r
       StartIndex = 0;\r
       for (Index = 0; Image->ImageContext.PdbPointer[Index] != 0; Index++) {\r


@@ -979,7 +979,7 @@ Returns:
     //\r
     DEBUG_CODE_BEGIN ();\r
       if (EFI_ERROR (Image->Status)) {\r
     //\r
     DEBUG_CODE_BEGIN ();\r
       if (EFI_ERROR (Image->Status)) {\r

-        DEBUG ((EFI_D_ERROR, "Error: Image at %08X start failed: %x\n", Image->Info.ImageBase, Image->Status));\r
+        DEBUG ((EFI_D_ERROR, "Error: Image at %10p start failed: %r\n", Image->Info.ImageBase, Image->Status));\r

       }\r
     DEBUG_CODE_END ();\r
 \r
       }\r
     DEBUG_CODE_END ();\r
 \r

diff --git a/EdkModulePkg/Core/DxeIplPeim/DxeLoad.c b/EdkModulePkg/Core/DxeIplPeim/DxeLoad.c
index 3b04ed1b107902fed55ac2d9c478d16dcaab0270..8dbc3763d656cd4e97481df19abfd6cbb2eea2b0 100644 (file)
--- a/EdkModulePkg/Core/DxeIplPeim/DxeLoad.c
+++ b/EdkModulePkg/Core/DxeIplPeim/DxeLoad.c
@@ -309,7 +309,7 @@ Returns:
       );\r
   }\r
 \r
       );\r
   }\r
 \r

-  DEBUG ((EFI_D_INFO, "DXE Core Entry\n"));\r
+  DEBUG ((EFI_D_INFO, "DXE Core Entry Point 0x%08x\n", (UINTN) DxeCoreEntryPoint));\r

   HandOffToDxeCore (DxeCoreEntryPoint, HobList);\r
   //\r
   // If we get here, then the DXE Core returned.  This is an error\r
   HandOffToDxeCore (DxeCoreEntryPoint, HobList);\r
   //\r
   // If we get here, then the DXE Core returned.  This is an error\r

diff --git a/MdePkg/Include/Guid/FileInfo.h b/MdePkg/Include/Guid/FileInfo.h
index 55cf6ae38e4bbffd19007bfbb1540c641e3e408c..01cccf97ad23acb3f14d86a0f92d5e57114bb05a 100644 (file)
--- a/MdePkg/Include/Guid/FileInfo.h
+++ b/MdePkg/Include/Guid/FileInfo.h
@@ -1,5 +1,5 @@
 /** @file\r
 /** @file\r

-  SimpleFileSystem protocol as defined in the EFI 1.0 specification.\r
+  SimpleFileSystem guid and data structure as defined in the EFI 1.0 specification.\r

 \r
   The SimpleFileSystem protocol is the programatic access to the FAT (12,16,32) \r
   file system specified in EFI 1.0. It can also be used to abstract any \r
 \r
   The SimpleFileSystem protocol is the programatic access to the FAT (12,16,32) \r
   file system specified in EFI 1.0. It can also be used to abstract any \r

diff --git a/MdePkg/Include/Guid/FileSystemInfo.h b/MdePkg/Include/Guid/FileSystemInfo.h
index f6e7488a082caf9c558998a6201292757b4fdb8f..a890c3871c16b28f2e86a3f1bc6f52f83fe3d74c 100644 (file)
--- a/MdePkg/Include/Guid/FileSystemInfo.h
+++ b/MdePkg/Include/Guid/FileSystemInfo.h
@@ -1,5 +1,5 @@
 /** @file\r
 /** @file\r

-  FileSystemInfo protocol as defined in the EFI 1.0 specification.\r
+  FileSystemInfo guid and data structure as defined in the EFI 1.0 specification.\r

 \r
   Copyright (c) 2006, Intel Corporation                                                         \r
   All rights reserved. This program and the accompanying materials                          \r
 \r
   Copyright (c) 2006, Intel Corporation                                                         \r
   All rights reserved. This program and the accompanying materials                          \r

diff --git a/MdePkg/Include/Guid/FileSystemVolumeLabelInfo.h b/MdePkg/Include/Guid/FileSystemVolumeLabelInfo.h
index baba2764dbbf6ad1a5cde39492d314df036952d0..53236a616a8573be9af63c3236e7f07ec8e81549 100644 (file)
--- a/MdePkg/Include/Guid/FileSystemVolumeLabelInfo.h
+++ b/MdePkg/Include/Guid/FileSystemVolumeLabelInfo.h
@@ -1,5 +1,5 @@
 /** @file\r
 /** @file\r

-  FileSystemVolumeLabelInfo protocol as defined in the EFI 1.0 specification.\r
+  FileSystemVolumeLabelInfo guid and data structure as defined in the EFI 1.0 specification.\r

 \r
   Copyright (c) 2006, Intel Corporation                                                         \r
   All rights reserved. This program and the accompanying materials                          \r
 \r
   Copyright (c) 2006, Intel Corporation                                                         \r
   All rights reserved. This program and the accompanying materials                          \r