From 3d4d0c34f9011e273987dad8b12b6753d495afb9 Mon Sep 17 00:00:00 2001 From: eric_tian Date: Wed, 8 Apr 2009 08:14:09 +0000 Subject: [PATCH] =?utf8?q?updated=20to=20use=20the=20term=20=E2=80=9Ctempo?= =?utf8?q?rary=20memory=E2=80=9D=20but=20not=20CAR?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8035 6f19259b-4bc3-4df7-8a09-765794883524 --- MdeModulePkg/ChangeLog.txt | 2 +- MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c | 14 +++++++------- MdeModulePkg/Core/Pei/Memory/MemoryServices.c | 4 ++-- MdeModulePkg/Core/Pei/PeiMain.h | 4 ++-- MdeModulePkg/Core/Pei/Ppi/Ppi.c | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/MdeModulePkg/ChangeLog.txt b/MdeModulePkg/ChangeLog.txt index 6167923f10..5ff6510cfc 100644 --- a/MdeModulePkg/ChangeLog.txt +++ b/MdeModulePkg/ChangeLog.txt @@ -191,7 +191,7 @@ EDK_3871: Non-Compatible: klu2 Code Change: 1) PeiMain module use PeiCoreEntryPoint library class but *not* original OldPeiCoreEntryPoint. - 2) The memory service in PeiMain module get CAR base and size from parameter of PeiCore's + 2) The memory service in PeiMain module get temporary memory base and size from parameter of PeiCore's Entry point directly but *not* computed from stack's base. Possible Impacts: diff --git a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c index 9caa890082..f64003db38 100644 --- 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" /// -/// CAR is filled with this initial value during SEC phase +/// temporary memory is filled with this initial value during SEC phase /// #define INIT_CAR_VALUE 0x5AA55AA5 @@ -442,7 +442,7 @@ PeiDispatcher ( if (Private->SwitchStackSignal) { // - // Before switch stack from CAR to permenent memory, caculate the heap and stack + // Before switch stack from temporary memory to permenent memory, caculate the heap and stack // usage in temporary memory for debuging. // DEBUG_CODE_BEGIN (); @@ -453,11 +453,11 @@ PeiDispatcher ( && (*StackPointer == INIT_CAR_VALUE); StackPointer ++); - DEBUG ((EFI_D_INFO, "Total Cache as RAM: %d bytes.\n", (UINT32)SecCoreData->TemporaryRamSize)); - DEBUG ((EFI_D_INFO, " CAR stack ever used: %d bytes.\n", + DEBUG ((EFI_D_INFO, "Total temporary memory: %d bytes.\n", (UINT32)SecCoreData->TemporaryRamSize)); + DEBUG ((EFI_D_INFO, " temporary memory stack ever used: %d bytes.\n", (SecCoreData->StackSize - ((UINTN) StackPointer - (UINTN)SecCoreData->StackBase)) )); - DEBUG ((EFI_D_INFO, " CAR heap used: %d bytes.\n", + DEBUG ((EFI_D_INFO, " temporary memory heap used: %d bytes.\n", ((UINTN) Private->HobList.HandoffInformationTable->EfiFreeMemoryBottom - (UINTN) Private->HobList.Raw) )); @@ -498,7 +498,7 @@ PeiDispatcher ( NewPermenentMemoryBase = Private->PhysicalMemoryBegin + StackGap; // - // Caculate stack offset and heap offset between CAR and new permement + // Caculate stack offset and heap offset between temporary memory and new permement // memory seperately. // StackOffset = (UINTN) NewPermenentMemoryBase - (UINTN) SecCoreData->StackBase; @@ -529,7 +529,7 @@ PeiDispatcher ( // Temporary Ram support Ppi is provided by platform, it will copy // temporary memory to permenent memory and do stack switching. // After invoken temporary Ram support, following code's stack is in - // memory but not in CAR. + // memory but not in temporary memory. // TemporaryRamSupportPpi->TemporaryRamMigration ( (CONST EFI_PEI_SERVICES **) PeiServices, diff --git a/MdeModulePkg/Core/Pei/Memory/MemoryServices.c b/MdeModulePkg/Core/Pei/Memory/MemoryServices.c index 02e83a18fc..6314f75999 100644 --- a/MdeModulePkg/Core/Pei/Memory/MemoryServices.c +++ b/MdeModulePkg/Core/Pei/Memory/MemoryServices.c @@ -149,7 +149,7 @@ PeiAllocatePages ( // if (!PrivateData->PeiMemoryInstalled) { // - // When PeiInstallMemory is called but CAR has *not* been moved to temporary memory, + // When PeiInstallMemory is called but temporary memory has *not* been moved to temporary memory, // the AllocatePage will depend on the field of PEI_CORE_INSTANCE structure. // if (!PrivateData->SwitchStackSignal) { @@ -207,7 +207,7 @@ PeiAllocatePages ( /** Pool allocation service. Before permenent memory is discoveried, the pool will - be allocated the heap in the CAR. Genenrally, the size of heap in temporary + be allocated the heap in the temporary memory. Genenrally, the size of heap in temporary memory does not exceed to 64K, so the biggest pool size could be allocated is 64K. diff --git a/MdeModulePkg/Core/Pei/PeiMain.h b/MdeModulePkg/Core/Pei/PeiMain.h index 453f230233..1d96cc43f8 100644 --- a/MdeModulePkg/Core/Pei/PeiMain.h +++ b/MdeModulePkg/Core/Pei/PeiMain.h @@ -333,7 +333,7 @@ InitializePpiServices ( /** - Migrate the Hob list from the CAR stack to PEI installed memory. + Migrate the Hob list from the temporary memory stack to PEI installed memory. @param PrivateData Pointer to PeiCore's private data structure. @param OldCheckingBottom Bottom of temporary memory range. All Ppi in this range @@ -765,7 +765,7 @@ PeiAllocatePages ( /** - Memory allocation service on the CAR. + Memory allocation service on the temporary memory. @param PeiServices An indirect pointer to the EFI_PEI_SERVICES table published by the PEI Foundation. diff --git a/MdeModulePkg/Core/Pei/Ppi/Ppi.c b/MdeModulePkg/Core/Pei/Ppi/Ppi.c index ffed6cf2dd..04b29ecd73 100644 --- a/MdeModulePkg/Core/Pei/Ppi/Ppi.c +++ b/MdeModulePkg/Core/Pei/Ppi/Ppi.c @@ -38,7 +38,7 @@ InitializePpiServices ( /** - Migrate the Hob list from the CAR stack to PEI installed memory. + Migrate the Hob list from the temporary memory stack to PEI installed memory. @param PrivateData Pointer to PeiCore's private data structure. @param OldCheckingBottom Bottom of temporary memory range. All Ppi in this range -- 2.39.2