Apply changes(Unix Type to Windows Type) to the rest of the 2 files:

edk2\EdkModulePkg\Core\Pei\Image\Image.c
edk2\EdkModulePkg\Core\Pei\PeiMain\Peimain.c

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

2 files changed, 485 insertions, 480 deletions

diff --git a/EdkModulePkg/Core/Pei/Image/Image.c b/EdkModulePkg/Core/Pei/Image/Image.c
index 1580750..42ecc86 100644
--- a/EdkModulePkg/Core/Pei/Image/Image.c
+++ b/EdkModulePkg/Core/Pei/Image/Image.c
@@ -1,239 +1,243 @@
-/*++
-
-Copyright (c) 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
-are licensed and made available under the terms and conditions of the BSD License         
-which accompanies this distribution.  The full text of the license may be found at        
-http://opensource.org/licenses/bsd-license.php                                            
-                                                                                          
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
-
-Module Name:
-
-  Image.c
-
-Abstract:
-
-  Pei Core Load Image Support
-
---*/
-
-#include <PeiMain.h>
-
-EFI_STATUS
-PeiLoadImage (
-  IN EFI_PEI_SERVICES         **PeiServices,
-  IN EFI_FFS_FILE_HEADER      *PeimFileHeader,
-  OUT VOID                    **EntryPoint
-  )
-/*++
-
-Routine Description:
-
-  Routine for loading file image.
-
-Arguments:
-
-  PeiServices     - The PEI core services table.
-  PeimFileHeader  - Pointer to the FFS file header of the image.
-  EntryPoint      - Pointer to entry point of specified image file for output.
-
-Returns:
-
-  Status - EFI_SUCCESS    - Image is successfully loaded.
-           EFI_NOT_FOUND  - Fail to locate necessary PPI
-           Others         - Fail to load file.
-
---*/
-{
-  EFI_STATUS                  Status;
-  VOID                        *Pe32Data;
-  EFI_PEI_FV_FILE_LOADER_PPI  *FvLoadFilePpi;
-  EFI_PHYSICAL_ADDRESS        ImageAddress;
-  UINT64                      ImageSize;
-  EFI_PHYSICAL_ADDRESS        ImageEntryPoint;
-  EFI_TE_IMAGE_HEADER         *TEImageHeader;
-
-  *EntryPoint   = NULL;
-  TEImageHeader = NULL;
-
-  //
-  // Try to find a PE32 section.
-  //
-  Status = PeiCoreFfsFindSectionData (
-             EFI_SECTION_PE32,
-             PeimFileHeader,
-             &Pe32Data
-             );
-  //
-  // If we didn't find a PE32 section, try to find a TE section.
-  //
-  if (EFI_ERROR (Status)) {
-    Status = PeiCoreFfsFindSectionData (
-               EFI_SECTION_TE,
-               PeimFileHeader,
-               (VOID **) &TEImageHeader
-               );
-    if (EFI_ERROR (Status) || TEImageHeader == NULL) {
-      //
-      // There was not a PE32 or a TE section, so assume that it's a Compressed section
-      // and use the LoadFile
-      //
-      Status = PeiCoreLocatePpi (
-                &gEfiPeiFvFileLoaderPpiGuid,
-                0,
-                NULL,
-                (VOID **)&FvLoadFilePpi
-                );
-      if (EFI_ERROR (Status)) {
-        return EFI_NOT_FOUND;
-      }
-
-      Status = FvLoadFilePpi->FvLoadFile (
-                                FvLoadFilePpi,
-                                PeimFileHeader,
-                                &ImageAddress,
-                                &ImageSize,
-                                &ImageEntryPoint
-                                );
-
-      if (EFI_ERROR (Status)) {
-        return EFI_NOT_FOUND;
-      }
-
-      //
-      // Retrieve the entry point from the PE/COFF image header
-      //
-      Status = PeCoffLoaderGetEntryPoint ((VOID *)(UINTN)ImageAddress, EntryPoint);
-      if (EFI_ERROR (Status)) {
-        return EFI_NOT_FOUND;
-      }
-    } else {
-      //
-      // Retrieve the entry point from the TE image header
-      //
-      ImageAddress = (EFI_PHYSICAL_ADDRESS) (UINTN) TEImageHeader;
-      *EntryPoint = (VOID *)((UINTN) TEImageHeader + sizeof (EFI_TE_IMAGE_HEADER) +
-                    TEImageHeader->AddressOfEntryPoint - TEImageHeader->StrippedSize);
-    }
-  } else {
-    //
-    // Retrieve the entry point from the PE/COFF image header
-    //
-    ImageAddress = (EFI_PHYSICAL_ADDRESS) (UINTN) Pe32Data;
-    Status = PeCoffLoaderGetEntryPoint (Pe32Data, EntryPoint);
-    if (EFI_ERROR (Status)) {
-      return EFI_NOT_FOUND;
-    }
-  }
-
-  //
-  // Print debug message: Loading PEIM at 0x12345678 EntryPoint=0x12345688 Driver.efi
-  //
-  DEBUG ((EFI_D_INFO | EFI_D_LOAD, "Loading PEIM at 0x%08x EntryPoint=0x%08x ", Pe32Data, *EntryPoint));
-  DEBUG_CODE (
-    EFI_IMAGE_DATA_DIRECTORY * DirectoryEntry;
-    EFI_IMAGE_DEBUG_DIRECTORY_ENTRY * DebugEntry;
-    UINTN DirCount;
-    UINTN Index;
-    UINTN Index1;
-    BOOLEAN FileNameFound;
-    CHAR8 *AsciiString;
-    CHAR8 AsciiBuffer[512];
-    VOID *CodeViewEntryPointer;
-    INTN TEImageAdjust;
-    EFI_IMAGE_DOS_HEADER  *DosHeader;
-    EFI_IMAGE_NT_HEADERS  *PeHeader;
-
-    //
-    // Pe32Data is NULL when load TE image 
-    //    
-    PeHeader = NULL;
-    if (TEImageHeader == NULL) {
-      DosHeader = (EFI_IMAGE_DOS_HEADER *)Pe32Data;
-      if (DosHeader->e_magic == EFI_IMAGE_DOS_SIGNATURE) {
-        //
-        // DOS image header is present, so read the PE header after the DOS image header
-        //
-        PeHeader = (EFI_IMAGE_NT_HEADERS *) ((UINTN) Pe32Data + (UINTN) ((DosHeader->e_lfanew) & 0x0ffff));
-      } else {
-        //
-        // DOS image header is not present, so PE header is at the image base
-        //
-        PeHeader = (EFI_IMAGE_NT_HEADERS *) Pe32Data;
-      }
-    }
-
-    //
-    // Find the codeview info in the image and display the file name
-    // being loaded.
-    //
-    // Per the PE/COFF spec, you can't assume that a given data directory
-    // is present in the image. You have to check the NumberOfRvaAndSizes in
-    // the optional header to verify a desired directory entry is there.
-    //
-    DebugEntry      = NULL;
-    DirectoryEntry  = NULL;
-    TEImageAdjust   = 0;
-    if (TEImageHeader == NULL) {
-      if (PeHeader->OptionalHeader.NumberOfRvaAndSizes > EFI_IMAGE_DIRECTORY_ENTRY_DEBUG) {
-        DirectoryEntry = (EFI_IMAGE_DATA_DIRECTORY *) &(PeHeader->OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_DEBUG]);
-        DebugEntry = (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY *) ((UINTN) ImageAddress + DirectoryEntry->VirtualAddress);
-      }
-    } else {
-      if (TEImageHeader->DataDirectory[EFI_TE_IMAGE_DIRECTORY_ENTRY_DEBUG].VirtualAddress != 0) {
-        DirectoryEntry  = &TEImageHeader->DataDirectory[EFI_TE_IMAGE_DIRECTORY_ENTRY_DEBUG];
-        TEImageAdjust   = sizeof (EFI_TE_IMAGE_HEADER) - TEImageHeader->StrippedSize;
-        DebugEntry = (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY *)((UINTN) TEImageHeader +
-                      TEImageHeader->DataDirectory[EFI_TE_IMAGE_DIRECTORY_ENTRY_DEBUG].VirtualAddress +
-                      TEImageAdjust);
-      }
-    }
-
-    if (DebugEntry != NULL && DirectoryEntry != NULL) {
-      for (DirCount = 0; DirCount < DirectoryEntry->Size; DirCount++, DebugEntry++) {
-        if (DebugEntry->Type == EFI_IMAGE_DEBUG_TYPE_CODEVIEW) {
-          if (DebugEntry->SizeOfData > 0) {
-            CodeViewEntryPointer = (VOID *) ((UINTN) DebugEntry->RVA + (UINTN) ImageAddress + (UINTN)TEImageAdjust);
-            switch (* (UINT32 *) CodeViewEntryPointer) {
-              case CODEVIEW_SIGNATURE_NB10:
-                AsciiString = (CHAR8 *) CodeViewEntryPointer + sizeof (EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY);
-                break;
-
-              case CODEVIEW_SIGNATURE_RSDS:
-                AsciiString = (CHAR8 *) CodeViewEntryPointer + sizeof (EFI_IMAGE_DEBUG_CODEVIEW_RSDS_ENTRY);
-                break;
-
-              default:
-                AsciiString = NULL;
-                break;
-            }
-            if (AsciiString != NULL) {
-              FileNameFound = FALSE;
-              for (Index = 0, Index1 = 0; AsciiString[Index] != 0; Index++) {
-                if (AsciiString[Index] == '\\') {
-                  Index1 = Index;
-                  FileNameFound = TRUE;
-                }
-              }
-
-              if (FileNameFound) {
-                for (Index = Index1 + 1; AsciiString[Index] != '.'; Index++) {
-                  AsciiBuffer[Index - (Index1 + 1)] = AsciiString[Index];
-                }
-                AsciiBuffer[Index - (Index1 + 1)] = 0;
-                DEBUG ((EFI_D_INFO | EFI_D_LOAD, "%a.efi", AsciiBuffer));
-                break;
-              }
-            }
-          }
-        }
-      }
-    }
-  );
-
-  DEBUG ((EFI_D_INFO | EFI_D_LOAD, "\n"));
-
-  return EFI_SUCCESS;
-}
+/*++

+

+Copyright (c) 2006, Intel Corporation                                                         

+All rights reserved. This program and the accompanying materials                          

+are licensed and made available under the terms and conditions of the BSD License         

+which accompanies this distribution.  The full text of the license may be found at        

+http://opensource.org/licenses/bsd-license.php                                            

+                                                                                          

+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

+

+Module Name:

+

+  Image.c

+

+Abstract:

+

+  Pei Core Load Image Support

+

+--*/

+

+#include <PeiMain.h>

+

+EFI_STATUS

+PeiLoadImage (

+  IN EFI_PEI_SERVICES         **PeiServices,

+  IN EFI_FFS_FILE_HEADER      *PeimFileHeader,

+  OUT VOID                    **EntryPoint

+  )

+/*++

+

+Routine Description:

+

+  Routine for loading file image.

+

+Arguments:

+

+  PeiServices     - The PEI core services table.

+  PeimFileHeader  - Pointer to the FFS file header of the image.

+  EntryPoint      - Pointer to entry point of specified image file for output.

+

+Returns:

+

+  Status - EFI_SUCCESS    - Image is successfully loaded.

+           EFI_NOT_FOUND  - Fail to locate necessary PPI

+           Others         - Fail to load file.

+

+--*/

+{

+  EFI_STATUS                  Status;

+  VOID                        *Pe32Data;

+  EFI_PEI_FV_FILE_LOADER_PPI  *FvLoadFilePpi;

+//#ifdef EFI_NT_EMULATOR

+//  EFI_PEI_PPI_DESCRIPTOR      *PpiDescriptor;

+//  NT_PEI_LOAD_FILE_PPI        *PeiNtService;

+//#endif

+  EFI_PHYSICAL_ADDRESS        ImageAddress;

+  UINT64                      ImageSize;

+  EFI_PHYSICAL_ADDRESS        ImageEntryPoint;

+  EFI_TE_IMAGE_HEADER         *TEImageHeader;

+

+  *EntryPoint   = NULL;

+  TEImageHeader = NULL;

+

+  //

+  // Try to find a PE32 section.

+  //

+  Status = PeiCoreFfsFindSectionData (

+             EFI_SECTION_PE32,

+             PeimFileHeader,

+             &Pe32Data

+             );

+  //

+  // If we didn't find a PE32 section, try to find a TE section.

+  //

+  if (EFI_ERROR (Status)) {

+    Status = PeiCoreFfsFindSectionData (

+               EFI_SECTION_TE,

+               PeimFileHeader,

+               (VOID **) &TEImageHeader

+               );

+    if (EFI_ERROR (Status) || TEImageHeader == NULL) {

+      //

+      // There was not a PE32 or a TE section, so assume that it's a Compressed section

+      // and use the LoadFile

+      //

+      Status = PeiCoreLocatePpi (

+                &gEfiPeiFvFileLoaderPpiGuid,

+                0,

+                NULL,

+                (VOID **)&FvLoadFilePpi

+                );

+      if (EFI_ERROR (Status)) {

+        return EFI_NOT_FOUND;

+      }

+

+      Status = FvLoadFilePpi->FvLoadFile (

+                                FvLoadFilePpi,

+                                PeimFileHeader,

+                                &ImageAddress,

+                                &ImageSize,

+                                &ImageEntryPoint

+                                );

+

+      if (EFI_ERROR (Status)) {

+        return EFI_NOT_FOUND;

+      }

+

+      //

+      // Retrieve the entry point from the PE/COFF image header

+      //

+      Status = PeCoffLoaderGetEntryPoint ((VOID *)(UINTN)ImageAddress, EntryPoint);

+      if (EFI_ERROR (Status)) {

+        return EFI_NOT_FOUND;

+      }

+    } else {

+      //

+      // Retrieve the entry point from the TE image header

+      //

+      ImageAddress = (EFI_PHYSICAL_ADDRESS) (UINTN) TEImageHeader;

+      *EntryPoint = (VOID *)((UINTN) TEImageHeader + sizeof (EFI_TE_IMAGE_HEADER) +

+                    TEImageHeader->AddressOfEntryPoint - TEImageHeader->StrippedSize);

+    }

+  } else {

+    //

+    // Retrieve the entry point from the PE/COFF image header

+    //

+    ImageAddress = (EFI_PHYSICAL_ADDRESS) (UINTN) Pe32Data;

+    Status = PeCoffLoaderGetEntryPoint (Pe32Data, EntryPoint);

+    if (EFI_ERROR (Status)) {

+      return EFI_NOT_FOUND;

+    }

+  }

+

+  //

+  // Print debug message: Loading PEIM at 0x12345678 EntryPoint=0x12345688 Driver.efi

+  //

+  DEBUG ((EFI_D_INFO | EFI_D_LOAD, "Loading PEIM at 0x%08x EntryPoint=0x%08x ", Pe32Data, *EntryPoint));

+  DEBUG_CODE (

+    EFI_IMAGE_DATA_DIRECTORY * DirectoryEntry;

+    EFI_IMAGE_DEBUG_DIRECTORY_ENTRY * DebugEntry;

+    UINTN DirCount;

+    UINTN Index;

+    UINTN Index1;

+    BOOLEAN FileNameFound;

+    CHAR8 *AsciiString;

+    CHAR8 AsciiBuffer[512];

+    VOID *CodeViewEntryPointer;

+    INTN TEImageAdjust;

+    EFI_IMAGE_DOS_HEADER  *DosHeader;

+    EFI_IMAGE_NT_HEADERS  *PeHeader;

+

+    //

+    // Pe32Data is NULL when load TE image 

+    //    

+    PeHeader = NULL;

+    if (TEImageHeader == NULL) {

+      DosHeader = (EFI_IMAGE_DOS_HEADER *)Pe32Data;

+      if (DosHeader->e_magic == EFI_IMAGE_DOS_SIGNATURE) {

+        //

+        // DOS image header is present, so read the PE header after the DOS image header

+        //

+        PeHeader = (EFI_IMAGE_NT_HEADERS *) ((UINTN) Pe32Data + (UINTN) ((DosHeader->e_lfanew) & 0x0ffff));

+      } else {

+        //

+        // DOS image header is not present, so PE header is at the image base

+        //

+        PeHeader = (EFI_IMAGE_NT_HEADERS *) Pe32Data;

+      }

+    }

+

+    //

+    // Find the codeview info in the image and display the file name

+    // being loaded.

+    //

+    // Per the PE/COFF spec, you can't assume that a given data directory

+    // is present in the image. You have to check the NumberOfRvaAndSizes in

+    // the optional header to verify a desired directory entry is there.

+    //

+    DebugEntry      = NULL;

+    DirectoryEntry  = NULL;

+    TEImageAdjust   = 0;

+    if (TEImageHeader == NULL) {

+      if (PeHeader->OptionalHeader.NumberOfRvaAndSizes > EFI_IMAGE_DIRECTORY_ENTRY_DEBUG) {

+        DirectoryEntry = (EFI_IMAGE_DATA_DIRECTORY *) &(PeHeader->OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_DEBUG]);

+        DebugEntry = (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY *) ((UINTN) ImageAddress + DirectoryEntry->VirtualAddress);

+      }

+    } else {

+      if (TEImageHeader->DataDirectory[EFI_TE_IMAGE_DIRECTORY_ENTRY_DEBUG].VirtualAddress != 0) {

+        DirectoryEntry  = &TEImageHeader->DataDirectory[EFI_TE_IMAGE_DIRECTORY_ENTRY_DEBUG];

+        TEImageAdjust   = sizeof (EFI_TE_IMAGE_HEADER) - TEImageHeader->StrippedSize;

+        DebugEntry = (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY *)((UINTN) TEImageHeader +

+                      TEImageHeader->DataDirectory[EFI_TE_IMAGE_DIRECTORY_ENTRY_DEBUG].VirtualAddress +

+                      TEImageAdjust);

+      }

+    }

+

+    if (DebugEntry != NULL && DirectoryEntry != NULL) {

+      for (DirCount = 0; DirCount < DirectoryEntry->Size; DirCount++, DebugEntry++) {

+        if (DebugEntry->Type == EFI_IMAGE_DEBUG_TYPE_CODEVIEW) {

+          if (DebugEntry->SizeOfData > 0) {

+            CodeViewEntryPointer = (VOID *) ((UINTN) DebugEntry->RVA + (UINTN) ImageAddress + (UINTN)TEImageAdjust);

+            switch (* (UINT32 *) CodeViewEntryPointer) {

+              case CODEVIEW_SIGNATURE_NB10:

+                AsciiString = (CHAR8 *) CodeViewEntryPointer + sizeof (EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY);

+                break;

+

+              case CODEVIEW_SIGNATURE_RSDS:

+                AsciiString = (CHAR8 *) CodeViewEntryPointer + sizeof (EFI_IMAGE_DEBUG_CODEVIEW_RSDS_ENTRY);

+                break;

+

+              default:

+                AsciiString = NULL;

+                break;

+            }

+            if (AsciiString != NULL) {

+              FileNameFound = FALSE;

+              for (Index = 0, Index1 = 0; AsciiString[Index] != 0; Index++) {

+                if (AsciiString[Index] == '\\') {

+                  Index1 = Index;

+                  FileNameFound = TRUE;

+                }

+              }

+

+              if (FileNameFound) {

+                for (Index = Index1 + 1; AsciiString[Index] != '.'; Index++) {

+                  AsciiBuffer[Index - (Index1 + 1)] = AsciiString[Index];

+                }

+                AsciiBuffer[Index - (Index1 + 1)] = 0;

+                DEBUG ((EFI_D_INFO | EFI_D_LOAD, "%a.efi", AsciiBuffer));

+                break;

+              }

+            }

+          }

+        }

+      }

+    }

+  );

+

+  DEBUG ((EFI_D_INFO | EFI_D_LOAD, "\n"));

+

+  return EFI_SUCCESS;

+}

diff --git a/EdkModulePkg/Core/Pei/PeiMain/PeiMain.c b/EdkModulePkg/Core/Pei/PeiMain/PeiMain.c
index 7b4c2f9..f27b027 100644
--- a/EdkModulePkg/Core/Pei/PeiMain/PeiMain.c
+++ b/EdkModulePkg/Core/Pei/PeiMain/PeiMain.c
@@ -1,241 +1,242 @@
-/*++
-
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-Module Name:
-
-  PeiMain.c
-
-Abstract:
-
-  Pei Core Main Entry Point
-
-Revision History
-
---*/
-
-#include <PeiMain.h>
-
-//
-//CAR is filled with this initial value during SEC phase
-//
-#define INIT_CAR_VALUE 0x5AA55AA5
-
-static EFI_PEI_PPI_DESCRIPTOR mMemoryDiscoveredPpi = {
-  (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),
-  &gEfiPeiMemoryDiscoveredPpiGuid,
-  NULL
-};
-
-//
-// Pei Core Module Variables
-//
-//
-static EFI_PEI_SERVICES  mPS = {
-  {
-    PEI_SERVICES_SIGNATURE,
-    PEI_SERVICES_REVISION,
-    sizeof (EFI_PEI_SERVICES),
-    0,
-    0
-  },
-  PeiInstallPpi,
-  PeiReInstallPpi,
-  PeiLocatePpi,
-  PeiNotifyPpi,
-
-  PeiGetBootMode,
-  PeiSetBootMode,
-
-  PeiGetHobList,
-  PeiCreateHob,
-
-  PeiFvFindNextVolume,
-  PeiFfsFindNextFile,
-  PeiFfsFindSectionData,
-
-  PeiInstallPeiMemory,
-  PeiAllocatePages,
-  PeiAllocatePool,
-  (EFI_PEI_COPY_MEM)CopyMem,
-  (EFI_PEI_SET_MEM)SetMem,
-
-  PeiReportStatusCode,
-
-  PeiResetSystem
-};
-
-EFI_STATUS
-EFIAPI
-PeiCore (
-  IN EFI_PEI_STARTUP_DESCRIPTOR  *PeiStartupDescriptor,
-  IN PEI_CORE_INSTANCE           *OldCoreData
-  )
-/*++
-
-Routine Description:
-
-  Main entry point to Pei Core. After switching stack in the PEI core, 
-  it will restart with the old core data.
-
-Arguments:
-
-  PeiStartupDescriptor - Information and services provided by SEC phase.
-  OldCoreData          - Pointer to old core data that is used to initialize the
-                         core's data areas.
-
-Returns:
-
-  This function never returns
-  EFI_NOT_FOUND        - Never reach
-
---*/
-{
-  PEI_CORE_INSTANCE                                     PrivateData;
-  EFI_STATUS                                            Status;
-  PEI_CORE_TEMP_POINTERS                                TempPtr;
-  PEI_CORE_DISPATCH_DATA                                *DispatchData;
-  UINT64                                                mTick;
-
-  mTick = 0;
-
-#ifdef EFI_PEI_PERFORMANCE
-  if (OldCoreData == NULL) {
-    mTick = GetPerformanceCounter ();
-  }
-#endif
-
-  //
-  // For IPF in CAR mode the real memory access is uncached,in InstallPeiMemory()
-  //  the 63-bit of address is set to 1.
-  //
-  SWITCH_TO_CACHE_MODE (OldCoreData);
-
-  if (OldCoreData != NULL) {
-    CopyMem (&PrivateData, OldCoreData, sizeof (PEI_CORE_INSTANCE));
-  } else {
-    ZeroMem (&PrivateData, sizeof (PEI_CORE_INSTANCE));
-  }
-
-  PrivateData.Signature = PEI_CORE_HANDLE_SIGNATURE;
-  PrivateData.PS = &mPS;
-
-  //
-  // Initialize libraries that the PeiCore is linked against
-  // BUGBUG: The FfsHeader is passed in as NULL.  Do we look it up or remove it from the lib init?
-  //
-  ProcessLibraryConstructorList (NULL, &PrivateData.PS);
-
-  InitializeMemoryServices (&PrivateData.PS, PeiStartupDescriptor, OldCoreData);
-
-  InitializePpiServices (&PrivateData.PS, OldCoreData);
-
-  InitializeSecurityServices (&PrivateData.PS, OldCoreData);
-
-  InitializeDispatcherData (&PrivateData.PS, OldCoreData, PeiStartupDescriptor);
-
-  if (OldCoreData != NULL) {
-
-    PERF_END (NULL,"PreMem", NULL, 0);
-    PERF_START (NULL,"PostMem", NULL, 0);
-
-    //
-    // The following code dumps out interesting cache as RAM usage information
-    // so we can keep tabs on how the cache as RAM is being utilized.  The
-    // DEBUG_CODE macro is used to prevent this code from being compiled
-    // on a debug build.
-    //
-    DEBUG_CODE (
-      UINTN  *StackPointer;
-      UINTN  StackValue;
-
-      StackValue = INIT_CAR_VALUE;
-      for (StackPointer = (UINTN *) OldCoreData->MaxTopOfCarHeap;
-           ((UINTN) StackPointer < ((UINTN) OldCoreData->BottomOfCarHeap + OldCoreData->SizeOfCacheAsRam))
-           && StackValue == INIT_CAR_VALUE;
-           StackPointer++) {
-        StackValue = *StackPointer;
-      }
-
-      DEBUG ((EFI_D_INFO, "Total Cache as RAM:    %d bytes.\n", OldCoreData->SizeOfCacheAsRam));
-      DEBUG ((EFI_D_INFO, "  CAR stack ever used: %d bytes.\n",
-        ((UINTN) OldCoreData->TopOfCarHeap - (UINTN) StackPointer)
-        ));
-      DEBUG ((EFI_D_INFO, "  CAR heap used:       %d bytes.\n",
-        ((UINTN) OldCoreData->HobList.HandoffInformationTable->EfiFreeMemoryBottom -
-        (UINTN) OldCoreData->HobList.Raw)
-        ));
-    );
-
-    //
-    // Alert any listeners that there is permanent memory available
-    //
-    PERF_START (NULL,"DisMem", NULL, 0);
-    Status = PeiCoreInstallPpi (&mMemoryDiscoveredPpi);
-    PERF_END (NULL,"DisMem", NULL, 0);
-
-  } else {
-
-    //
-    // Report Status Code EFI_SW_PC_INIT
-    //
-    REPORT_STATUS_CODE (
-      EFI_PROGRESS_CODE,
-      EFI_SOFTWARE_PEI_CORE | EFI_SW_PC_INIT
-      );
-
-    //
-    // If first pass, start performance measurement.
-    //
-    PERF_START (NULL,"PreMem", NULL, mTick);
-
-    //
-    // If SEC provided any PPI services to PEI, install them.
-    //
-    if (PeiStartupDescriptor->DispatchTable != NULL) {
-      Status = PeiCoreInstallPpi (PeiStartupDescriptor->DispatchTable);
-      ASSERT_EFI_ERROR (Status);
-    }
-  }
-
-  DispatchData = &PrivateData.DispatchData;
-
-  //
-  // Call PEIM dispatcher
-  //
-  PeiDispatcher (PeiStartupDescriptor, &PrivateData, DispatchData);
-
-  //
-  // Check if InstallPeiMemory service was called.
-  //
-  ASSERT(PrivateData.PeiMemoryInstalled == TRUE);
-
-  PERF_END (NULL, "PostMem", NULL, 0);
-
-  Status = PeiCoreLocatePpi (
-             &gEfiDxeIplPpiGuid,
-             0,
-             NULL,
-             (VOID **)&TempPtr.DxeIpl
-             );
-  ASSERT_EFI_ERROR (Status);
-
-  DEBUG ((EFI_D_INFO, "DXE IPL Entry\n"));
-  Status = TempPtr.DxeIpl->Entry (
-                             TempPtr.DxeIpl,
-                             &PrivateData.PS,
-                             PrivateData.HobList
-                             );
-
-  ASSERT_EFI_ERROR (Status);
-
-  return EFI_NOT_FOUND;
-}
-
+/*++

+

+Copyright (c) 2006, Intel Corporation

+All rights reserved. This program and the accompanying materials

+are licensed and made available under the terms and conditions of the BSD License

+which accompanies this distribution.  The full text of the license may be found at

+http://opensource.org/licenses/bsd-license.php

+

+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

+

+Module Name:

+

+  PeiMain.c

+

+Abstract:

+

+  Pei Core Main Entry Point

+

+Revision History

+

+--*/

+

+#include <PeiMain.h>

+

+//

+//CAR is filled with this initial value during SEC phase

+//

+#define INIT_CAR_VALUE 0x5AA55AA5

+

+static EFI_PEI_PPI_DESCRIPTOR mMemoryDiscoveredPpi = {

+  (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),

+  &gEfiPeiMemoryDiscoveredPpiGuid,

+  NULL

+};

+

+//

+// Pei Core Module Variables

+//

+//

+static EFI_PEI_SERVICES  mPS = {

+  {

+    PEI_SERVICES_SIGNATURE,

+    PEI_SERVICES_REVISION,

+    sizeof (EFI_PEI_SERVICES),

+    0,

+    0

+  },

+  PeiInstallPpi,

+  PeiReInstallPpi,

+  PeiLocatePpi,

+  PeiNotifyPpi,

+

+  PeiGetBootMode,

+  PeiSetBootMode,

+

+  PeiGetHobList,

+  PeiCreateHob,

+

+  PeiFvFindNextVolume,

+  PeiFfsFindNextFile,

+  PeiFfsFindSectionData,

+

+  PeiInstallPeiMemory,

+  PeiAllocatePages,

+  PeiAllocatePool,

+  (EFI_PEI_COPY_MEM)CopyMem,

+  (EFI_PEI_SET_MEM)SetMem,

+

+  PeiReportStatusCode,

+

+  PeiResetSystem

+};

+

+EFI_STATUS

+EFIAPI

+PeiCore (

+  IN EFI_PEI_STARTUP_DESCRIPTOR  *PeiStartupDescriptor,

+  IN PEI_CORE_INSTANCE           *OldCoreData

+  )

+/*++

+

+Routine Description:

+

+  The entry routine to Pei Core, invoked by PeiMain during transition

+  from SEC to PEI. After switching stack in the PEI core, it will restart

+  with the old core data.

+

+Arguments:

+

+  PeiStartupDescriptor - Information and services provided by SEC phase.

+  OldCoreData          - Pointer to old core data that is used to initialize the

+                         core's data areas.

+

+Returns:

+

+  This function never returns

+  EFI_NOT_FOUND        - Never reach

+

+--*/

+{

+  PEI_CORE_INSTANCE                                     PrivateData;

+  EFI_STATUS                                            Status;

+  PEI_CORE_TEMP_POINTERS                                TempPtr;

+  PEI_CORE_DISPATCH_DATA                                *DispatchData;

+  UINT64                                                mTick;

+

+  mTick = 0;

+

+#ifdef EFI_PEI_PERFORMANCE

+  if (OldCoreData == NULL) {

+    mTick = GetPerformanceCounter ();

+  }

+#endif

+

+  //

+  // For IPF in CAR mode the real memory access is uncached,in InstallPeiMemory()

+  //  the 63-bit of address is set to 1.

+  //

+  SWITCH_TO_CACHE_MODE (OldCoreData);

+

+  if (OldCoreData != NULL) {

+    CopyMem (&PrivateData, OldCoreData, sizeof (PEI_CORE_INSTANCE));

+  } else {

+    ZeroMem (&PrivateData, sizeof (PEI_CORE_INSTANCE));

+  }

+

+  PrivateData.Signature = PEI_CORE_HANDLE_SIGNATURE;

+  PrivateData.PS = &mPS;

+

+  //

+  // Initialize libraries that the PeiCore is linked against

+  // BUGBUG: The FfsHeader is passed in as NULL.  Do we look it up or remove it from the lib init?

+  //

+  ProcessLibraryConstructorList (NULL, &PrivateData.PS);

+

+  InitializeMemoryServices (&PrivateData.PS, PeiStartupDescriptor, OldCoreData);

+

+  InitializePpiServices (&PrivateData.PS, OldCoreData);

+

+  InitializeSecurityServices (&PrivateData.PS, OldCoreData);

+

+  InitializeDispatcherData (&PrivateData.PS, OldCoreData, PeiStartupDescriptor);

+

+  if (OldCoreData != NULL) {

+

+    PERF_END (NULL,"PreMem", NULL, 0);

+    PERF_START (NULL,"PostMem", NULL, 0);

+

+    //

+    // The following code dumps out interesting cache as RAM usage information

+    // so we can keep tabs on how the cache as RAM is being utilized.  The

+    // DEBUG_CODE macro is used to prevent this code from being compiled

+    // on a debug build.

+    //

+    DEBUG_CODE (

+      UINTN  *StackPointer;

+      UINTN  StackValue;

+

+      StackValue = INIT_CAR_VALUE;

+      for (StackPointer = (UINTN *) OldCoreData->MaxTopOfCarHeap;

+           ((UINTN) StackPointer < ((UINTN) OldCoreData->BottomOfCarHeap + OldCoreData->SizeOfCacheAsRam))

+           && StackValue == INIT_CAR_VALUE;

+           StackPointer++) {

+        StackValue = *StackPointer;

+      }

+

+      DEBUG ((EFI_D_INFO, "Total Cache as RAM:    %d bytes.\n", OldCoreData->SizeOfCacheAsRam));

+      DEBUG ((EFI_D_INFO, "  CAR stack ever used: %d bytes.\n",

+        ((UINTN) OldCoreData->TopOfCarHeap - (UINTN) StackPointer)

+        ));

+      DEBUG ((EFI_D_INFO, "  CAR heap used:       %d bytes.\n",

+        ((UINTN) OldCoreData->HobList.HandoffInformationTable->EfiFreeMemoryBottom -

+        (UINTN) OldCoreData->HobList.Raw)

+        ));

+    );

+

+    //

+    // Alert any listeners that there is permanent memory available

+    //

+    PERF_START (NULL,"DisMem", NULL, 0);

+    Status = PeiCoreInstallPpi (&mMemoryDiscoveredPpi);

+    PERF_END (NULL,"DisMem", NULL, 0);

+

+  } else {

+

+    //

+    // Report Status Code EFI_SW_PC_INIT

+    //

+    REPORT_STATUS_CODE (

+      EFI_PROGRESS_CODE,

+      EFI_SOFTWARE_PEI_CORE | EFI_SW_PC_INIT

+      );

+

+    //

+    // If first pass, start performance measurement.

+    //

+    PERF_START (NULL,"PreMem", NULL, mTick);

+

+    //

+    // If SEC provided any PPI services to PEI, install them.

+    //

+    if (PeiStartupDescriptor->DispatchTable != NULL) {

+      Status = PeiCoreInstallPpi (PeiStartupDescriptor->DispatchTable);

+      ASSERT_EFI_ERROR (Status);

+    }

+  }

+

+  DispatchData = &PrivateData.DispatchData;

+

+  //

+  // Call PEIM dispatcher

+  //

+  PeiDispatcher (PeiStartupDescriptor, &PrivateData, DispatchData);

+

+  //

+  // Check if InstallPeiMemory service was called.

+  //

+  ASSERT(PrivateData.PeiMemoryInstalled == TRUE);

+

+  PERF_END (NULL, "PostMem", NULL, 0);

+

+  Status = PeiCoreLocatePpi (

+             &gEfiDxeIplPpiGuid,

+             0,

+             NULL,

+             (VOID **)&TempPtr.DxeIpl

+             );

+  ASSERT_EFI_ERROR (Status);

+

+  DEBUG ((EFI_D_INFO, "DXE IPL Entry\n"));

+  Status = TempPtr.DxeIpl->Entry (

+                             TempPtr.DxeIpl,

+                             &PrivateData.PS,

+                             PrivateData.HobList

+                             );

+

+  ASSERT_EFI_ERROR (Status);

+

+  return EFI_NOT_FOUND;

+}

+