updated to use the term “temporary memory” but not CAR

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

diff --git a/MdeModulePkg/ChangeLog.txt b/MdeModulePkg/ChangeLog.txt
index 6167923f105302c6f7bc991ddcac7077feb66403..5ff6510cfc3ab50ec225a69a4d43f02cc157e84e 100644 (file)
--- a/MdeModulePkg/ChangeLog.txt
+++ b/MdeModulePkg/ChangeLog.txt
@@ -191,7 +191,7 @@ EDK_3871: Non-Compatible: klu2
        \r
        Code Change:\r
        1) PeiMain module use PeiCoreEntryPoint library class but *not* original OldPeiCoreEntryPoint.\r
-       2) The memory service in PeiMain module get CAR base and size from parameter of PeiCore's\r
+       2) The memory service in PeiMain module get temporary memory base and size from parameter of PeiCore's\r
           Entry point directly but *not* computed from stack's base.\r
        \r
        Possible Impacts:\r

diff --git a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
index 9caa890082be0d8d568f913e4d08bbb8c5f279ce..f64003db38d925c0a2ed8b8ebbcddb53d3f46203 100644 (file)
--- a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
+++ b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
@@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "PeiMain.h"\r
 \r
 ///\r
-/// CAR is filled with this initial value during SEC phase\r
+/// temporary memory is filled with this initial value during SEC phase\r
 ///\r
 #define INIT_CAR_VALUE 0x5AA55AA5\r
 \r
@@ -442,7 +442,7 @@ PeiDispatcher (
 \r
             if (Private->SwitchStackSignal) {\r
               //\r
-              // Before switch stack from CAR to permenent memory, caculate the heap and stack\r
+              // Before switch stack from temporary memory to permenent memory, caculate the heap and stack\r
               // usage in temporary memory for debuging.\r
               //\r
               DEBUG_CODE_BEGIN ();\r
@@ -453,11 +453,11 @@ PeiDispatcher (
                      && (*StackPointer == INIT_CAR_VALUE);\r
                      StackPointer ++);\r
                      \r
-                DEBUG ((EFI_D_INFO, "Total Cache as RAM:    %d bytes.\n", (UINT32)SecCoreData->TemporaryRamSize));\r
-                DEBUG ((EFI_D_INFO, "  CAR stack ever used: %d bytes.\n",\r
+                DEBUG ((EFI_D_INFO, "Total temporary memory:    %d bytes.\n", (UINT32)SecCoreData->TemporaryRamSize));\r
+                DEBUG ((EFI_D_INFO, "  temporary memory stack ever used: %d bytes.\n",\r
                        (SecCoreData->StackSize - ((UINTN) StackPointer - (UINTN)SecCoreData->StackBase))\r
                       ));\r
-                DEBUG ((EFI_D_INFO, "  CAR heap used:       %d bytes.\n",\r
+                DEBUG ((EFI_D_INFO, "  temporary memory heap used:       %d bytes.\n",\r
                        ((UINTN) Private->HobList.HandoffInformationTable->EfiFreeMemoryBottom -\r
                        (UINTN) Private->HobList.Raw)\r
                       ));\r
@@ -498,7 +498,7 @@ PeiDispatcher (
               NewPermenentMemoryBase = Private->PhysicalMemoryBegin + StackGap;\r
               \r
               //\r
-              // Caculate stack offset and heap offset between CAR and new permement \r
+              // Caculate stack offset and heap offset between temporary memory and new permement \r
               // memory seperately.\r
               //\r
               StackOffset            = (UINTN) NewPermenentMemoryBase - (UINTN) SecCoreData->StackBase;\r
@@ -529,7 +529,7 @@ PeiDispatcher (
                 // Temporary Ram support Ppi is provided by platform, it will copy \r
                 // temporary memory to permenent memory and do stack switching.\r
                 // After invoken temporary Ram support, following code's stack is in \r
-                // memory but not in CAR.\r
+                // memory but not in temporary memory.\r
                 //\r
                 TemporaryRamSupportPpi->TemporaryRamMigration (\r
                                           (CONST EFI_PEI_SERVICES **) PeiServices,\r

diff --git a/MdeModulePkg/Core/Pei/Memory/MemoryServices.c b/MdeModulePkg/Core/Pei/Memory/MemoryServices.c
index 02e83a18fc8543af6f393c9f4519991beeeb8b48..6314f759990da0212da88390a3eab410f7c0cf69 100644 (file)
--- a/MdeModulePkg/Core/Pei/Memory/MemoryServices.c
+++ b/MdeModulePkg/Core/Pei/Memory/MemoryServices.c
@@ -149,7 +149,7 @@ PeiAllocatePages (
   //\r
   if (!PrivateData->PeiMemoryInstalled) {\r
     //\r
-    // When PeiInstallMemory is called but CAR has *not* been moved to temporary memory,\r
+    // When PeiInstallMemory is called but temporary memory has *not* been moved to temporary memory,\r
     // the AllocatePage will depend on the field of PEI_CORE_INSTANCE structure.\r
     //\r
     if (!PrivateData->SwitchStackSignal) {\r
@@ -207,7 +207,7 @@ PeiAllocatePages (
 /**\r
 \r
   Pool allocation service. Before permenent memory is discoveried, the pool will \r
-  be allocated the heap in the CAR. Genenrally, the size of heap in temporary \r
+  be allocated the heap in the temporary memory. Genenrally, the size of heap in temporary \r
   memory does not exceed to 64K, so the biggest pool size could be allocated is \r
   64K.\r
 \r

diff --git a/MdeModulePkg/Core/Pei/PeiMain.h b/MdeModulePkg/Core/Pei/PeiMain.h
index 453f23023338585e6a273867e0a9f9a566cca5fc..1d96cc43f8e3a4ffb55f1f966e290ee105fb3f44 100644 (file)
--- a/MdeModulePkg/Core/Pei/PeiMain.h
+++ b/MdeModulePkg/Core/Pei/PeiMain.h
@@ -333,7 +333,7 @@ InitializePpiServices (
 \r
 /**\r
 \r
-  Migrate the Hob list from the CAR stack to PEI installed memory.\r
+  Migrate the Hob list from the temporary memory stack to PEI installed memory.\r
 \r
   @param PrivateData         Pointer to PeiCore's private data structure.\r
   @param OldCheckingBottom   Bottom of temporary memory range. All Ppi in this range\r
@@ -765,7 +765,7 @@ PeiAllocatePages (
 \r
 /**\r
 \r
-  Memory allocation service on the CAR.\r
+  Memory allocation service on the temporary memory.\r
 \r
 \r
   @param PeiServices        An indirect pointer to the EFI_PEI_SERVICES table published by the PEI Foundation.\r

diff --git a/MdeModulePkg/Core/Pei/Ppi/Ppi.c b/MdeModulePkg/Core/Pei/Ppi/Ppi.c
index ffed6cf2dd77df70e39d84591fae5d0f4b5201ae..04b29ecd73801a434639d3a57df420a4126d8f2a 100644 (file)
--- a/MdeModulePkg/Core/Pei/Ppi/Ppi.c
+++ b/MdeModulePkg/Core/Pei/Ppi/Ppi.c
@@ -38,7 +38,7 @@ InitializePpiServices (
 \r
 /**\r
 \r
-  Migrate the Hob list from the CAR stack to PEI installed memory.\r
+  Migrate the Hob list from the temporary memory stack to PEI installed memory.\r
 \r
   @param PrivateData         Pointer to PeiCore's private data structure.\r
   @param OldCheckingBottom   Bottom of temporary memory range. All Ppi in this range\r