From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.81]) by mx.groups.io with SMTP id smtpd.web11.12613.1575906283560531901 for ; Mon, 09 Dec 2019 07:44:43 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=gl42vXv7; spf=pass (domain: redhat.com, ip: 207.211.31.81, mailfrom: lersek@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575906282; 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=pvjkRm3D0sq6Mfs1k1s/3JV3EzR6mQrjJOXFEZoa4YE=; b=gl42vXv7sehmtp1FWblnE9xLZeYLijUMmTIpdYaGt8DkJdIJPBrYN3ZQXmk+hEmnxb8KQI zK4Y5Q8ZP1odbTcmiaD7Rqb0N73Ufa7IHUPWIb2rWigJaNfqkPL4lXvfVMBvb2jbhL/sep nThL3dNObUbgIfMylnIgsvw4gugFIXI= 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-109-8oZK8zz9OTWkA6Oux5Q05Q-1; Mon, 09 Dec 2019 10:44:41 -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 BD69D8DA129; Mon, 9 Dec 2019 15:44:39 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (unknown [10.36.118.92]) by smtp.corp.redhat.com (Postfix) with ESMTP id C790860BE0; Mon, 9 Dec 2019 15:44:33 +0000 (UTC) Subject: Re: [PATCH 58/79] OvmfPkg/Qemu: Fix various typos To: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , devel@edk2.groups.io Cc: Antoine Coeur , Jordan Justen , Ard Biesheuvel , Gerd Hoffmann References: <20191203161602.15969-1-philmd@redhat.com> <20191203161602.15969-59-philmd@redhat.com> <45bfbd81-3c44-048f-327e-3c8c3fe3009c@redhat.com> <516728a5-c9db-cb14-dd6b-2f74d0166b67@redhat.com> From: "Laszlo Ersek" Message-ID: <2b0e5aba-9924-67ab-3474-c1088c38e03a@redhat.com> Date: Mon, 9 Dec 2019 16:44:32 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <516728a5-c9db-cb14-dd6b-2f74d0166b67@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: 8oZK8zz9OTWkA6Oux5Q05Q-1 X-Mimecast-Spam-Score: 0 Content-Language: en-US Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 12/09/19 13:55, Philippe Mathieu-Daud=C3=A9 wrote: > Hi Laszlo, >=20 > On 12/3/19 10:00 PM, Laszlo Ersek wrote: >> On 12/03/19 17:15, Philippe Mathieu-Daude wrote: >>> From: Antoine Coeur >>> >>> Fix various typos in comments and documentation. >>> >>> Cc: Jordan Justen >>> Cc: Laszlo Ersek >>> Cc: Ard Biesheuvel >>> Reviewed-by: Philippe Mathieu-Daude >>> Signed-off-by: Philippe Mathieu-Daude >>> --- >>> =C2=A0 OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf= |=C2=A0 >>> 4 ++-- >>> =C2=A0 OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesSmm.inf=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 >>> 4 ++-- >>> =C2=A0 OvmfPkg/AcpiPlatformDxe/Qemu.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0 |=C2=A0 >>> 4 ++-- >>> =C2=A0 OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 >>> 2 +- >>> =C2=A0 OvmfPkg/Library/DxePciLibI440FxQ35/PciLib.c=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 >>> 4 ++-- >>> =C2=A0 OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.c=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 >>> 2 +- >>> =C2=A0 OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxe.c=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 >>> 2 +- >>> =C2=A0 OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbInfo.c=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0 |=C2=A0 >>> 4 ++-- >>> =C2=A0 OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 >>> 8 ++++---- >>> =C2=A0 OvmfPkg/QemuVideoDxe/Driver.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 >>> 2 +- >>> =C2=A0 OvmfPkg/QemuVideoDxe/VbeShim.asm=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0 | >>> 14 +++++++------- >>> =C2=A0 11 files changed, 25 insertions(+), 25 deletions(-) >>> > [...]>> diff --git a/OvmfPkg/QemuVideoDxe/VbeShim.asm > b/OvmfPkg/QemuVideoDxe/VbeShim.asm >>> index cb2a60d8278d..1d284b264124 100644 >>> --- a/OvmfPkg/QemuVideoDxe/VbeShim.asm >>> +++ b/OvmfPkg/QemuVideoDxe/VbeShim.asm >>> @@ -49,7 +49,7 @@ Handler: >>> =C2=A0=C2=A0=C2=A0 je=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 R= eadEdid >>> =C2=A0=C2=A0=C2=A0 cmp=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ah, 0x= 00 >>> =C2=A0=C2=A0=C2=A0 je=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 S= etModeLegacy >>> -=C2=A0 DebugLog=C2=A0=C2=A0 StrUnkownFunction >>> +=C2=A0 DebugLog=C2=A0=C2=A0 StrUnknownFunction >>> =C2=A0 Hang: >>> =C2=A0=C2=A0=C2=A0 jmp=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 Hang >>> =C2=A0 @@ -93,7 +93,7 @@ GetModeInfo: >>> =C2=A0=C2=A0=C2=A0 and=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 cx, ~0= x4000 ; clear potentially set LFB bit in mode >>> number >>> =C2=A0=C2=A0=C2=A0 cmp=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 cx, 0x= 00f1 >>> =C2=A0=C2=A0=C2=A0 je=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 K= nownMode1 >>> -=C2=A0 DebugLog=C2=A0=C2=A0 StrUnkownMode >>> +=C2=A0 DebugLog=C2=A0=C2=A0 StrUnknownMode >>> =C2=A0=C2=A0=C2=A0 jmp=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 Hang >>> =C2=A0 KnownMode1: >>> =C2=A0=C2=A0=C2=A0 ; target (es:di) set on input >>> @@ -155,7 +155,7 @@ SetMode: >>> =C2=A0 =C2=A0=C2=A0=C2=A0 cmp=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= bx, 0x40f1 >>> =C2=A0=C2=A0=C2=A0 je=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 K= nownMode2 >>> -=C2=A0 DebugLog=C2=A0=C2=A0 StrUnkownMode >>> +=C2=A0 DebugLog=C2=A0=C2=A0 StrUnknownMode >>> =C2=A0=C2=A0=C2=A0 jmp=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 Hang >>> =C2=A0 KnownMode2: >>> =C2=A0 @@ -203,7 +203,7 @@ SetModeLegacy: >>> =C2=A0=C2=A0=C2=A0 je=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 K= nownMode3 >>> =C2=A0=C2=A0=C2=A0 cmp=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 al, 0x= 12 >>> =C2=A0=C2=A0=C2=A0 je=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 K= nownMode4 >>> -=C2=A0 DebugLog=C2=A0=C2=A0 StrUnkownMode >>> +=C2=A0 DebugLog=C2=A0=C2=A0 StrUnknownMode >>> =C2=A0=C2=A0=C2=A0 jmp=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 Hang >>> =C2=A0 KnownMode3: >>> =C2=A0=C2=A0=C2=A0 mov=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 al, 0x= 30 >>> @@ -252,7 +252,7 @@ StrExitSuccess: >>> =C2=A0 StrExitUnsupported: >>> =C2=A0=C2=A0=C2=A0 db 'Unsupported', 0x0a, 0 >>> =C2=A0 -StrUnkownFunction: >>> +StrUnknownFunction: >>> =C2=A0=C2=A0=C2=A0 db 'Unknown Function', 0x0a, 0 >>> =C2=A0 =C2=A0 StrEnterGetInfo: >>> @@ -270,8 +270,8 @@ StrEnterSetMode: >>> =C2=A0 StrEnterSetModeLegacy: >>> =C2=A0=C2=A0=C2=A0 db 'SetModeLegacy', 0x0a, 0 >>> =C2=A0 -StrUnkownMode: >>> -=C2=A0 db 'Unkown Mode', 0x0a, 0 >>> +StrUnknownMode: >>> +=C2=A0 db 'Unknown Mode', 0x0a, 0 >>> =C2=A0 =C2=A0 StrGetPmCapabilities: >>> =C2=A0=C2=A0=C2=A0 db 'GetPmCapabilities', 0x0a, 0 >>> >> >> If you modify "VbeShim.asm", then please re-run "VbeShim.sh", for >> updating "VbeShim.h". >=20 > The DEBUG macro at the head of VbeShim.asm is commented out: >=20 > =C2=A0 ;%define DEBUG >=20 >=20 > So the string "Unknown Mode" is not used. Hmmm, OK. I did realize that DEBUG was commented out, and that that made "StrUnkownMode" un-referenced. However, I didn't know that NASM would eliminate unreferenced data. >=20 > Side note, running VbeShim.sh on Fedora 30 I get: >=20 > $ git diff --word-diff > --- a/OvmfPkg/QemuVideoDxe/VbeShim.h > +++ b/OvmfPkg/QemuVideoDxe/VbeShim.h > @@ -523,13 +523,13 @@ STATIC CONST UINT8 mVbeShim[] =3D { > =C2=A0 /* 0000020A cmp ax,0x4f02=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 */=C2=A0 0x= 3D, 0x02, 0x4F, > =C2=A0 /* 0000020D jz 0x269=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0 */=C2=A0 0x74, 0x5A, > =C2=A0 /* 0000020F cmp ax,0x4f03=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 */=C2=A0 0x= 3D, 0x03, 0x4F, > =C2=A0 /* 00000212 jz [-word-]{+near+} 0x331=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= */=C2=A0 0x0F, 0x84, > 0x1B, 0x01, > =C2=A0 /* 00000216 cmp ax,0x4f10=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 */=C2=A0 0x= 3D, 0x10, 0x4F, > =C2=A0 /* 00000219 jz [-word-]{+near+} 0x336=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= */=C2=A0 0x0F, 0x84, > 0x19, 0x01, > =C2=A0 /* 0000021D cmp ax,0x4f15=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 */=C2=A0 0x= 3D, 0x15, 0x4F, > =C2=A0 /* 00000220 jz [-word-]{+near+} 0x338=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= */=C2=A0 0x0F, 0x84, > 0x14, 0x01, > =C2=A0 /* 00000224 cmp ah,0x0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0 */=C2=A0 0x80, 0xFC, 0x00, > =C2=A0 /* 00000227 jz [-word-]{+near+} 0x33a=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= */=C2=A0 0x0F, 0x84, > 0x0F, 0x01, > =C2=A0 /* 0000022B jmp short 0x22b=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 */=C2=A0 0xEB, 0xFE, > =C2=A0 /* 0000022D push es=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0 */=C2=A0 0x06, > =C2=A0 /* 0000022E push di=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0 */=C2=A0 0x57, > @@ -547,7 +547,7 @@ STATIC CONST UINT8 mVbeShim[] =3D { > =C2=A0 /* 0000023F pop ds=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0 */=C2=A0 0x1F, > =C2=A0 /* 00000240 pop di=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0 */=C2=A0 0x5F, > =C2=A0 /* 00000241 pop es=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0 */=C2=A0 0x07, > =C2=A0 /* 00000242 jmp[-word-] 0x34c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 */=C2=A0 0xE9, 0x07, 0x01, > =C2=A0 /* 00000245 push es=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0 */=C2=A0 0x06, > =C2=A0 /* 00000246 push di=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0 */=C2=A0 0x57, > =C2=A0 /* 00000247 push ds=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0 */=C2=A0 0x1E, > @@ -568,7 +568,7 @@ STATIC CONST UINT8 mVbeShim[] =3D { > =C2=A0 /* 00000263 pop ds=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0 */=C2=A0 0x1F, > =C2=A0 /* 00000264 pop di=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0 */=C2=A0 0x5F, > =C2=A0 /* 00000265 pop es=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0 */=C2=A0 0x07, > =C2=A0 /* 00000266 jmp[-word-] 0x34c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 */=C2=A0 0xE9, 0xE3, 0x00, > =C2=A0 /* 00000269 push dx=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0 */=C2=A0 0x52, > =C2=A0 /* 0000026A push ax=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0 */=C2=A0 0x50, > =C2=A0 /* 0000026B cmp bx,0x40f1=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 */=C2=A0 0x= 81, 0xFB, 0xF1, 0x40, > @@ -688,14 +688,14 @@ STATIC CONST UINT8 mVbeShim[] =3D { > =C2=A0 /* 0000033C jz 0x345=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0 */=C2=A0 0x74, 0x07, > =C2=A0 /* 0000033E cmp al,0x12=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 */= =C2=A0 0x3C, 0x12, > =C2=A0 /* 00000340 jz 0x349=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0 */=C2=A0 0x74, 0x07, > =C2=A0 /* 00000342 jmp[-word-] 0x22b=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 */=C2=A0 0xE9, 0xE6, 0xFE, > =C2=A0 /* 00000345 mov al,0x30=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 */= =C2=A0 0xB0, 0x30, > =C2=A0 /* 00000347 jmp short 0x34b=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 */=C2=A0 0xEB, 0x02, > =C2=A0 /* 00000349 mov al,0x20=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 */= =C2=A0 0xB0, 0x20, > =C2=A0 /* 0000034B [-iretw-]{+iret+}=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 */=C2=A0 0xCF, > =C2=A0 /* 0000034C mov ax,0x4f=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 */= =C2=A0 0xB8, 0x4F, 0x00, > =C2=A0 /* 0000034F [-iretw-]{+iret+}=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 */=C2=A0 0xCF, > =C2=A0 /* 00000350 mov ax,0x14f=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 */=C2=A0= 0xB8, 0x4F, 0x01, > =C2=A0 /* 00000353 [-iretw-]{+iret+}=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 */=C2=A0 0xCF, > }; > #endif >=20 > The nasm packaged is: >=20 > $ nasm -v > NASM version 2.13.03 compiled on Feb=C2=A0 2 2019 >=20 > While NASM 2.12 is documented here: >=20 > https://github.com/tianocore/tianocore.github.io/wiki/Nasm-Setup >=20 > Should I downgrade it? >=20 No, don't bother, just please update the commit message that the byte array in "VbeShim.h" does *not* change, as a result of this patch. With the commit message update: Reviewed-by: Laszlo Ersek Thanks! Laszlo