MdeModulePkg: Refine casting expression result to bigger size

There are cases that the operands of an expression are all with rank less
than UINT64/INT64 and the result of the expression is explicitly cast to
UINT64/INT64 to fit the target size.

An example will be:
UINT32 a,b;
// a and b can be any unsigned int type with rank less than UINT64, like
// UINT8, UINT16, etc.
UINT64 c;
c = (UINT64) (a + b);

Some static code checkers may warn that the expression result might
overflow within the rank of "int" (integer promotions) and the result is
then cast to a bigger size.

The commit refines codes by the following rules:
1). When the expression is possible to overflow the range of unsigned int/
int:
c = (UINT64)a + b;

2). When the expression will not overflow within the rank of "int", remove
the explicit type casts:
c = a + b;

3). When the expression will be cast to pointer of possible greater size:
UINT32 a,b;
VOID *c;
c = (VOID *)(UINTN)(a + b); --> c = (VOID *)((UINTN)a + b);

4). When one side of a comparison expression contains only operands with
rank less than UINT32:
UINT8 a;
UINT16 b;
UINTN c;
if ((UINTN)(a + b) > c) {...} --> if (((UINT32)a + b) > c) {...}

For rule 4), if we remove the 'UINTN' type cast like:
if (a + b > c) {...}
The VS compiler will complain with warning C4018 (signed/unsigned
mismatch, level 3 warning) due to promoting 'a + b' to type 'int'.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
Reviewed-by: Feng Tian <feng.tian@intel.com>

6 files changed, 23 insertions, 23 deletions

diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/EhciReg.c b/MdeModulePkg/Bus/Pci/EhciDxe/EhciReg.c
index 3a6ed02..34836ec 100644
--- a/MdeModulePkg/Bus/Pci/EhciDxe/EhciReg.c
+++ b/MdeModulePkg/Bus/Pci/EhciDxe/EhciReg.c
@@ -2,7 +2,7 @@
 

   The EHCI register operation routines.

 

-Copyright (c) 2007 - 2012, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -76,7 +76,7 @@ EhcReadDbgRegister (
                              Ehc->PciIo,

                              EfiPciIoWidthUint32,

                              Ehc->DebugPortBarNum,

-                             (UINT64) (Ehc->DebugPortOffset + Offset),

+                             Ehc->DebugPortOffset + Offset,

                              1,

                              &Data

                              );

@@ -115,7 +115,7 @@ EhcReadOpReg (
                              Ehc->PciIo,

                              EfiPciIoWidthUint32,

                              EHC_BAR_INDEX,

-                             (UINT64) (Ehc->CapLen + Offset),

+                             Ehc->CapLen + Offset,

                              1,

                              &Data

                              );

@@ -152,7 +152,7 @@ EhcWriteOpReg (
                              Ehc->PciIo,

                              EfiPciIoWidthUint32,

                              EHC_BAR_INDEX,

-                             (UINT64) (Ehc->CapLen + Offset),

+                             Ehc->CapLen + Offset,

                              1,

                              &Data

                              );

diff --git a/MdeModulePkg/Bus/Pci/IdeBusPei/AtapiPeim.c b/MdeModulePkg/Bus/Pci/IdeBusPei/AtapiPeim.c
index be1b829..b1ab34d 100644
--- a/MdeModulePkg/Bus/Pci/IdeBusPei/AtapiPeim.c
+++ b/MdeModulePkg/Bus/Pci/IdeBusPei/AtapiPeim.c
@@ -5,7 +5,7 @@ ATA controllers in the platform.
 This PPI can be consumed by PEIM which produce gEfiPeiDeviceRecoveryModulePpiGuid

 for Atapi CD ROM device.

 

-Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>

 

 This program and the accompanying materials

 are licensed and made available under the terms and conditions

@@ -593,7 +593,7 @@ AtapiEnumerateDevices (
       //

       // Pata & Sata, Primary & Secondary channel, Master & Slave device

       //

-      DevicePosition = (UINTN) (Index1 * 2 + Index2);

+      DevicePosition = Index1 * 2 + Index2;

 

       if (DiscoverAtapiDevice (AtapiBlkIoDev, DevicePosition, &MediaInfo, &MediaInfo2)) {

         //

diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciOptionRomSupport.c b/MdeModulePkg/Bus/Pci/PciBusDxe/PciOptionRomSupport.c
index d2ad94e..3713c07 100644
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciOptionRomSupport.c
+++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciOptionRomSupport.c
@@ -305,7 +305,7 @@ GetOpRomInfo (
     return EFI_NOT_FOUND;

   }

 

-  PciIoDevice->RomSize = (UINT64) ((~AllOnes) + 1);

+  PciIoDevice->RomSize = (~AllOnes) + 1;

   return EFI_SUCCESS;

 }

 

diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c b/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c
index 0e1c86c..4d5937d 100644
--- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c
+++ b/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c
@@ -2,7 +2,7 @@
 

   The XHCI register operation routines.

 

-Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2011 - 2017, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -112,7 +112,7 @@ XhcReadOpReg (
                              Xhc->PciIo,

                              EfiPciIoWidthUint32,

                              XHC_BAR_INDEX,

-                             (UINT64) (Xhc->CapLength + Offset),

+                             Xhc->CapLength + Offset,

                              1,

                              &Data

                              );

@@ -148,7 +148,7 @@ XhcWriteOpReg (
                              Xhc->PciIo,

                              EfiPciIoWidthUint32,

                              XHC_BAR_INDEX,

-                             (UINT64) (Xhc->CapLength + Offset),

+                             Xhc->CapLength + Offset,

                              1,

                              &Data

                              );

@@ -181,7 +181,7 @@ XhcWriteOpReg16 (
                              Xhc->PciIo,

                              EfiPciIoWidthUint16,

                              XHC_BAR_INDEX,

-                             (UINT64) (Xhc->CapLength + Offset),

+                             Xhc->CapLength + Offset,

                              1,

                              &Data

                              );

@@ -215,7 +215,7 @@ XhcReadDoorBellReg (
                              Xhc->PciIo,

                              EfiPciIoWidthUint32,

                              XHC_BAR_INDEX,

-                             (UINT64) (Xhc->DBOff + Offset),

+                             Xhc->DBOff + Offset,

                              1,

                              &Data

                              );

@@ -251,7 +251,7 @@ XhcWriteDoorBellReg (
                              Xhc->PciIo,

                              EfiPciIoWidthUint32,

                              XHC_BAR_INDEX,

-                             (UINT64) (Xhc->DBOff + Offset),

+                             Xhc->DBOff + Offset,

                              1,

                              &Data

                              );

@@ -285,7 +285,7 @@ XhcReadRuntimeReg (
                              Xhc->PciIo,

                              EfiPciIoWidthUint32,

                              XHC_BAR_INDEX,

-                             (UINT64) (Xhc->RTSOff + Offset),

+                             Xhc->RTSOff + Offset,

                              1,

                              &Data

                              );

@@ -321,7 +321,7 @@ XhcWriteRuntimeReg (
                              Xhc->PciIo,

                              EfiPciIoWidthUint32,

                              XHC_BAR_INDEX,

-                             (UINT64) (Xhc->RTSOff + Offset),

+                             Xhc->RTSOff + Offset,

                              1,

                              &Data

                              );

@@ -355,7 +355,7 @@ XhcReadExtCapReg (
                              Xhc->PciIo,

                              EfiPciIoWidthUint32,

                              XHC_BAR_INDEX,

-                             (UINT64) (Xhc->ExtCapRegBase + Offset),

+                             Xhc->ExtCapRegBase + Offset,

                              1,

                              &Data

                              );

@@ -391,7 +391,7 @@ XhcWriteExtCapReg (
                              Xhc->PciIo,

                              EfiPciIoWidthUint32,

                              XHC_BAR_INDEX,

-                             (UINT64) (Xhc->ExtCapRegBase + Offset),

+                             Xhc->ExtCapRegBase + Offset,

                              1,

                              &Data

                              );

diff --git a/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsHci.c b/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsHci.c
index 332ce7e..1ef6c88 100644
--- a/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsHci.c
+++ b/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsHci.c
@@ -1,6 +1,6 @@
 /** @file

 

-  Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -589,9 +589,9 @@ UfsCreateDMCommandDesc (
   Trd->UcdBaU = (UINT32)RShiftU64 ((UINT64)(UINTN)QueryReqUpiu, 32);

   if (Opcode == UtpQueryFuncOpcodeWrDesc) {

     Trd->RuL  = (UINT16)DivU64x32 ((UINT64)ROUNDUP8 (sizeof (UTP_QUERY_RESP_UPIU)), sizeof (UINT32));

-    Trd->RuO  = (UINT16)DivU64x32 ((UINT64)(ROUNDUP8 (sizeof (UTP_QUERY_REQ_UPIU)) + ROUNDUP8 (DataSize)), sizeof (UINT32));

+    Trd->RuO  = (UINT16)DivU64x32 ((UINT64)ROUNDUP8 (sizeof (UTP_QUERY_REQ_UPIU)) + ROUNDUP8 (DataSize), sizeof (UINT32));

   } else {

-    Trd->RuL  = (UINT16)DivU64x32 ((UINT64)(ROUNDUP8 (sizeof (UTP_QUERY_RESP_UPIU)) + ROUNDUP8 (DataSize)), sizeof (UINT32));

+    Trd->RuL  = (UINT16)DivU64x32 ((UINT64)ROUNDUP8 (sizeof (UTP_QUERY_RESP_UPIU)) + ROUNDUP8 (DataSize), sizeof (UINT32));

     Trd->RuO  = (UINT16)DivU64x32 ((UINT64)ROUNDUP8 (sizeof (UTP_QUERY_REQ_UPIU)), sizeof (UINT32));

   }

 

diff --git a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruHci.c b/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruHci.c
index bc39cf8..3dd8cbf 100644
--- a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruHci.c
+++ b/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruHci.c
@@ -2,7 +2,7 @@
   UfsPassThruDxe driver is used to produce EFI_EXT_SCSI_PASS_THRU protocol interface

   for upper layer application to execute UFS-supported SCSI cmds.

 

-  Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -666,9 +666,9 @@ UfsCreateDMCommandDesc (
   Trd->UcdBaU = (UINT32)RShiftU64 ((UINT64)CmdDescPhyAddr, 32);

   if (Opcode == UtpQueryFuncOpcodeWrDesc) {

     Trd->RuL  = (UINT16)DivU64x32 ((UINT64)ROUNDUP8 (sizeof (UTP_QUERY_RESP_UPIU)), sizeof (UINT32));

-    Trd->RuO  = (UINT16)DivU64x32 ((UINT64)(ROUNDUP8 (sizeof (UTP_QUERY_REQ_UPIU)) + ROUNDUP8 (DataSize)), sizeof (UINT32));

+    Trd->RuO  = (UINT16)DivU64x32 ((UINT64)ROUNDUP8 (sizeof (UTP_QUERY_REQ_UPIU)) + ROUNDUP8 (DataSize), sizeof (UINT32));

   } else {

-    Trd->RuL  = (UINT16)DivU64x32 ((UINT64)(ROUNDUP8 (sizeof (UTP_QUERY_RESP_UPIU)) + ROUNDUP8 (DataSize)), sizeof (UINT32));

+    Trd->RuL  = (UINT16)DivU64x32 ((UINT64)ROUNDUP8 (sizeof (UTP_QUERY_RESP_UPIU)) + ROUNDUP8 (DataSize), sizeof (UINT32));

     Trd->RuO  = (UINT16)DivU64x32 ((UINT64)ROUNDUP8 (sizeof (UTP_QUERY_REQ_UPIU)), sizeof (UINT32));

   }