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 <[email protected]>
> Reviewed-by: Jaben Carsey <[email protected]>
> ---
> 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 <[email protected]>
Thanks
Laszlo
_______________________________________________
edk2-devel mailing list
[email protected]
https://lists.01.org/mailman/listinfo/edk2-devel
