Temporarily remove the immature "CONST" modifier.

Use FUNCTION_ENTRY_POINT macro to print the entry point of DXE core.

git-svn-id: https://edk2.tianocore.org/svn/edk2/trunk@5505 de2fecce-e211-0410-80a6-f3fac2684e05

diff --git a/edk2/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c b/edk2/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
index 3b8245d..fff08b3 100644 (file)
--- a/edk2/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
+++ b/edk2/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
@@ -25,19 +25,19 @@ BOOLEAN gInMemory = FALSE;
 // Module Globals used in the DXE to PEI handoff\r
 // These must be module globals, so the stack can be switched\r
 //\r
 // Module Globals used in the DXE to PEI handoff\r
 // These must be module globals, so the stack can be switched\r
 //\r

-CONST EFI_DXE_IPL_PPI mDxeIplPpi = {\r
+EFI_DXE_IPL_PPI mDxeIplPpi = {\r

   DxeLoadCore\r
 };\r
 \r
   DxeLoadCore\r
 };\r
 \r

-CONST EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI mCustomGuidedSectionExtractionPpi = {\r
+EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI mCustomGuidedSectionExtractionPpi = {\r

   CustomGuidedSectionExtract\r
 };\r
 \r
   CustomGuidedSectionExtract\r
 };\r
 \r

-CONST EFI_PEI_DECOMPRESS_PPI mDecompressPpi = {\r
+EFI_PEI_DECOMPRESS_PPI mDecompressPpi = {\r

   Decompress\r
 };\r
 \r
   Decompress\r
 };\r
 \r

-CONST EFI_PEI_PPI_DESCRIPTOR     mPpiList[] = {\r
+EFI_PEI_PPI_DESCRIPTOR     mPpiList[] = {\r

   {\r
     EFI_PEI_PPI_DESCRIPTOR_PPI,\r
     &gEfiDxeIplPpiGuid,\r
   {\r
     EFI_PEI_PPI_DESCRIPTOR_PPI,\r
     &gEfiDxeIplPpiGuid,\r


@@ -50,7 +50,7 @@ CONST EFI_PEI_PPI_DESCRIPTOR     mPpiList[] = {
   }\r
 };\r
 \r
   }\r
 };\r
 \r

-CONST EFI_PEI_PPI_DESCRIPTOR     mPpiSignal = {\r
+EFI_PEI_PPI_DESCRIPTOR     mPpiSignal = {\r

   (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),\r
   &gEfiEndOfPeiSignalPpiGuid,\r
   NULL\r
   (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),\r
   &gEfiEndOfPeiSignalPpiGuid,\r
   NULL\r


@@ -238,15 +238,8 @@ DxeLoadCore (
     PcdGet32(PcdStatusCodeValuePeiHandoffToDxe)\r
     );\r
 \r
     PcdGet32(PcdStatusCodeValuePeiHandoffToDxe)\r
     );\r
 \r

-  DEBUG_CODE_BEGIN ();\r
+  DEBUG ((DEBUG_INFO | DEBUG_LOAD, "Loading DXE CORE at 0x%10p EntryPoint=0x%10p\n", (VOID *)(UINTN)DxeCoreAddress, FUNCTION_ENTRY_POINT (DxeCoreEntryPoint)));\r

 \r
 \r

-    EFI_IMAGE_OPTIONAL_HEADER_PTR_UNION       PtrPeImage;\r
-    PtrPeImage.Pe32 = (EFI_IMAGE_NT_HEADERS32 *) ((UINTN) DxeCoreAddress + ((EFI_IMAGE_DOS_HEADER *) (UINTN) DxeCoreAddress)->e_lfanew);\r
-     \r
-    DEBUG ((DEBUG_INFO | DEBUG_LOAD, "Loading DXE CORE at 0x%10p EntryPoint=0x%10p\n", (VOID *)(UINTN)DxeCoreAddress, FUNCTION_ENTRY_POINT (DxeCoreEntryPoint)));\r
-   \r
-\r
-  DEBUG_CODE_END ();\r

   //\r
   // Transfer control to the DXE Core\r
   // The handoff state is simply a pointer to the HOB list\r
   //\r
   // Transfer control to the DXE Core\r
   // The handoff state is simply a pointer to the HOB list\r