Use global variable gInMemory in place of gInMemoryGuid ppi in DxeIplX64 module to...

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

diff --git a/EdkModulePkg/Core/DxeIplX64Peim/DxeIplX64.msa b/EdkModulePkg/Core/DxeIplX64Peim/DxeIplX64.msa
index d6e1057785e733dc1910d2020bf65de2e498a69c..d9fcb9d3732ccd835c594fb864a49ac3bc3fcfc9 100644 (file)
--- a/EdkModulePkg/Core/DxeIplX64Peim/DxeIplX64.msa
+++ b/EdkModulePkg/Core/DxeIplX64Peim/DxeIplX64.msa
@@ -116,9 +116,6 @@
     <Ppi Usage="SOMETIMES_CONSUMED">\r
       <PpiCName>gEfiPeiSecurityPpiGuid</PpiCName>\r
     </Ppi>\r
-    <Ppi Usage="PRIVATE">\r
-      <PpiCName>gPeiInMemoryGuid</PpiCName>\r
-    </Ppi>\r
   </PPIs>\r
   <Guids>\r
     <GuidCNames Usage="ALWAYS_CONSUMED">\r

diff --git a/EdkModulePkg/Core/DxeIplX64Peim/DxeLoadX64.c b/EdkModulePkg/Core/DxeIplX64Peim/DxeLoadX64.c
index 990eec164cb81a982bf4dea6961b69a9f2d9fa0d..57ffb28f4ae00ea2b8f5cbe1fb1540237e369e62 100644 (file)
--- a/EdkModulePkg/Core/DxeIplX64Peim/DxeLoadX64.c
+++ b/EdkModulePkg/Core/DxeIplX64Peim/DxeLoadX64.c
@@ -52,12 +52,6 @@ static EFI_PEI_PPI_DESCRIPTOR     mPpiList = {
   &mDxeIplPpi\r
 };\r
 \r
-static EFI_PEI_PPI_DESCRIPTOR     mPpiPeiInMemory = {\r
-  (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),\r
-  &gPeiInMemoryGuid,\r
-  NULL\r
-};\r
-\r
 static EFI_PEI_PPI_DESCRIPTOR     mPpiSignal = {\r
   (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),\r
   &gEfiEndOfPeiSignalPpiGuid,\r
@@ -127,14 +121,7 @@ Returns:
 \r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  Status = PeiServicesLocatePpi (\r
-             &gPeiInMemoryGuid,\r
-             0,\r
-             NULL,\r
-             NULL\r
-             );\r
-\r
-  if (EFI_ERROR (Status) && (BootMode != BOOT_ON_S3_RESUME)) {   \r
+  if (!gInMemory && (BootMode != BOOT_ON_S3_RESUME)) {   \r
     //\r
     // The DxeIpl has not yet been shadowed\r
     //\r
@@ -150,10 +137,6 @@ Returns:
 \r
   } else {\r
     if (BootMode != BOOT_ON_S3_RESUME) {\r
-    //\r
-    // The DxeIpl has been shadowed\r
-    //\r
-    gInMemory = TRUE;\r
 \r
     //\r
     // Install LoadFile PPI\r
@@ -167,7 +150,7 @@ Returns:
     //\r
     // Install DxeIpl PPI\r
     //\r
-    PeiServicesInstallPpi (&mPpiList);\r
+    Status = PeiServicesInstallPpi (&mPpiList);\r
 \r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
@@ -620,14 +603,9 @@ Returns:
  \r
   if (Status == EFI_SUCCESS) {\r
     //\r
-    // Install PeiInMemory to indicate the Dxeipl is shadowed\r
+    // Set gInMemory global variable to TRUE to indicate the dxeipl is shadowed.\r
     //\r
-    Status = PeiServicesInstallPpi (&mPpiPeiInMemory);\r
-\r
-    if (EFI_ERROR (Status)) {\r
-      return Status;\r
-    }\r
-\r
+    *(BOOLEAN *) ((UINTN) &gInMemory + (UINTN) DxeIplEntryPoint - (UINTN) _ModuleEntryPoint) = TRUE;\r
     Status = ((EFI_PEIM_ENTRY_POINT) (UINTN) DxeIplEntryPoint) (DxeIplFileHeader, GetPeiServicesTablePointer());\r
   }\r
 \r