From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=209.132.183.28; helo=mx1.redhat.com; envelope-from=lersek@redhat.com; receiver=edk2-devel@lists.01.org Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 0D4BE211982DC for ; Mon, 3 Dec 2018 04:55:58 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8E90C3086263; Mon, 3 Dec 2018 12:55:57 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-61.rdu2.redhat.com [10.10.120.61]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2DC005C23D; Mon, 3 Dec 2018 12:55:55 +0000 (UTC) To: Ard Biesheuvel , edk2-devel@lists.01.org Cc: Yonghong Zhu , Liming Gao , Bob Feng , Jaben Carsey References: <20181130224537.18936-1-ard.biesheuvel@linaro.org> <20181130224537.18936-4-ard.biesheuvel@linaro.org> From: Laszlo Ersek Message-ID: Date: Mon, 3 Dec 2018 13:55:54 +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: <20181130224537.18936-4-ard.biesheuvel@linaro.org> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Mon, 03 Dec 2018 12:55:57 +0000 (UTC) Subject: Re: [PATCH v2 3/6] BaseTools/DevicePath: use explicit 64-bit number parsing routines X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Dec 2018 12:55:58 -0000 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit On 11/30/18 23:45, Ard Biesheuvel wrote: > Replace invocations of StrHexToUintn() with StrHexToUint64(), so > that we can drop the former. > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Ard Biesheuvel > Reviewed-by: Jaben Carsey > --- > BaseTools/Source/C/DevicePath/DevicePathFromText.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/BaseTools/Source/C/DevicePath/DevicePathFromText.c b/BaseTools/Source/C/DevicePath/DevicePathFromText.c > index 555efa1acdde..6151926af9aa 100644 > --- a/BaseTools/Source/C/DevicePath/DevicePathFromText.c > +++ b/BaseTools/Source/C/DevicePath/DevicePathFromText.c > @@ -520,7 +520,7 @@ EisaIdFromText ( > return (((Text[0] - 'A' + 1) & 0x1f) << 10) > + (((Text[1] - 'A' + 1) & 0x1f) << 5) > + (((Text[2] - 'A' + 1) & 0x1f) << 0) > - + (UINT32) (StrHexToUintn (&Text[3]) << 16) > + + (UINT32) (StrHexToUint64 (&Text[3]) << 16) > ; > } > This (theoretically) introduces a bit-shift on a UINT64 value, which might result in a compiler intrinsic call on 32-bit build hosts. But that's fine, because this is not firmware code, but hosted code. > @@ -1506,7 +1506,7 @@ DevPathFromTextNVMe ( > > Index = sizeof (Nvme->NamespaceUuid) / sizeof (UINT8); > while (Index-- != 0) { > - Uuid[Index] = (UINT8) StrHexToUintn (SplitStr (&NamespaceUuidStr, L'-')); > + Uuid[Index] = (UINT8) StrHexToUint64 (SplitStr (&NamespaceUuidStr, L'-')); > } > > return (EFI_DEVICE_PATH_PROTOCOL *) Nvme; > Reviewed-by: Laszlo Ersek Thanks Laszlo