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.web10.1919.1578042514235029293 for ; Fri, 03 Jan 2020 01:08:34 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Ixk3Ogs1; 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=1578042513; 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=UQ8AT6i9BwNr4IkjurXa5ufXqrI1Ycaa2q0S+yRYn/4=; b=Ixk3Ogs12DpA6RbP9xL9rvCjnKEpY6ESdgQY37LlduTpOPSjshNtcQs4NP9aZnq8NTFBUS bZzJs9sBRQB44+AuCKagFZ5YTJUkV6WtkJUthSr2YMMLW4xaKffJCCHdu7brt475Wi+22C QAVgzB2nXwTzcaJ5+sKn1ZR/0wjMVxc= 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-382-yUYLIGoFMxeEJ5qptGxYSw-1; Fri, 03 Jan 2020 04:08:31 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C1BC1801E70; Fri, 3 Jan 2020 09:08:30 +0000 (UTC) Received: from x1w.redhat.com (ovpn-116-190.ams2.redhat.com [10.36.116.190]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 32EE07BA28; Fri, 3 Jan 2020 09:08:29 +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 v2 05/78] EmulatorPkg/Unix: Fix various typos Date: Fri, 3 Jan 2020 10:06:59 +0100 Message-Id: <20200103090812.10592-6-philmd@redhat.com> In-Reply-To: <20200103090812.10592-1-philmd@redhat.com> References: <20200103090812.10592-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-MC-Unique: yUYLIGoFMxeEJ5qptGxYSw-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: Antoine Coeur Reviewed-by: Philippe Mathieu-Daude Reviewed-by: Ray Ni 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(-) diff --git a/EmulatorPkg/Unix/Host/BerkeleyPacketFilter.c b/EmulatorPkg/Uni= x/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/BlockI= o.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 d= evice. + @retval EFI_MEDIA_CHANGED The MediaId does not match the current dev= ice. @retval EFI_DEVICE_ERROR The device reported an error while perform= ing the write. @retval EFI_BAD_BUFFER_SIZE The Buffer was not a multiple of the block= size of the device. @retval EFI_INVALID_PARAMETER The write request contains LBAs that are n= ot 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 no= t NULL. All outstanding data was written correctly = to the device if the Event is NULL. - @retval EFI_DEVICE_ERROR The device reported an error while writting= back + @retval EFI_DEVICE_ERROR The device reported an error while writing = 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 cont= ext. @param[in] ExtendedVerification Indicates that the driver may perform a= more - exhausive verfication operation of the = device + exhaustive verification operation of th= e device during reset. =20 @retval EFI_SUCCESS The device was reset. diff --git a/EmulatorPkg/Unix/Host/EmuThunk.c b/EmulatorPkg/Unix/Host/EmuTh= unk.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 function= s are not added. It looks like adding a element to end and not initializin= g - it may cause the table to be initaliized with the members at the end bei= ng + it may cause the table to be initialized with the members at the end bei= ng 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 variab= le. // 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 to + The size comes from the variable and the address comes from the call to 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 find = the + ImageContext - Input data returned from PE Loader Library. Used to find = 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++, Arra= y++) { 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 find = the + ImageContext - Input data returned from PE Loader Library. Used to find = 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/H= ost/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/Pthre= ads.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 threa= d. + // Acquire lock for global, SecFakePthreadStart runs in a different thre= ad. 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 sta= ck on 16 byte boundry. +// This is the 32 (0x20) byte to spill registers and 8 bytes to align sta= ck on 16 byte boundary. // .text =20 -// 32 byte shadow to spill rcx-r9, 8 bytes to align stack on 16 byte bound= ry +// 32 byte shadow to spill rcx-r9, 8 bytes to align stack on 16 byte bound= ary // 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 o= r 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/Hos= t/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,intern= al_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 This = Instance" @@ -304,7 +304,7 @@ def EFI_DEVICE_PATH_PROTOCOL_TypeSummary (valobj,intern= al_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_dic= t): 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_d= ict): if not target.RemoveModule (SBModule): print "!lldb.target.RemoveModule (%s) FAILED" % SBModu= le =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 str= ing + # Convert a 16-byte bytesarray (or bytearray compat object) to C guid st= ring # { 0xB402621F, 0xA940, 0x1E4A, { 0x86, 0x6B, 0x4D, 0xC9, 0x16, 0x2B, 0x= 34, 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 --=20 2.21.0