\r
mTick = 0;\r
\r
-#ifdef EFI_PEI_PERFORMANCE\r
- if (OldCoreData == NULL) {\r
- mTick = GetPerformanceCounter ();\r
+ if (PerformanceMeasurementEnabled()) {\r
+ if (OldCoreData == NULL) {\r
+ mTick = GetPerformanceCounter ();\r
+ }\r
}\r
-#endif\r
-\r
\r
//\r
// For IPF in CAR mode the real memory access is uncached,in InstallPeiMemory()\r
//\r
// The following code dumps out interesting cache as RAM usage information\r
// so we can keep tabs on how the cache as RAM is being utilized. The\r
- // DEBUG_CODE macro is used to prevent this code from being compiled\r
+ // DEBUG_CODE_BEGIN macro is used to prevent this code from being compiled\r
// on a debug build.\r
//\r
- DEBUG_CODE (\r
+ DEBUG_CODE_BEGIN ();\r
UINTN *StackPointer;\r
UINTN StackValue;\r
\r
((UINTN) OldCoreData->HobList.HandoffInformationTable->EfiFreeMemoryBottom -\r
(UINTN) OldCoreData->HobList.Raw)\r
));\r
- );\r
+ DEBUG_CODE_END ();\r
\r
//\r
// Alert any listeners that there is permanent memory available\r
//\r
+ PERF_START (NULL,"PEI", NULL, mTick);\r
PERF_START (NULL,"DisMem", NULL, 0);\r
- Status = PeiCoreInstallPpi (&mMemoryDiscoveredPpi);\r
+ Status = PeiServicesInstallPpi (&mMemoryDiscoveredPpi);\r
PERF_END (NULL,"DisMem", NULL, 0);\r
\r
} else {\r
// If SEC provided any PPI services to PEI, install them.\r
//\r
if (PeiStartupDescriptor->DispatchTable != NULL) {\r
- Status = PeiCoreInstallPpi (PeiStartupDescriptor->DispatchTable);\r
+ Status = PeiServicesInstallPpi (PeiStartupDescriptor->DispatchTable);\r
ASSERT_EFI_ERROR (Status);\r
}\r
}\r
\r
PERF_END (NULL, "PostMem", NULL, 0);\r
\r
- Status = PeiCoreLocatePpi (\r
+ Status = PeiServicesLocatePpi (\r
&gEfiDxeIplPpiGuid,\r
0,\r
NULL,\r