From 79e4f2a56ac7cee477c2f84ff65f766814cc1836 Mon Sep 17 00:00:00 2001 From: Ruiyu Ni Date: Wed, 29 Aug 2018 11:39:06 +0800 Subject: EmulatorPkg: formalize line endings The patch is the result of running "BaseTools/Scripts/FormatDosFiles.py EmulatorPkg/" No functionality impact. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ruiyu Ni Reviewed-by: Hao A Wu Cc: Liming Gao --- EmulatorPkg/Sec/Ia32/SwitchRam.asm | 26 ++-- EmulatorPkg/Sec/Sec.c | 298 ++++++++++++++++++------------------- EmulatorPkg/Sec/Sec.h | 102 ++++++------- 3 files changed, 213 insertions(+), 213 deletions(-) (limited to 'EmulatorPkg/Sec') diff --git a/EmulatorPkg/Sec/Ia32/SwitchRam.asm b/EmulatorPkg/Sec/Ia32/SwitchRam.asm index a2e1f3e910..731ee0ffdb 100644 --- a/EmulatorPkg/Sec/Ia32/SwitchRam.asm +++ b/EmulatorPkg/Sec/Ia32/SwitchRam.asm @@ -22,7 +22,7 @@ .586p .model flat,C .code - + ;------------------------------------------------------------------------------ ; VOID ; EFIAPI @@ -30,7 +30,7 @@ ; UINT32 TemporaryMemoryBase, ; UINT32 PermenentMemoryBase ; ); -;------------------------------------------------------------------------------ +;------------------------------------------------------------------------------ SecSwitchStack PROC ; ; Save three register: eax, ebx, ecx @@ -39,16 +39,16 @@ SecSwitchStack PROC push ebx push ecx push edx - + ; ; !!CAUTION!! this function address's is pushed into stack after ; migration of whole temporary memory, so need save it to permenent ; memory at first! ; - + mov ebx, [esp + 20] ; Save the first parameter mov ecx, [esp + 24] ; Save the second parameter - + ; ; Save this function's return address into permenent memory at first. ; Then, Fixup the esp point to permenent memory @@ -57,17 +57,17 @@ SecSwitchStack PROC sub eax, ebx add eax, ecx mov edx, dword ptr [esp] ; copy pushed register's value to permenent memory - mov dword ptr [eax], edx + mov dword ptr [eax], edx mov edx, dword ptr [esp + 4] - mov dword ptr [eax + 4], edx + mov dword ptr [eax + 4], edx mov edx, dword ptr [esp + 8] - mov dword ptr [eax + 8], edx + mov dword ptr [eax + 8], edx mov edx, dword ptr [esp + 12] - mov dword ptr [eax + 12], edx + mov dword ptr [eax + 12], edx mov edx, dword ptr [esp + 16] ; Update this function's return address into permenent memory - mov dword ptr [eax + 16], edx + mov dword ptr [eax + 16], edx mov esp, eax ; From now, esp is pointed to permenent memory - + ; ; Fixup the ebp point to permenent memory ; @@ -75,7 +75,7 @@ SecSwitchStack PROC sub eax, ebx add eax, ecx mov ebp, eax ; From now, ebp is pointed to permenent memory - + ; ; Fixup callee's ebp point for PeiDispatch ; @@ -83,7 +83,7 @@ SecSwitchStack PROC sub eax, ebx add eax, ecx mov dword ptr [ebp], eax ; From now, Temporary's PPI caller's stack is in permenent memory - + pop edx pop ecx pop ebx diff --git a/EmulatorPkg/Sec/Sec.c b/EmulatorPkg/Sec/Sec.c index 8a015682dd..4132e9d9b7 100644 --- a/EmulatorPkg/Sec/Sec.c +++ b/EmulatorPkg/Sec/Sec.c @@ -1,149 +1,149 @@ -/*++ @file - Stub SEC that is called from the OS appliation that is the root of the emulator. - - The OS application will call the SEC with the PEI Entry Point API. - -Copyright (c) 2011, Apple Inc. 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. - -**/ - -#include "Sec.h" - - - -EFI_PEI_TEMPORARY_RAM_SUPPORT_PPI mSecTemporaryRamSupportPpi = { - SecTemporaryRamSupport -}; - - -EFI_PEI_PPI_DESCRIPTOR gPrivateDispatchTable[] = { - { - EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST, - &gEfiTemporaryRamSupportPpiGuid, - &mSecTemporaryRamSupportPpi - } -}; - - - -/** - The entry point of PE/COFF Image for the PEI Core, that has been hijacked by this - SEC that sits on top of an OS application. So the entry and exit of this module - has the same API. - - This function is the entry point for the PEI Foundation, which allows the SEC phase - to pass information about the stack, temporary RAM and the Boot Firmware Volume. - In addition, it also allows the SEC phase to pass services and data forward for use - during the PEI phase in the form of one or more PPIs. - There is no limit to the number of additional PPIs that can be passed from SEC into - the PEI Foundation. As part of its initialization phase, the PEI Foundation will add - these SEC-hosted PPIs to its PPI database such that both the PEI Foundation and any - modules can leverage the associated service calls and/or code in these early PPIs. - This function is required to call ProcessModuleEntryPointList() with the Context - parameter set to NULL. ProcessModuleEntryPoint() is never expected to return. - The PEI Core is responsible for calling ProcessLibraryConstructorList() as soon as - the PEI Services Table and the file handle for the PEI Core itself have been established. - If ProcessModuleEntryPointList() returns, then ASSERT() and halt the system. - - @param SecCoreData Points to a data structure containing information about the PEI - core's operating environment, such as the size and location of - temporary RAM, the stack location and the BFV location. - - @param PpiList Points to a list of one or more PPI descriptors to be installed - initially by the PEI core. An empty PPI list consists of a single - descriptor with the end-tag EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST. - As part of its initialization phase, the PEI Foundation will add - these SEC-hosted PPIs to its PPI database such that both the PEI - Foundation and any modules can leverage the associated service calls - and/or code in these early PPIs. - -**/ -VOID -EFIAPI -_ModuleEntryPoint ( - IN EFI_SEC_PEI_HAND_OFF *SecCoreData, - IN EFI_PEI_PPI_DESCRIPTOR *PpiList - ) -{ - EFI_STATUS Status; - EFI_PEI_FV_HANDLE VolumeHandle; - EFI_PEI_FILE_HANDLE FileHandle; - VOID *PeCoffImage; - EFI_PEI_CORE_ENTRY_POINT EntryPoint; - EFI_PEI_PPI_DESCRIPTOR *Ppi; - EFI_PEI_PPI_DESCRIPTOR *SecPpiList; - UINTN SecReseveredMemorySize; - UINTN Index; - - EMU_MAGIC_PAGE()->PpiList = PpiList; - ProcessLibraryConstructorList (); - - DEBUG ((EFI_D_ERROR, "SEC Has Started\n")); - - // - // Add Our PPIs to the list - // - SecReseveredMemorySize = sizeof (gPrivateDispatchTable); - for (Ppi = PpiList, Index = 1; ; Ppi++, Index++) { - SecReseveredMemorySize += sizeof (EFI_PEI_PPI_DESCRIPTOR); - - if ((Ppi->Flags & EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST) == EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST) { - // Since we are appending, need to clear out privious list terminator. - Ppi->Flags &= ~EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST; - break; - } - } - - // Keep everything on a good alignment - SecReseveredMemorySize = ALIGN_VALUE (SecReseveredMemorySize, CPU_STACK_ALIGNMENT); - -#if 0 - // Tell the PEI Core to not use our buffer in temp RAM - SecPpiList = (EFI_PEI_PPI_DESCRIPTOR *)SecCoreData->PeiTemporaryRamBase; - SecCoreData->PeiTemporaryRamBase = (VOID *)((UINTN)SecCoreData->PeiTemporaryRamBase + SecReseveredMemorySize); - SecCoreData->PeiTemporaryRamSize -= SecReseveredMemorySize; -#else - { - // - // When I subtrack from SecCoreData->PeiTemporaryRamBase PEI Core crashes? Either there is a bug - // or I don't understand temp RAM correctly? - // - EFI_PEI_PPI_DESCRIPTOR PpiArray[10]; - - SecPpiList = &PpiArray[0]; - ASSERT (sizeof (PpiArray) >= SecReseveredMemorySize); - } -#endif - // Copy existing list, and append our entries. - CopyMem (SecPpiList, PpiList, sizeof (EFI_PEI_PPI_DESCRIPTOR) * Index); - CopyMem (&SecPpiList[Index], gPrivateDispatchTable, sizeof (gPrivateDispatchTable)); - - // Find PEI Core and transfer control - VolumeHandle = (EFI_PEI_FV_HANDLE)(UINTN)SecCoreData->BootFirmwareVolumeBase; - FileHandle = NULL; - Status = PeiServicesFfsFindNextFile (EFI_FV_FILETYPE_PEI_CORE, VolumeHandle, &FileHandle); - ASSERT_EFI_ERROR (Status); - - Status = PeiServicesFfsFindSectionData (EFI_SECTION_PE32, FileHandle, &PeCoffImage); - ASSERT_EFI_ERROR (Status); - - Status = PeCoffLoaderGetEntryPoint (PeCoffImage, (VOID **)&EntryPoint); - ASSERT_EFI_ERROR (Status); - - // Transfer control to PEI Core - EntryPoint (SecCoreData, SecPpiList); - - // PEI Core never returns - ASSERT (FALSE); - return; -} - - - +/*++ @file + Stub SEC that is called from the OS appliation that is the root of the emulator. + + The OS application will call the SEC with the PEI Entry Point API. + +Copyright (c) 2011, Apple Inc. 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. + +**/ + +#include "Sec.h" + + + +EFI_PEI_TEMPORARY_RAM_SUPPORT_PPI mSecTemporaryRamSupportPpi = { + SecTemporaryRamSupport +}; + + +EFI_PEI_PPI_DESCRIPTOR gPrivateDispatchTable[] = { + { + EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST, + &gEfiTemporaryRamSupportPpiGuid, + &mSecTemporaryRamSupportPpi + } +}; + + + +/** + The entry point of PE/COFF Image for the PEI Core, that has been hijacked by this + SEC that sits on top of an OS application. So the entry and exit of this module + has the same API. + + This function is the entry point for the PEI Foundation, which allows the SEC phase + to pass information about the stack, temporary RAM and the Boot Firmware Volume. + In addition, it also allows the SEC phase to pass services and data forward for use + during the PEI phase in the form of one or more PPIs. + There is no limit to the number of additional PPIs that can be passed from SEC into + the PEI Foundation. As part of its initialization phase, the PEI Foundation will add + these SEC-hosted PPIs to its PPI database such that both the PEI Foundation and any + modules can leverage the associated service calls and/or code in these early PPIs. + This function is required to call ProcessModuleEntryPointList() with the Context + parameter set to NULL. ProcessModuleEntryPoint() is never expected to return. + The PEI Core is responsible for calling ProcessLibraryConstructorList() as soon as + the PEI Services Table and the file handle for the PEI Core itself have been established. + If ProcessModuleEntryPointList() returns, then ASSERT() and halt the system. + + @param SecCoreData Points to a data structure containing information about the PEI + core's operating environment, such as the size and location of + temporary RAM, the stack location and the BFV location. + + @param PpiList Points to a list of one or more PPI descriptors to be installed + initially by the PEI core. An empty PPI list consists of a single + descriptor with the end-tag EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST. + As part of its initialization phase, the PEI Foundation will add + these SEC-hosted PPIs to its PPI database such that both the PEI + Foundation and any modules can leverage the associated service calls + and/or code in these early PPIs. + +**/ +VOID +EFIAPI +_ModuleEntryPoint ( + IN EFI_SEC_PEI_HAND_OFF *SecCoreData, + IN EFI_PEI_PPI_DESCRIPTOR *PpiList + ) +{ + EFI_STATUS Status; + EFI_PEI_FV_HANDLE VolumeHandle; + EFI_PEI_FILE_HANDLE FileHandle; + VOID *PeCoffImage; + EFI_PEI_CORE_ENTRY_POINT EntryPoint; + EFI_PEI_PPI_DESCRIPTOR *Ppi; + EFI_PEI_PPI_DESCRIPTOR *SecPpiList; + UINTN SecReseveredMemorySize; + UINTN Index; + + EMU_MAGIC_PAGE()->PpiList = PpiList; + ProcessLibraryConstructorList (); + + DEBUG ((EFI_D_ERROR, "SEC Has Started\n")); + + // + // Add Our PPIs to the list + // + SecReseveredMemorySize = sizeof (gPrivateDispatchTable); + for (Ppi = PpiList, Index = 1; ; Ppi++, Index++) { + SecReseveredMemorySize += sizeof (EFI_PEI_PPI_DESCRIPTOR); + + if ((Ppi->Flags & EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST) == EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST) { + // Since we are appending, need to clear out privious list terminator. + Ppi->Flags &= ~EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST; + break; + } + } + + // Keep everything on a good alignment + SecReseveredMemorySize = ALIGN_VALUE (SecReseveredMemorySize, CPU_STACK_ALIGNMENT); + +#if 0 + // Tell the PEI Core to not use our buffer in temp RAM + SecPpiList = (EFI_PEI_PPI_DESCRIPTOR *)SecCoreData->PeiTemporaryRamBase; + SecCoreData->PeiTemporaryRamBase = (VOID *)((UINTN)SecCoreData->PeiTemporaryRamBase + SecReseveredMemorySize); + SecCoreData->PeiTemporaryRamSize -= SecReseveredMemorySize; +#else + { + // + // When I subtrack from SecCoreData->PeiTemporaryRamBase PEI Core crashes? Either there is a bug + // or I don't understand temp RAM correctly? + // + EFI_PEI_PPI_DESCRIPTOR PpiArray[10]; + + SecPpiList = &PpiArray[0]; + ASSERT (sizeof (PpiArray) >= SecReseveredMemorySize); + } +#endif + // Copy existing list, and append our entries. + CopyMem (SecPpiList, PpiList, sizeof (EFI_PEI_PPI_DESCRIPTOR) * Index); + CopyMem (&SecPpiList[Index], gPrivateDispatchTable, sizeof (gPrivateDispatchTable)); + + // Find PEI Core and transfer control + VolumeHandle = (EFI_PEI_FV_HANDLE)(UINTN)SecCoreData->BootFirmwareVolumeBase; + FileHandle = NULL; + Status = PeiServicesFfsFindNextFile (EFI_FV_FILETYPE_PEI_CORE, VolumeHandle, &FileHandle); + ASSERT_EFI_ERROR (Status); + + Status = PeiServicesFfsFindSectionData (EFI_SECTION_PE32, FileHandle, &PeCoffImage); + ASSERT_EFI_ERROR (Status); + + Status = PeCoffLoaderGetEntryPoint (PeCoffImage, (VOID **)&EntryPoint); + ASSERT_EFI_ERROR (Status); + + // Transfer control to PEI Core + EntryPoint (SecCoreData, SecPpiList); + + // PEI Core never returns + ASSERT (FALSE); + return; +} + + + diff --git a/EmulatorPkg/Sec/Sec.h b/EmulatorPkg/Sec/Sec.h index 4782578efa..c5781201eb 100644 --- a/EmulatorPkg/Sec/Sec.h +++ b/EmulatorPkg/Sec/Sec.h @@ -1,51 +1,51 @@ -/*++ @file - Stub SEC that is called from the OS appliation that is the root of the emulator. - - The OS application will call the SEC with the PEI Entry Point API. - -Copyright (c) 2011, Apple Inc. 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. - -**/ - -#ifndef __SEC_H___ -#define __SEC_H___ - - -#include -#include -#include -#include -#include -#include - -#include - - -// -// I think this shold be defined in a MdePkg include file? -// -VOID -EFIAPI -ProcessLibraryConstructorList ( - VOID - ); - -EFI_STATUS -EFIAPI -SecTemporaryRamSupport ( - IN CONST EFI_PEI_SERVICES **PeiServices, - IN EFI_PHYSICAL_ADDRESS TemporaryMemoryBase, - IN EFI_PHYSICAL_ADDRESS PermanentMemoryBase, - IN UINTN CopySize - ); - - -#endif - +/*++ @file + Stub SEC that is called from the OS appliation that is the root of the emulator. + + The OS application will call the SEC with the PEI Entry Point API. + +Copyright (c) 2011, Apple Inc. 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. + +**/ + +#ifndef __SEC_H___ +#define __SEC_H___ + + +#include +#include +#include +#include +#include +#include + +#include + + +// +// I think this shold be defined in a MdePkg include file? +// +VOID +EFIAPI +ProcessLibraryConstructorList ( + VOID + ); + +EFI_STATUS +EFIAPI +SecTemporaryRamSupport ( + IN CONST EFI_PEI_SERVICES **PeiServices, + IN EFI_PHYSICAL_ADDRESS TemporaryMemoryBase, + IN EFI_PHYSICAL_ADDRESS PermanentMemoryBase, + IN UINTN CopySize + ); + + +#endif + -- cgit