From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mx.groups.io with SMTP id smtpd.web12.5940.1576823920944878674 for ; Thu, 19 Dec 2019 22:38:41 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.65, mailfrom: ray.ni@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Dec 2019 22:38:40 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,334,1571727600"; d="scan'208";a="267443538" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by FMSMGA003.fm.intel.com with ESMTP; 19 Dec 2019 22:38:40 -0800 Received: from fmsmsx155.amr.corp.intel.com (10.18.116.71) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 19 Dec 2019 22:38:39 -0800 Received: from shsmsx105.ccr.corp.intel.com (10.239.4.158) by FMSMSX155.amr.corp.intel.com (10.18.116.71) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 19 Dec 2019 22:38:39 -0800 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.90]) by SHSMSX105.ccr.corp.intel.com ([169.254.11.72]) with mapi id 14.03.0439.000; Fri, 20 Dec 2019 14:38:37 +0800 From: "Ni, Ray" To: Philippe Mathieu-Daude , "devel@edk2.groups.io" CC: Antoine Coeur , "Justen, Jordan L" , Andrew Fish Subject: Re: [PATCH 06/79] EmulatorPkg/Unix: Fix various typos Thread-Topic: [PATCH 06/79] EmulatorPkg/Unix: Fix various typos Thread-Index: AQHVqfUd6F0WEcqgmUi3s55BI+G9xKfCq5LQ Date: Fri, 20 Dec 2019 06:38:36 +0000 Deferred-Delivery: Fri, 20 Dec 2019 06:37:00 +0000 Message-ID: <734D49CCEBEEF84792F5B80ED585239D5C3A4174@SHSMSX104.ccr.corp.intel.com> References: <20191203161602.15969-1-philmd@redhat.com> <20191203161602.15969-7-philmd@redhat.com> In-Reply-To: <20191203161602.15969-7-philmd@redhat.com> Accept-Language: en-US, zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: ray.ni@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Ray Ni > -----Original Message----- > From: Philippe Mathieu-Daude > Sent: Wednesday, December 4, 2019 12:15 AM > To: devel@edk2.groups.io > Cc: Antoine Coeur ; Justen, Jordan L > ; Andrew Fish ; Ni, Ray > ; Philippe Mathieu-Daude > Subject: [PATCH 06/79] EmulatorPkg/Unix: Fix various typos >=20 > From: Antoine Coeur >=20 > Fix various typos in comments and documentation. >=20 > 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/Unix/Host/BerkeleyPacketFilter.c | 2 +- > EmulatorPkg/Unix/Host/BlockIo.c | 12 ++++----- > EmulatorPkg/Unix/Host/EmuThunk.c | 2 +- > EmulatorPkg/Unix/Host/Host.c | 26 ++++++++++---------- > EmulatorPkg/Unix/Host/LinuxPacketFilter.c | 2 +- > EmulatorPkg/Unix/Host/Pthreads.c | 2 +- > EmulatorPkg/Unix/GdbRun.sh | 4 +-- > EmulatorPkg/Unix/Host/X64/Gasket.S | 4 +-- > EmulatorPkg/Unix/Host/X64/SwitchStack.S | 2 +- > EmulatorPkg/Unix/lldbefi.py | 14 +++++------ > 10 files changed, 35 insertions(+), 35 deletions(-) >=20 > diff --git a/EmulatorPkg/Unix/Host/BerkeleyPacketFilter.c > b/EmulatorPkg/Unix/Host/BerkeleyPacketFilter.c > index 3013bbc86b27..441f1e8d0afe 100644 > --- a/EmulatorPkg/Unix/Host/BerkeleyPacketFilter.c > +++ b/EmulatorPkg/Unix/Host/BerkeleyPacketFilter.c > @@ -5,7 +5,7 @@ > Tested on Mac OS X. >=20 > Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.
> -Portitions copyright (c) 2011, Apple Inc. All rights reserved. > +Portions copyright (c) 2011, Apple Inc. All rights reserved. >=20 > SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > diff --git a/EmulatorPkg/Unix/Host/BlockIo.c > b/EmulatorPkg/Unix/Host/BlockIo.c > index 07e39347e42b..18368060d59a 100644 > --- a/EmulatorPkg/Unix/Host/BlockIo.c > +++ b/EmulatorPkg/Unix/Host/BlockIo.c > @@ -398,7 +398,7 @@ EmuBlockIoReadBlocks ( > Done: > if (Token !=3D NULL) { > if (Token->Event !=3D NULL) { > - // Caller is responcible for signaling EFI Event > + // Caller is responsible for signaling EFI Event > Token->TransactionStatus =3D Status; > return EFI_SUCCESS; > } > @@ -429,7 +429,7 @@ Done: > the Event is NULL. > @retval EFI_WRITE_PROTECTED The device can not be written to. > @retval EFI_NO_MEDIA There is no media in the device. > - @retval EFI_MEDIA_CHNAGED The MediaId does not matched the > current device. > + @retval EFI_MEDIA_CHANGED The MediaId does not match the current > device. > @retval EFI_DEVICE_ERROR The device reported an error while > performing the write. > @retval EFI_BAD_BUFFER_SIZE The Buffer was not a multiple of the blo= ck > size of the device. > @retval EFI_INVALID_PARAMETER The write request contains LBAs that are > not valid, > @@ -477,7 +477,7 @@ EmuBlockIoWriteBlocks ( > Done: > if (Token !=3D NULL) { > if (Token->Event !=3D NULL) { > - // Caller is responcible for signaling EFI Event > + // Caller is responsible for signaling EFI Event > Token->TransactionStatus =3D Status; > return EFI_SUCCESS; > } > @@ -500,7 +500,7 @@ Done: > @retval EFI_SUCCESS The flush request was queued if Event is = not > NULL. > All outstanding data was written correctl= y to the > device if the Event is NULL. > - @retval EFI_DEVICE_ERROR The device reported an error while writti= ng > back > + @retval EFI_DEVICE_ERROR The device reported an error while writin= g > back > the data. > @retval EFI_WRITE_PROTECTED The device cannot be written to. > @retval EFI_NO_MEDIA There is no media in the device. > @@ -529,7 +529,7 @@ EmuBlockIoFlushBlocks ( >=20 > if (Token !=3D NULL) { > if (Token->Event !=3D NULL) { > - // Caller is responcible for signaling EFI Event > + // Caller is responsible for signaling EFI Event > Token->TransactionStatus =3D EFI_SUCCESS; > return EFI_SUCCESS; > } > @@ -544,7 +544,7 @@ EmuBlockIoFlushBlocks ( >=20 > @param[in] This Indicates a pointer to the calling co= ntext. > @param[in] ExtendedVerification Indicates that the driver may perform= a > more > - exhausive verfication operation of th= e device > + exhaustive verification operation of = the device > during reset. >=20 > @retval EFI_SUCCESS The device was reset. > diff --git a/EmulatorPkg/Unix/Host/EmuThunk.c > b/EmulatorPkg/Unix/Host/EmuThunk.c > index 1e9dc99187db..b8b0651c6ab0 100644 > --- a/EmulatorPkg/Unix/Host/EmuThunk.c > +++ b/EmulatorPkg/Unix/Host/EmuThunk.c > @@ -6,7 +6,7 @@ > The mUnixThunkTable exists so that a change to > EFI_EMU_THUNK_PROTOCOL > will cause an error in initializing the array if all the member functi= ons > are not added. It looks like adding a element to end and not initializ= ing > - it may cause the table to be initaliized with the members at the end b= eing > + it may cause the table to be initialized with the members at the end b= eing > set to zero. This is bad as jumping to zero will crash. >=20 > Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.
> diff --git a/EmulatorPkg/Unix/Host/Host.c b/EmulatorPkg/Unix/Host/Host.c > index b431a4c2ed39..b4e5510613c8 100644 > --- a/EmulatorPkg/Unix/Host/Host.c > +++ b/EmulatorPkg/Unix/Host/Host.c > @@ -38,7 +38,7 @@ UINTN gFdInfoCount =3D 0; > EMU_FD_INFO *gFdInfo; >=20 > // > -// Array that supports seperate memory rantes. > +// Array that supports separate memory ranges. > // The memory ranges are set in system.cmd via the EFI_MEMORY_SIZE > variable. > // The number of array elements is allocated base on parsing > // EFI_MEMORY_SIZE and the memory is never freed. > @@ -379,7 +379,7 @@ Arguments: > Returns: > EFI_SUCCESS - The file was opened and mapped. > EFI_NOT_FOUND - FileName was not found in the current directory > - EFI_DEVICE_ERROR - An error occured attempting to map the opened file > + EFI_DEVICE_ERROR - An error occurred attempting to map the opened file >=20 > **/ > EFI_STATUS > @@ -523,7 +523,7 @@ Arguments: > PeiCorePe32File - SEC PE32 >=20 > Returns: > - Success means control is transfered and thus we should never return > + Success means control is transferred and thus we should never return >=20 > **/ > VOID > @@ -611,7 +611,7 @@ Routine Description: > It allows discontinuous memory regions to be supported by the emulator= . > It uses gSystemMemory[] and gSystemMemoryCount that were created by > parsing the host environment variable EFI_MEMORY_SIZE. > - The size comes from the varaible and the address comes from the call t= o > + The size comes from the variable and the address comes from the call t= o > UnixOpenFile. >=20 > Arguments: > @@ -661,7 +661,7 @@ Routine Description: >=20 > This is all of GCD for system memory passed to DXE Core. FV > mapping and other device mapped into system memory are not > - inlcuded in the check. > + included in the check. >=20 > Arguments: > Index - Which memory region to use > @@ -775,7 +775,7 @@ SecPeCoffGetEntryPoint ( >=20 > Routine Description: > Return the FD Size and base address. Since the FD is loaded from a > - file into host memory only the SEC will know it's address. > + file into host memory only the SEC will know its address. >=20 > Arguments: > Index - Which FD, starts at zero. > @@ -898,7 +898,7 @@ Routine Description: > The ModHandle is needed to unload the image. >=20 > Arguments: > - ImageContext - Input data returned from PE Laoder Library. Used to fin= d > the > + ImageContext - Input data returned from PE Loader Library. Used to fin= d > the > .PDB file name of the PE Image. > ModHandle - Returned from LoadLibraryEx() and stored for call to > FreeLibrary(). > @@ -922,7 +922,7 @@ AddHandle ( > for (Index =3D 0; Index < mImageContextModHandleArraySize; Index++, > Array++) { > if (Array->ImageContext =3D=3D NULL) { > // > - // Make a copy of the stirng and store the ModHandle > + // Make a copy of the string and store the ModHandle > // > Array->ImageContext =3D ImageContext; > Array->ModHandle =3D ModHandle; > @@ -933,7 +933,7 @@ AddHandle ( > // > // No free space in mImageContextModHandleArray so grow it by > // IMAGE_CONTEXT_TO_MOD_HANDLE entires. realloc will > - // copy the old values to the new locaiton. But it does > + // copy the old values to the new location. But it does > // not zero the new memory area. > // > PreviousSize =3D mImageContextModHandleArraySize * sizeof > (IMAGE_CONTEXT_TO_MOD_HANDLE); > @@ -961,11 +961,11 @@ Routine Description: > Return the ModHandle and delete the entry in the array. >=20 > Arguments: > - ImageContext - Input data returned from PE Laoder Library. Used to fin= d > the > + ImageContext - Input data returned from PE Loader Library. Used to fin= d > the > .PDB file name of the PE Image. >=20 > Returns: > - ModHandle - ModHandle assoicated with ImageContext is returned > + ModHandle - ModHandle associated with ImageContext is returned > NULL - No ModHandle associated with ImageContext >=20 > **/ > @@ -1129,7 +1129,7 @@ SecGdbScriptBreak ( >=20 >=20 > /** > - Adds the image to a gdb script so it's symbols can be loaded. > + Adds the image to a gdb script so its symbols can be loaded. > The AddFirmwareSymbolFile helper macro is used. >=20 > @param ImageContext The PE/COFF image context > @@ -1202,7 +1202,7 @@ SecPeCoffRelocateImageExtraAction ( >=20 >=20 > /** > - Adds the image to a gdb script so it's symbols can be unloaded. > + Adds the image to a gdb script so its symbols can be unloaded. > The RemoveFirmwareSymbolFile helper macro is used. >=20 > @param ImageContext The PE/COFF image context > diff --git a/EmulatorPkg/Unix/Host/LinuxPacketFilter.c > b/EmulatorPkg/Unix/Host/LinuxPacketFilter.c > index a8028d18ff56..2b772ab884c2 100644 > --- a/EmulatorPkg/Unix/Host/LinuxPacketFilter.c > +++ b/EmulatorPkg/Unix/Host/LinuxPacketFilter.c > @@ -6,7 +6,7 @@ > is just a template that needs to get filled in. >=20 > Copyright (c) 2004 - 2009, Intel Corporation. All rights reserved.
> -Portitions copyright (c) 2011, Apple Inc. All rights reserved. > +Portions copyright (c) 2011, Apple Inc. All rights reserved. >=20 > SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > diff --git a/EmulatorPkg/Unix/Host/Pthreads.c > b/EmulatorPkg/Unix/Host/Pthreads.c > index f07bcfce66f3..025687c356fd 100644 > --- a/EmulatorPkg/Unix/Host/Pthreads.c > +++ b/EmulatorPkg/Unix/Host/Pthreads.c > @@ -133,7 +133,7 @@ PthreadCreate ( > EnabledOnEntry =3D FALSE; > } >=20 > - // Aquire lock for global, SecFakePthreadStart runs in a different thr= ead. > + // Acquire lock for global, SecFakePthreadStart runs in a different th= read. > pthread_mutex_lock (&mThreadMangle.Mutex); > mThreadMangle.Start =3D Start; >=20 > diff --git a/EmulatorPkg/Unix/GdbRun.sh b/EmulatorPkg/Unix/GdbRun.sh > index 8c761ff2c9b5..b050ad5e2c5c 100644 > --- a/EmulatorPkg/Unix/GdbRun.sh > +++ b/EmulatorPkg/Unix/GdbRun.sh > @@ -62,8 +62,8 @@ define RemoveFirmwareSymbolFile > end >=20 > if gInXcode =3D=3D 1 > - # in Xcode the program is already runing. Issuing a run command > - # will cause a fatal debugger error. The break point sciprt that > + # in Xcode the program is already running. Issuing a run command > + # will cause a fatal debugger error. The break point script that > # is used to source this script sets gInCode to 1. > else > # > diff --git a/EmulatorPkg/Unix/Host/X64/Gasket.S > b/EmulatorPkg/Unix/Host/X64/Gasket.S > index a9ca707562f9..030faa8e4c36 100644 > --- a/EmulatorPkg/Unix/Host/X64/Gasket.S > +++ b/EmulatorPkg/Unix/Host/X64/Gasket.S > @@ -15,11 +15,11 @@ > // > // Gaskets are EFI ABI to UNIX ABI calls > // EFI ABI code will sub 40 (0x28) from %rsp before calling a function > -// This is the 32 (0x20) byte to spill registers and 8 bytes to align s= tack on 16 > byte boundry. > +// This is the 32 (0x20) byte to spill registers and 8 bytes to align s= tack on 16 > byte boundary. > // > .text >=20 > -// 32 byte shadow to spill rcx-r9, 8 bytes to align stack on 16 byte bou= ndry > +// 32 byte shadow to spill rcx-r9, 8 bytes to align stack on 16 byte bou= ndary > // Any call with 0 - 4 arguments allocates 40 bytes on the stack. > // For more than 4 args you always have to increase in quanta of 16 so 5= or 6 > args is 56, > // 7 or 8 args is 72, and 9 or 10 args is 88 > diff --git a/EmulatorPkg/Unix/Host/X64/SwitchStack.S > b/EmulatorPkg/Unix/Host/X64/SwitchStack.S > index 4126cc99124a..36838bf29efb 100644 > --- a/EmulatorPkg/Unix/Host/X64/SwitchStack.S > +++ b/EmulatorPkg/Unix/Host/X64/SwitchStack.S > @@ -1,7 +1,7 @@ > #-----------------------------------------------------------------------= ------- > # > # Copyright (c) 2006 - 2008, 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/Unix/lldbefi.py b/EmulatorPkg/Unix/lldbefi.py > index 7f99a7f83fcc..c3fb2675cbc1 100755 > --- a/EmulatorPkg/Unix/lldbefi.py > +++ b/EmulatorPkg/Unix/lldbefi.py > @@ -1,7 +1,7 @@ > #!/usr/bin/python >=20 > # > -# Copyright 2014 Apple Inc. All righes reserved. > +# Copyright 2014 Apple Inc. All rights reserved. > # > # SPDX-License-Identifier: BSD-2-Clause-Patent > # > @@ -278,7 +278,7 @@ def EFI_DEVICE_PATH_PROTOCOL_TypeSummary > (valobj,internal_dict): >=20 > Address =3D long ("%d" % valobj.addr) > if (Address =3D=3D lldb.LLDB_INVALID_ADDRESS): > - # Need to reserach this, it seems to be the nested struct case > + # Need to research this, it seems to be the nested struct case > ExprStr =3D "" > elif (Type & 0x7f =3D=3D 0x7f): > ExprStr =3D "End Device Path" if SubType =3D=3D 0xff else "End Thi= s Instance" > @@ -304,7 +304,7 @@ def EFI_DEVICE_PATH_PROTOCOL_TypeSummary > (valobj,internal_dict): >=20 > def TypePrintFormating(debugger): > # > - # Set the default print formating for EFI types in lldb. > + # Set the default print formatting for EFI types in lldb. > # seems lldb defaults to decimal. > # > category =3D debugger.GetDefaultCategory() > @@ -390,7 +390,7 @@ def LoadEmulatorEfiSymbols(frame, bp_loc , > internal_dict): > FileName =3D frame.thread.process.ReadCStringFromMemory (FileNamePtr= , > FileNameLen, Error) > if not Error.Success(): > print "!ReadCStringFromMemory() did not find a %d byte C string = at %x" % > (FileNameLen, FileNamePtr) > - # make breakpoint command contiue > + # make breakpoint command continue > return False >=20 > debugger =3D frame.thread.process.target.debugger > @@ -410,12 +410,12 @@ def LoadEmulatorEfiSymbols(frame, bp_loc , > internal_dict): > if not target.RemoveModule (SBModule): > print "!lldb.target.RemoveModule (%s) FAILED" % SBMo= dule >=20 > - # make breakpoint command contiue > + # make breakpoint command continue > return False >=20 > def GuidToCStructStr (guid, Name=3DFalse): > # > - # Convert a 16-byte bytesarry (or bytearray compat object) to C guid s= tring > + # Convert a 16-byte bytesarray (or bytearray compat object) to C guid > string > # { 0xB402621F, 0xA940, 0x1E4A, { 0x86, 0x6B, 0x4D, 0xC9, 0x16, 0x2B, = 0x34, > 0x7C } } > # > # Name=3DTrue means lookup name in GuidNameDict and us it if you find = it > @@ -522,7 +522,7 @@ def __lldb_init_module (debugger, internal_dict): > if len(data) >=3D 2: > guid_dict[data[0].upper()] =3D data[1].strip('\n') >=20 > - # init EFI specific type formaters > + # init EFI specific type formatters > TypePrintFormating (debugger) >=20 >=20 > -- > 2.21.0