From d18d8a1d0e370f8ce6ccc2725f4170586d457e53 Mon Sep 17 00:00:00 2001 From: jljusten Date: Tue, 28 Jun 2011 16:50:26 +0000 Subject: EmulatorPkg: Remove all trailing whitespace Signed-off-by: jljusten git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11919 6f19259b-4bc3-4df7-8a09-765794883524 --- EmulatorPkg/Sec/Ia32/SwitchRam.S | 22 +++++++++++----------- EmulatorPkg/Sec/Sec.c | 40 ++++++++++++++++++++-------------------- EmulatorPkg/Sec/Sec.h | 4 ++-- EmulatorPkg/Sec/Sec.inf | 2 +- EmulatorPkg/Sec/X64/SwitchRam.S | 10 +++++----- 5 files changed, 39 insertions(+), 39 deletions(-) (limited to 'EmulatorPkg/Sec') diff --git a/EmulatorPkg/Sec/Ia32/SwitchRam.S b/EmulatorPkg/Sec/Ia32/SwitchRam.S index 81e478be82..39304daef1 100644 --- a/EmulatorPkg/Sec/Ia32/SwitchRam.S +++ b/EmulatorPkg/Sec/Ia32/SwitchRam.S @@ -20,7 +20,7 @@ #------------------------------------------------------------------------------ .text - + //------------------------------------------------------------------------------ // VOID @@ -29,26 +29,26 @@ // UINT32 TemporaryMemoryBase, // UINT32 PermenentMemoryBase // )// -//------------------------------------------------------------------------------ +//------------------------------------------------------------------------------ ASM_GLOBAL ASM_PFX(SecSwitchStack) ASM_PFX(SecSwitchStack): # # Save three register: eax, ebx, ecx -# +# push %eax 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! -# - +# + movl 20(%esp), %ebx # Save the first parameter movl 24(%esp), %ecx # Save the second parameter - + # # Save this function's return address into permenent memory at first. # Then, Fixup the esp point to permenent memory @@ -77,16 +77,16 @@ ASM_PFX(SecSwitchStack): subl %ebx, %eax addl %ecx, %eax movl %eax, %ebp # From now, ebp is pointed to permenent memory - + # # Fixup callee's ebp point for PeiDispatch -# +# movl (%ebp), %eax subl %ebx, %eax addl %ecx, %eax movl %eax, (%ebp) # From now, Temporary's PPI caller's stack is in permenent memory -#endif - +#endif + pop %edx pop %ecx pop %ebx diff --git a/EmulatorPkg/Sec/Sec.c b/EmulatorPkg/Sec/Sec.c index 4468d6f07b..8a015682dd 100644 --- a/EmulatorPkg/Sec/Sec.c +++ b/EmulatorPkg/Sec/Sec.c @@ -1,7 +1,7 @@ /*++ @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. + + 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 @@ -18,7 +18,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -EFI_PEI_TEMPORARY_RAM_SUPPORT_PPI mSecTemporaryRamSupportPpi = { +EFI_PEI_TEMPORARY_RAM_SUPPORT_PPI mSecTemporaryRamSupportPpi = { SecTemporaryRamSupport }; @@ -35,8 +35,8 @@ EFI_PEI_PPI_DESCRIPTOR gPrivateDispatchTable[] = { /** 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. + 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. @@ -54,7 +54,7 @@ EFI_PEI_PPI_DESCRIPTOR gPrivateDispatchTable[] = { @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. + 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 @@ -65,11 +65,11 @@ EFI_PEI_PPI_DESCRIPTOR gPrivateDispatchTable[] = { and/or code in these early PPIs. **/ -VOID +VOID EFIAPI _ModuleEntryPoint ( IN EFI_SEC_PEI_HAND_OFF *SecCoreData, - IN EFI_PEI_PPI_DESCRIPTOR *PpiList + IN EFI_PEI_PPI_DESCRIPTOR *PpiList ) { EFI_STATUS Status; @@ -81,29 +81,29 @@ _ModuleEntryPoint ( 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; + 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; @@ -116,12 +116,12 @@ _ModuleEntryPoint ( // 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. + // Copy existing list, and append our entries. CopyMem (SecPpiList, PpiList, sizeof (EFI_PEI_PPI_DESCRIPTOR) * Index); CopyMem (&SecPpiList[Index], gPrivateDispatchTable, sizeof (gPrivateDispatchTable)); @@ -130,16 +130,16 @@ _ModuleEntryPoint ( 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 00760121b2..4782578efa 100644 --- a/EmulatorPkg/Sec/Sec.h +++ b/EmulatorPkg/Sec/Sec.h @@ -1,7 +1,7 @@ /*++ @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. + + 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 diff --git a/EmulatorPkg/Sec/Sec.inf b/EmulatorPkg/Sec/Sec.inf index b17caea0b5..484e7a0a93 100644 --- a/EmulatorPkg/Sec/Sec.inf +++ b/EmulatorPkg/Sec/Sec.inf @@ -45,6 +45,6 @@ [Ppis] gEfiTemporaryRamSupportPpiGuid - + [Pcd] gEmulatorPkgTokenSpaceGuid.PcdPeiServicesTablePage diff --git a/EmulatorPkg/Sec/X64/SwitchRam.S b/EmulatorPkg/Sec/X64/SwitchRam.S index a7219bf21f..9ed1f911e7 100644 --- a/EmulatorPkg/Sec/X64/SwitchRam.S +++ b/EmulatorPkg/Sec/X64/SwitchRam.S @@ -19,7 +19,7 @@ // SecTemporaryRamSupport ( // IN CONST EFI_PEI_SERVICES **PeiServices, // %rcx // IN EFI_PHYSICAL_ADDRESS TemporaryMemoryBase, // %rdx -// IN EFI_PHYSICAL_ADDRESS PermanentMemoryBase, // %r8 +// IN EFI_PHYSICAL_ADDRESS PermanentMemoryBase, // %r8 // IN UINTN CopySize // %r9 // ) // @@ -28,7 +28,7 @@ ASM_PFX(SecTemporaryRamSupport): // Adjust callers %rbp to account for stack move subq %rdx, %rbp // Calc offset of %rbp in Temp Memory addq %r8, %rbp // add in permanent base to offset - + pushq %rbp // stack frame is for the debugger movq %rsp, %rbp @@ -51,13 +51,13 @@ ASM_PFX(SecTemporaryRamSupport): popq %r9 // CopySize (old stack) popq %r8 // PermanentMemoryBase (old stack) popq %rdx // TemporaryMemoryBase (old stack) - + movq %rsp, %rcx // Move to new stack subq %rdx, %rcx // Calc offset of stack in Temp Memory addq %r8, %rcx // Calc PermanentMemoryBase address - movq %rcx, %rsp // Update stack + movq %rcx, %rsp // Update stack // Stack now points to permanent memory - + // ZeroMem (TemporaryMemoryBase /* rcx */, CopySize /* rdx */); movq %rdx, %rcx movq %r9, %rdx -- cgit v1.2.3