From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.120]) by mx.groups.io with SMTP id smtpd.web12.8387.1575389806893500509 for ; Tue, 03 Dec 2019 08:16:47 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Sn27lyxi; spf=pass (domain: redhat.com, ip: 205.139.110.120, mailfrom: philmd@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575389805; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zNF6TyxE5DyiDDWjJcNpYJVlRK+8dGwBARUZAuacs2s=; b=Sn27lyxicYF6Wp7+9XIiiQmC+4SiMWTTpo/V+lg+TNeLYiTCFJ/gk9ZiXGE/Pp+rnIXTO4 m4hCaM/tCalX1fMNvu2MbM20UJ6LeCH1om2gUCQvnQoGc/Z3sJVDjT3tWvkVyzjJsrM9Kf /IQ6dXFV4pO5BFxsuFOnw8TUtFyo57g= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-306--1xIMO_eN6ykngEDrSkZJQ-1; Tue, 03 Dec 2019 11:16:43 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 440FF107ACE6; Tue, 3 Dec 2019 16:16:42 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-86.brq.redhat.com [10.40.204.86]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 16F1D60C80; Tue, 3 Dec 2019 16:16:39 +0000 (UTC) From: =?UTF-8?B?UGhpbGlwcGUgTWF0aGlldS1EYXVkw6k=?= To: devel@edk2.groups.io Cc: Antoine Coeur , Jordan Justen , Andrew Fish , Ray Ni , Philippe Mathieu-Daude Subject: [PATCH 05/79] EmulatorPkg/Sec: Fix various typos Date: Tue, 3 Dec 2019 17:14:48 +0100 Message-Id: <20191203161602.15969-6-philmd@redhat.com> In-Reply-To: <20191203161602.15969-1-philmd@redhat.com> References: <20191203161602.15969-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: -1xIMO_eN6ykngEDrSkZJQ-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Antoine Coeur Fix various typos in comments and documentation. Cc: Jordan Justen Cc: Andrew Fish Cc: Ray Ni Signed-off-by: Coeur Reviewed-by: Philippe Mathieu-Daude Signed-off-by: Philippe Mathieu-Daude --- EmulatorPkg/Sec/Sec.h | 4 ++-- EmulatorPkg/Sec/Sec.c | 5 ++--- EmulatorPkg/Sec/Ia32/SwitchRam.S | 18 +++++++++--------- EmulatorPkg/Sec/Ia32/SwitchRam.asm | 20 ++++++++++---------- EmulatorPkg/Sec/X64/SwitchRam.S | 2 +- EmulatorPkg/Sec/X64/SwitchRam.asm | 2 +- 6 files changed, 25 insertions(+), 26 deletions(-) diff --git a/EmulatorPkg/Sec/Sec.h b/EmulatorPkg/Sec/Sec.h index dd301f788868..42554e05b56e 100644 --- a/EmulatorPkg/Sec/Sec.h +++ b/EmulatorPkg/Sec/Sec.h @@ -1,5 +1,5 @@ /*++ @file - Stub SEC that is called from the OS appliation that is the root of the e= mulator. + Stub SEC that is called from the OS application that is the root of the = emulator. =20 The OS application will call the SEC with the PEI Entry Point API. =20 @@ -23,7 +23,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent =20 =20 // -// I think this shold be defined in a MdePkg include file? +// I think this should be defined in a MdePkg include file? // VOID EFIAPI diff --git a/EmulatorPkg/Sec/Sec.c b/EmulatorPkg/Sec/Sec.c index b734d2bb8799..1c0f73d66944 100644 --- a/EmulatorPkg/Sec/Sec.c +++ b/EmulatorPkg/Sec/Sec.c @@ -1,5 +1,5 @@ /*++ @file - Stub SEC that is called from the OS appliation that is the root of the e= mulator. + Stub SEC that is called from the OS application that is the root of the = emulator. =20 The OS application will call the SEC with the PEI Entry Point API. =20 @@ -90,7 +90,7 @@ _ModuleEntryPoint ( SecReseveredMemorySize +=3D sizeof (EFI_PEI_PPI_DESCRIPTOR); =20 if ((Ppi->Flags & EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST) =3D=3D EFI_PE= I_PPI_DESCRIPTOR_TERMINATE_LIST) { - // Since we are appending, need to clear out privious list terminato= r. + // Since we are appending, need to clear out previous list terminato= r. Ppi->Flags &=3D ~EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST; break; } @@ -138,4 +138,3 @@ _ModuleEntryPoint ( } =20 =20 - diff --git a/EmulatorPkg/Sec/Ia32/SwitchRam.S b/EmulatorPkg/Sec/Ia32/Switch= Ram.S index f24529cc8e61..d8298223a9b0 100644 --- a/EmulatorPkg/Sec/Ia32/SwitchRam.S +++ b/EmulatorPkg/Sec/Ia32/SwitchRam.S @@ -9,7 +9,7 @@ # # Abstract: # -# Switch the stack from temporary memory to permenent memory. +# Switch the stack from temporary memory to permanent memory. # #-------------------------------------------------------------------------= ----- =20 @@ -36,7 +36,7 @@ ASM_PFX(SecSwitchStack): =20 # # !!CAUTION!! this function address's is pushed into stack after -# migration of whole temporary memory, so need save it to permenent +# migration of whole temporary memory, so need save it to permanent # memory at first! # =20 @@ -44,14 +44,14 @@ ASM_PFX(SecSwitchStack): movl 24(%esp), %ecx # Save the second parameter =20 # -# Save this function's return address into permenent memory at first. -# Then, Fixup the esp point to permenent memory +# Save this function's return address into permanent memory at first. +# Then, Fixup the esp point to permanent memory # =20 movl %esp, %eax subl %ebx, %eax addl %ecx, %eax - movl (%esp), %edx # copy pushed register's value to p= ermenent memory + movl (%esp), %edx # copy pushed register's value to p= ermanent memory movl %edx, (%eax) movl 4(%esp), %edx movl %edx, 4(%eax) @@ -61,16 +61,16 @@ ASM_PFX(SecSwitchStack): movl %edx, 12(%eax) movl 16(%esp), %edx movl %edx, 16(%eax) - movl %eax, %esp # From now, esp is pointed to perme= nent memory + movl %eax, %esp # From now, esp is pointed to perma= nent memory =20 # -# Fixup the ebp point to permenent memory +# Fixup the ebp point to permanent memory # #ifndef __APPLE__ movl %ebp, %eax subl %ebx, %eax addl %ecx, %eax - movl %eax, %ebp # From now, ebp is pointed to perme= nent memory + movl %eax, %ebp # From now, ebp is pointed to perma= nent memory =20 # # Fixup callee's ebp point for PeiDispatch @@ -78,7 +78,7 @@ ASM_PFX(SecSwitchStack): movl (%ebp), %eax subl %ebx, %eax addl %ecx, %eax - movl %eax, (%ebp) # From now, Temporary's PPI caller'= s stack is in permenent memory + movl %eax, (%ebp) # From now, Temporary's PPI caller'= s stack is in permanent memory #endif =20 pop %edx diff --git a/EmulatorPkg/Sec/Ia32/SwitchRam.asm b/EmulatorPkg/Sec/Ia32/Swit= chRam.asm index 9c7908f7a04c..99ef00298069 100644 --- a/EmulatorPkg/Sec/Ia32/SwitchRam.asm +++ b/EmulatorPkg/Sec/Ia32/SwitchRam.asm @@ -9,7 +9,7 @@ ; ; Abstract: ; -; Switch the stack from temporary memory to permenent memory. +; Switch the stack from temporary memory to permanent memory. ; ;-------------------------------------------------------------------------= ----- =20 @@ -36,7 +36,7 @@ SecSwitchStack PROC =20 ; ; !!CAUTION!! this function address's is pushed into stack after - ; migration of whole temporary memory, so need save it to permenent + ; migration of whole temporary memory, so need save it to permanent ; memory at first! ; =20 @@ -44,13 +44,13 @@ SecSwitchStack PROC mov ecx, [esp + 24] ; Save the second parameter =20 ; - ; Save this function's return address into permenent memory at first. - ; Then, Fixup the esp point to permenent memory + ; Save this function's return address into permanent memory at first. + ; Then, Fixup the esp point to permanent memory ; mov eax, esp sub eax, ebx add eax, ecx - mov edx, dword ptr [esp] ; copy pushed register's value to p= ermenent memory + mov edx, dword ptr [esp] ; copy pushed register's value to p= ermanent memory mov dword ptr [eax], edx mov edx, dword ptr [esp + 4] mov dword ptr [eax + 4], edx @@ -58,17 +58,17 @@ SecSwitchStack PROC mov dword ptr [eax + 8], edx mov edx, dword ptr [esp + 12] mov dword ptr [eax + 12], edx - mov edx, dword ptr [esp + 16] ; Update this function's return add= ress into permenent memory + mov edx, dword ptr [esp + 16] ; Update this function's return add= ress into permanent memory mov dword ptr [eax + 16], edx - mov esp, eax ; From now, esp is pointed to perme= nent memory + mov esp, eax ; From now, esp is pointed to perma= nent memory =20 ; - ; Fixup the ebp point to permenent memory + ; Fixup the ebp point to permanent memory ; mov eax, ebp sub eax, ebx add eax, ecx - mov ebp, eax ; From now, ebp is pointed to permenent = memory + mov ebp, eax ; From now, ebp is pointed to permanent = memory =20 ; ; Fixup callee's ebp point for PeiDispatch @@ -76,7 +76,7 @@ SecSwitchStack PROC mov eax, dword ptr [ebp] sub eax, ebx add eax, ecx - mov dword ptr [ebp], eax ; From now, Temporary's PPI caller's sta= ck is in permenent memory + mov dword ptr [ebp], eax ; From now, Temporary's PPI caller's sta= ck is in permanent memory =20 pop edx pop ecx diff --git a/EmulatorPkg/Sec/X64/SwitchRam.S b/EmulatorPkg/Sec/X64/SwitchRa= m.S index 7ddb6c854b00..59d4e2edef2a 100644 --- a/EmulatorPkg/Sec/X64/SwitchRam.S +++ b/EmulatorPkg/Sec/X64/SwitchRam.S @@ -1,7 +1,7 @@ #-------------------------------------------------------------------------= ----- # # Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.
-# Portitions copyright (c) 2011, Apple Inc. All rights reserved. +# Portions copyright (c) 2011, Apple Inc. All rights reserved. # SPDX-License-Identifier: BSD-2-Clause-Patent # #-------------------------------------------------------------------------= ----- diff --git a/EmulatorPkg/Sec/X64/SwitchRam.asm b/EmulatorPkg/Sec/X64/Switch= Ram.asm index 73530bff39c2..e66bda5bf4e6 100644 --- a/EmulatorPkg/Sec/X64/SwitchRam.asm +++ b/EmulatorPkg/Sec/X64/SwitchRam.asm @@ -1,7 +1,7 @@ ;-------------------------------------------------------------------------= ----- ; ; Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.
-; Portitions copyright (c) 2011, Apple Inc. All rights reserved. +; Portions copyright (c) 2011, Apple Inc. All rights reserved. ; SPDX-License-Identifier: BSD-2-Clause-Patent ; ;-------------------------------------------------------------------------= ----- --=20 2.21.0