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>

34 files changed, 110 insertions, 118 deletions

diff --git a/MdeModulePkg/Application/UiApp/FrontPage.c b/MdeModulePkg/Application/UiApp/FrontPage.c
index ad5af2c..adee67a 100644
--- a/MdeModulePkg/Application/UiApp/FrontPage.c
+++ b/MdeModulePkg/Application/UiApp/FrontPage.c
@@ -399,7 +399,7 @@ ConvertProcessorToString (
 

   if (Base10Exponent >= 6) {

     FreqMhz = ProcessorFrequency;

-    for (Index = 0; Index < (UINTN) (Base10Exponent - 6); Index++) {

+    for (Index = 0; Index < (UINT32) Base10Exponent - 6; Index++) {

       FreqMhz *= 10;

     }

   } else {

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));

   }

 

diff --git a/MdeModulePkg/Core/Dxe/Image/Image.c b/MdeModulePkg/Core/Dxe/Image/Image.c
index 652da8b..80128e7 100644
--- a/MdeModulePkg/Core/Dxe/Image/Image.c
+++ b/MdeModulePkg/Core/Dxe/Image/Image.c
@@ -313,8 +313,8 @@ CheckAndMarkFixLoadingMemoryUsageBitMap (
    //

    // Test if the memory is avalaible or not.

    // 

-   BaseOffsetPageNumber = (UINTN)EFI_SIZE_TO_PAGES((UINT32)(ImageBase - DxeCodeBase));

-   TopOffsetPageNumber  = (UINTN)EFI_SIZE_TO_PAGES((UINT32)(ImageBase + ImageSize - DxeCodeBase));

+   BaseOffsetPageNumber = EFI_SIZE_TO_PAGES((UINT32)(ImageBase - DxeCodeBase));

+   TopOffsetPageNumber  = EFI_SIZE_TO_PAGES((UINT32)(ImageBase + ImageSize - DxeCodeBase));

    for (Index = BaseOffsetPageNumber; Index < TopOffsetPageNumber; Index ++) {

      if ((mDxeCodeMemoryRangeUsageBitMap[Index / 64] & LShiftU64(1, (Index % 64))) != 0) {

        //

@@ -366,12 +366,10 @@ GetPeCoffImageFixLoadingAssignedAddress(
    //

    Handle = (IMAGE_FILE_HANDLE*)ImageContext->Handle;

    ImgHdr = (EFI_IMAGE_OPTIONAL_HEADER_UNION *)((CHAR8* )Handle->Source + ImageContext->PeCoffHeaderOffset);

-   SectionHeaderOffset = (UINTN)(

-                                 ImageContext->PeCoffHeaderOffset +

-                                 sizeof (UINT32) +

-                                 sizeof (EFI_IMAGE_FILE_HEADER) +

-                                 ImgHdr->Pe32.FileHeader.SizeOfOptionalHeader

-                                 );

+   SectionHeaderOffset = ImageContext->PeCoffHeaderOffset +

+                         sizeof (UINT32) +

+                         sizeof (EFI_IMAGE_FILE_HEADER) +

+                         ImgHdr->Pe32.FileHeader.SizeOfOptionalHeader;

    NumberOfSections = ImgHdr->Pe32.FileHeader.NumberOfSections;

 

    //

diff --git a/MdeModulePkg/Core/Dxe/Misc/DebugImageInfo.c b/MdeModulePkg/Core/Dxe/Misc/DebugImageInfo.c
index 4766072..fda6d44 100644
--- a/MdeModulePkg/Core/Dxe/Misc/DebugImageInfo.c
+++ b/MdeModulePkg/Core/Dxe/Misc/DebugImageInfo.c
@@ -2,7 +2,7 @@
   Support functions for managing debug image info table when loading and unloading

   images.

 

-Copyright (c) 2006 - 2010, 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 of the BSD License

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

@@ -103,7 +103,7 @@ CoreInitializeDebugImageInfoTable (
     Status = CoreFreePages (Memory, UnalignedPages);

     ASSERT_EFI_ERROR (Status);

   }

-  Memory         = (EFI_PHYSICAL_ADDRESS)(AlignedMemory + EFI_PAGES_TO_SIZE (Pages));

+  Memory         = AlignedMemory + EFI_PAGES_TO_SIZE (Pages);

   UnalignedPages = RealPages - Pages - UnalignedPages;

   if (UnalignedPages > 0) {

     //

diff --git a/MdeModulePkg/Core/Pei/Image/Image.c b/MdeModulePkg/Core/Pei/Image/Image.c
index 68e40c0..c8bb230 100644
--- a/MdeModulePkg/Core/Pei/Image/Image.c
+++ b/MdeModulePkg/Core/Pei/Image/Image.c
@@ -1,7 +1,7 @@
 /** @file

   Pei Core Load Image Support

 

-Copyright (c) 2006 - 2016, 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 of the BSD License

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

@@ -251,12 +251,10 @@ GetPeCoffImageFixLoadingAssignedAddress(
      SectionHeaderOffset = sizeof (EFI_TE_IMAGE_HEADER);

      NumberOfSections = ImgHdr->Te.NumberOfSections;

    } else {

-     SectionHeaderOffset = (UINTN)(

-                                 ImageContext->PeCoffHeaderOffset +

-                                 sizeof (UINT32) +

-                                 sizeof (EFI_IMAGE_FILE_HEADER) +

-                                 ImgHdr->Pe32.FileHeader.SizeOfOptionalHeader

-                                 );

+     SectionHeaderOffset = ImageContext->PeCoffHeaderOffset +

+                           sizeof (UINT32) +

+                           sizeof (EFI_IMAGE_FILE_HEADER) +

+                           ImgHdr->Pe32.FileHeader.SizeOfOptionalHeader;

       NumberOfSections = ImgHdr->Pe32.FileHeader.NumberOfSections;

    }

    //

diff --git a/MdeModulePkg/Core/PiSmmCore/Dispatcher.c b/MdeModulePkg/Core/PiSmmCore/Dispatcher.c
index 1bddaf1..b2a6822 100644
--- a/MdeModulePkg/Core/PiSmmCore/Dispatcher.c
+++ b/MdeModulePkg/Core/PiSmmCore/Dispatcher.c
@@ -28,7 +28,7 @@
   Depex - Dependency Expresion.

 

   Copyright (c) 2014, Hewlett-Packard Development Company, L.P.

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

+  Copyright (c) 2009 - 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        

@@ -183,8 +183,8 @@ CheckAndMarkFixLoadingMemoryUsageBitMap (
    //

    // Test if the memory is avalaible or not.

    // 

-   BaseOffsetPageNumber = (UINTN)EFI_SIZE_TO_PAGES((UINT32)(ImageBase - SmmCodeBase));

-   TopOffsetPageNumber  = (UINTN)EFI_SIZE_TO_PAGES((UINT32)(ImageBase + ImageSize - SmmCodeBase));

+   BaseOffsetPageNumber = EFI_SIZE_TO_PAGES((UINT32)(ImageBase - SmmCodeBase));

+   TopOffsetPageNumber  = EFI_SIZE_TO_PAGES((UINT32)(ImageBase + ImageSize - SmmCodeBase));

    for (Index = BaseOffsetPageNumber; Index < TopOffsetPageNumber; Index ++) {

      if ((mSmmCodeMemoryRangeUsageBitMap[Index / 64] & LShiftU64(1, (Index % 64))) != 0) {

        //

@@ -234,12 +234,10 @@ GetPeCoffImageFixLoadingAssignedAddress(
   // Get PeHeader pointer

   //

   ImgHdr = (EFI_IMAGE_OPTIONAL_HEADER_UNION *)((CHAR8* )ImageContext->Handle + ImageContext->PeCoffHeaderOffset);

-  SectionHeaderOffset = (UINTN)(

-                                 ImageContext->PeCoffHeaderOffset +

-                                 sizeof (UINT32) +

-                                 sizeof (EFI_IMAGE_FILE_HEADER) +

-                                 ImgHdr->Pe32.FileHeader.SizeOfOptionalHeader

-                                 );

+  SectionHeaderOffset = ImageContext->PeCoffHeaderOffset +

+                        sizeof (UINT32) +

+                        sizeof (EFI_IMAGE_FILE_HEADER) +

+                        ImgHdr->Pe32.FileHeader.SizeOfOptionalHeader;

   NumberOfSections = ImgHdr->Pe32.FileHeader.NumberOfSections;

 

   //

@@ -520,7 +518,7 @@ SmmLoadImage (
   // Align buffer on section boundary

   //

   ImageContext.ImageAddress += ImageContext.SectionAlignment - 1;

-  ImageContext.ImageAddress &= ~((EFI_PHYSICAL_ADDRESS)(ImageContext.SectionAlignment - 1));

+  ImageContext.ImageAddress &= ~((EFI_PHYSICAL_ADDRESS)ImageContext.SectionAlignment - 1);

 

   //

   // Load the image to our new buffer

diff --git a/MdeModulePkg/Core/PiSmmCore/PiSmmIpl.c b/MdeModulePkg/Core/PiSmmCore/PiSmmIpl.c
index 26b71f1..feb846e 100644
--- a/MdeModulePkg/Core/PiSmmCore/PiSmmIpl.c
+++ b/MdeModulePkg/Core/PiSmmCore/PiSmmIpl.c
@@ -846,12 +846,10 @@ GetPeCoffImageFixLoadingAssignedAddress(
    // Get PeHeader pointer

    //

    ImgHdr = (EFI_IMAGE_OPTIONAL_HEADER_UNION *)((CHAR8* )ImageContext->Handle + ImageContext->PeCoffHeaderOffset);

-   SectionHeaderOffset = (UINTN)(

-                                 ImageContext->PeCoffHeaderOffset +

-                                 sizeof (UINT32) +

-                                 sizeof (EFI_IMAGE_FILE_HEADER) +

-                                 ImgHdr->Pe32.FileHeader.SizeOfOptionalHeader

-                                 );

+   SectionHeaderOffset = ImageContext->PeCoffHeaderOffset +

+                         sizeof (UINT32) +

+                         sizeof (EFI_IMAGE_FILE_HEADER) +

+                         ImgHdr->Pe32.FileHeader.SizeOfOptionalHeader;

    NumberOfSections = ImgHdr->Pe32.FileHeader.NumberOfSections;

 

    //

@@ -1022,7 +1020,7 @@ ExecuteSmmCoreFromSmram (
   }

   

   ImageContext.ImageAddress += ImageContext.SectionAlignment - 1;

-  ImageContext.ImageAddress &= ~((EFI_PHYSICAL_ADDRESS)(ImageContext.SectionAlignment - 1));

+  ImageContext.ImageAddress &= ~((EFI_PHYSICAL_ADDRESS)ImageContext.SectionAlignment - 1);

 

   //

   // Print debug message showing SMM Core load address.

diff --git a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c b/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c
index d7abcc8..7f500a9 100644
--- a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c
+++ b/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c
@@ -585,7 +585,7 @@ DisplayCapsuleImage (
   EFI_GRAPHICS_OUTPUT_PROTOCOL  *GraphicsOutput;

 

   ImagePayload = (DISPLAY_DISPLAY_PAYLOAD *)(CapsuleHeader + 1);

-  PayloadSize = (UINTN)(CapsuleHeader->CapsuleImageSize - sizeof(EFI_CAPSULE_HEADER));

+  PayloadSize = CapsuleHeader->CapsuleImageSize - sizeof(EFI_CAPSULE_HEADER);

 

   if (ImagePayload->Version != 1) {

     return EFI_UNSUPPORTED;

@@ -733,7 +733,7 @@ DumpFmpCapsule (
   for (Index = 0; Index < FmpCapsuleHeader->EmbeddedDriverCount; Index++) {

     DEBUG((DEBUG_VERBOSE, "  ItemOffsetList[%d]      - 0x%lx\n", Index, ItemOffsetList[Index]));

   }

-  for (; Index < (UINTN)(FmpCapsuleHeader->EmbeddedDriverCount + FmpCapsuleHeader->PayloadItemCount); Index++) {

+  for (; Index < (UINT32)FmpCapsuleHeader->EmbeddedDriverCount + FmpCapsuleHeader->PayloadItemCount; Index++) {

     DEBUG((DEBUG_VERBOSE, "  ItemOffsetList[%d]      - 0x%lx\n", Index, ItemOffsetList[Index]));

     ImageHeader = (EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER *)((UINT8 *)FmpCapsuleHeader + ItemOffsetList[Index]);

 

diff --git a/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/MemoryAllocationLib.c b/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/MemoryAllocationLib.c
index 89c19e7..95725c8 100644
--- a/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/MemoryAllocationLib.c
+++ b/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/MemoryAllocationLib.c
@@ -3,7 +3,7 @@
   on DxeCore Memory Allocation services for DxeCore,

   with memory profile support.

 

-  Copyright (c) 2006 - 2016, 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 of the BSD License         

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

@@ -258,7 +258,7 @@ InternalAllocateAlignedPages (
       Status = CoreFreePages (Memory, UnalignedPages);

       ASSERT_EFI_ERROR (Status);

     }

-    Memory         = (EFI_PHYSICAL_ADDRESS) (AlignedMemory + EFI_PAGES_TO_SIZE (Pages));

+    Memory         = AlignedMemory + EFI_PAGES_TO_SIZE (Pages);

     UnalignedPages = RealPages - Pages - UnalignedPages;

     if (UnalignedPages > 0) {

       //

diff --git a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
index 6066526..7cd7e3a 100644
--- a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
+++ b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
@@ -2995,7 +2995,7 @@ NetLibGetSystemGuid (
       return EFI_NOT_FOUND;

     }

     Smbios.Hdr    = (SMBIOS_STRUCTURE *) (UINTN) SmbiosTable->TableAddress;

-    SmbiosEnd.Raw = (UINT8 *) (UINTN) (SmbiosTable->TableAddress + SmbiosTable->TableLength);

+    SmbiosEnd.Raw = (UINT8 *) ((UINTN) SmbiosTable->TableAddress + SmbiosTable->TableLength);

   }

 

   do {

diff --git a/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c b/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c
index 1f8aaf4..fe2d3a0 100644
--- a/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c
+++ b/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c
@@ -691,7 +691,7 @@ S3BootScriptGetBootTimeEntryAddAddress (
    // Here we do not count the reserved memory for runtime script table.

    PageNumber = (UINT16) (mS3BootScriptTablePtr->TableMemoryPageNumber - PcdGet16(PcdS3BootScriptRuntimeTableReservePageNumber));

    TableLength =  mS3BootScriptTablePtr->TableLength;

-   if ((UINTN) EFI_PAGES_TO_SIZE ((UINTN) PageNumber) < (UINTN) (TableLength + EntryLength + sizeof (EFI_BOOT_SCRIPT_TERMINATE))) {

+   if (EFI_PAGES_TO_SIZE ((UINTN) PageNumber) < (TableLength + EntryLength + sizeof (EFI_BOOT_SCRIPT_TERMINATE))) {

      //

      // The buffer is too small to hold the table, Reallocate the buffer

      //

@@ -752,7 +752,7 @@ S3BootScriptGetRuntimeEntryAddAddress (
    //

    // Check if the memory range reserved for S3 Boot Script table is large enough to hold the node.

    //

-   if ((UINTN) (mS3BootScriptTablePtr->TableLength + EntryLength + sizeof (EFI_BOOT_SCRIPT_TERMINATE)) <= (UINTN) EFI_PAGES_TO_SIZE ((UINTN) (mS3BootScriptTablePtr->TableMemoryPageNumber))) {

+   if ((mS3BootScriptTablePtr->TableLength + EntryLength + sizeof (EFI_BOOT_SCRIPT_TERMINATE)) <= EFI_PAGES_TO_SIZE ((UINTN) (mS3BootScriptTablePtr->TableMemoryPageNumber))) {

      NewEntryPtr = mS3BootScriptTablePtr->TableBase + mS3BootScriptTablePtr->TableLength;

      mS3BootScriptTablePtr->TableLength = mS3BootScriptTablePtr->TableLength + EntryLength;

      //

diff --git a/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/MemoryAllocationLib.c b/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/MemoryAllocationLib.c
index bd21468..96cb275 100644
--- a/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/MemoryAllocationLib.c
+++ b/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/MemoryAllocationLib.c
@@ -11,7 +11,7 @@
   In addition, allocation for the Reserved memory types are not supported and will 

   always return NULL.

 

-  Copyright (c) 2006 - 2016, 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 of the BSD License         

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

@@ -293,7 +293,7 @@ InternalAllocateAlignedPages (
       Status = SmmFreePages (Memory, UnalignedPages);

       ASSERT_EFI_ERROR (Status);

     }

-    Memory         = (EFI_PHYSICAL_ADDRESS) (AlignedMemory + EFI_PAGES_TO_SIZE (Pages));

+    Memory         = AlignedMemory + EFI_PAGES_TO_SIZE (Pages);

     UnalignedPages = RealPages - Pages - UnalignedPages;

     if (UnalignedPages > 0) {

       //

diff --git a/MdeModulePkg/Library/SmmMemoryAllocationProfileLib/MemoryAllocationLib.c b/MdeModulePkg/Library/SmmMemoryAllocationProfileLib/MemoryAllocationLib.c
index e9bbf02..2a18155 100644
--- a/MdeModulePkg/Library/SmmMemoryAllocationProfileLib/MemoryAllocationLib.c
+++ b/MdeModulePkg/Library/SmmMemoryAllocationProfileLib/MemoryAllocationLib.c
@@ -12,7 +12,7 @@
   allocation for the Reserved memory types are not supported and will always 

   return NULL.

 

-  Copyright (c) 2006 - 2016, 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 of the BSD License         

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

@@ -371,7 +371,7 @@ InternalAllocateAlignedPages (
       Status = gSmst->SmmFreePages (Memory, UnalignedPages);

       ASSERT_EFI_ERROR (Status);

     }

-    Memory         = (EFI_PHYSICAL_ADDRESS) (AlignedMemory + EFI_PAGES_TO_SIZE (Pages));

+    Memory         = AlignedMemory + EFI_PAGES_TO_SIZE (Pages);

     UnalignedPages = RealPages - Pages - UnalignedPages;

     if (UnalignedPages > 0) {

       //

diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmMisc.c b/MdeModulePkg/Library/UefiBootManagerLib/BmMisc.c
index e11d842..11ab867 100644
--- a/MdeModulePkg/Library/UefiBootManagerLib/BmMisc.c
+++ b/MdeModulePkg/Library/UefiBootManagerLib/BmMisc.c
@@ -413,11 +413,11 @@ BmCharToUint (
   )

 {

   if ((Char >= L'0') && (Char <= L'9')) {

-    return (UINTN) (Char - L'0');

+    return (Char - L'0');

   }

 

   if ((Char >= L'A') && (Char <= L'F')) {

-    return (UINTN) (Char - L'A' + 0xA);

+    return (Char - L'A' + 0xA);

   }

 

   ASSERT (FALSE);

diff --git a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
index b740d43..a2abf26 100644
--- a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
+++ b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
@@ -1874,7 +1874,7 @@ GetBlockDataInfo (
     //

     // Check whether VarBuffer is enough

     //

-    if ((UINTN) (Offset + Width) > MaxBufferSize) {

+    if ((UINT32)Offset + Width > MaxBufferSize) {

       DataBuffer = ReallocatePool (

                     MaxBufferSize,

                     Offset + Width + HII_LIB_DEFAULT_VARSTORE_SIZE,

diff --git a/MdeModulePkg/Library/UefiMemoryAllocationProfileLib/MemoryAllocationLib.c b/MdeModulePkg/Library/UefiMemoryAllocationProfileLib/MemoryAllocationLib.c
index 370827d..cef7fc0 100644
--- a/MdeModulePkg/Library/UefiMemoryAllocationProfileLib/MemoryAllocationLib.c
+++ b/MdeModulePkg/Library/UefiMemoryAllocationProfileLib/MemoryAllocationLib.c
@@ -2,7 +2,7 @@
   Support routines for memory allocation routines based 

   on boot services for Dxe phase drivers, with memory profile support.

 

-  Copyright (c) 2006 - 2016, 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 of the BSD License         

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

@@ -257,7 +257,7 @@ InternalAllocateAlignedPages (
       Status = gBS->FreePages (Memory, UnalignedPages);

       ASSERT_EFI_ERROR (Status);

     }

-    Memory         = (EFI_PHYSICAL_ADDRESS) (AlignedMemory + EFI_PAGES_TO_SIZE (Pages));

+    Memory         = AlignedMemory + EFI_PAGES_TO_SIZE (Pages);

     UnalignedPages = RealPages - Pages - UnalignedPages;

     if (UnalignedPages > 0) {

       //

diff --git a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLibNullClass.c b/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLibNullClass.c
index b9ca908..93ff934 100644
--- a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLibNullClass.c
+++ b/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLibNullClass.c
@@ -1,7 +1,7 @@
 /** @file

   Var Check Hii handler.

 

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

+Copyright (c) 2015 - 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

@@ -94,7 +94,7 @@ VarCheckHiiQuestion (
   UINT8    Index;

   UINT8    MaxContainers;

 

-  if ((UINTN) (HiiQuestion->VarOffset + HiiQuestion->StorageWidth) > DataSize) {

+  if (((UINT32) HiiQuestion->VarOffset + HiiQuestion->StorageWidth) > DataSize) {

     DEBUG ((EFI_D_INFO, "VarCheckHiiQuestion fail: (VarOffset(0x%04x) + StorageWidth(0x%02x)) > Size(0x%x)\n", HiiQuestion->VarOffset, HiiQuestion->StorageWidth, DataSize));

     return FALSE;

   }

@@ -155,7 +155,7 @@ VarCheckHiiQuestion (
 

     case EFI_IFR_ORDERED_LIST_OP:

       MaxContainers = ((VAR_CHECK_HII_QUESTION_ORDEREDLIST *) HiiQuestion)->MaxContainers;

-      if ((UINTN) (HiiQuestion->VarOffset + HiiQuestion->StorageWidth * MaxContainers) > DataSize) {

+      if (((UINT32) HiiQuestion->VarOffset + HiiQuestion->StorageWidth * MaxContainers) > DataSize) {

         DEBUG ((EFI_D_INFO, "VarCheckHiiQuestion fail: (VarOffset(0x%04x) + StorageWidth(0x%02x) * MaxContainers(0x%02x)) > Size(0x%x)\n", HiiQuestion->VarOffset, HiiQuestion->StorageWidth, MaxContainers, DataSize));

         return FALSE;

       }

diff --git a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.c b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.c
index 22d4349..5147e66 100644
--- a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.c
+++ b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.c
@@ -4,7 +4,7 @@
   This driver is dispatched by Dxe core and the driver will reload itself to ACPI reserved memory

   in the entry point. The functionality is to interpret and restore the S3 boot script

 

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

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

 Copyright (c) 2017, AMD Incorporated. All rights reserved.<BR>

 

 This program and the accompanying materials

@@ -327,7 +327,7 @@ ReadyToLockEventNotify (
   // Align buffer on section boundary

   //

   ImageContext.ImageAddress += ImageContext.SectionAlignment - 1;

-  ImageContext.ImageAddress &= ~((EFI_PHYSICAL_ADDRESS)(ImageContext.SectionAlignment - 1));

+  ImageContext.ImageAddress &= ~((EFI_PHYSICAL_ADDRESS)ImageContext.SectionAlignment - 1);

   //

   // Load the image to our new buffer

   //

diff --git a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/AcpiS3ContextSave.c b/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/AcpiS3ContextSave.c
index a973d2d..dcfd61c 100644
--- a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/AcpiS3ContextSave.c
+++ b/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/AcpiS3ContextSave.c
@@ -1,7 +1,7 @@
 /** @file

   This is the implementation to save ACPI S3 Context.

 

-Copyright (c) 2006 - 2016, 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

@@ -401,9 +401,9 @@ S3AllocatePageTablesBuffer (
     // We need calculate whole page size then allocate once, because S3 restore page table does not know each page in Nvs.

     //

     if (!Page1GSupport) {

-      TotalPageTableSize = (UINTN)(1 + NumberOfPml4EntriesNeeded + NumberOfPml4EntriesNeeded * NumberOfPdpEntriesNeeded);

+      TotalPageTableSize = 1 + NumberOfPml4EntriesNeeded + NumberOfPml4EntriesNeeded * NumberOfPdpEntriesNeeded;

     } else {

-      TotalPageTableSize = (UINTN)(1 + NumberOfPml4EntriesNeeded);

+      TotalPageTableSize = 1 + NumberOfPml4EntriesNeeded;

     }

 

     TotalPageTableSize += ExtraPageTablePages;

diff --git a/MdeModulePkg/Universal/CapsulePei/Common/CapsuleCoalesce.c b/MdeModulePkg/Universal/CapsulePei/Common/CapsuleCoalesce.c
index 9e8315e..3e7054c 100644
--- a/MdeModulePkg/Universal/CapsulePei/Common/CapsuleCoalesce.c
+++ b/MdeModulePkg/Universal/CapsulePei/Common/CapsuleCoalesce.c
@@ -10,7 +10,7 @@
   into memory.

 

 (C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR>

-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

@@ -1247,7 +1247,7 @@ CapsuleDataCoalesce (
         //

         ASSERT (PrivateDataPtr->Signature == EFI_CAPSULE_PEIM_PRIVATE_DATA_SIGNATURE);

         ASSERT ((UINTN)DestPtr >= (UINTN)CapsuleImageBase);

-        PrivateDataPtr->CapsuleOffset[CapsuleIndex++] = (UINT64)((UINTN)DestPtr - (UINTN)CapsuleImageBase);

+        PrivateDataPtr->CapsuleOffset[CapsuleIndex++] = (UINTN)DestPtr - (UINTN)CapsuleImageBase;

       }

 

       //

diff --git a/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c b/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c
index 0eb7ddd..e1ac5a3 100644
--- a/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c
+++ b/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c
@@ -1,7 +1,7 @@
 /** @file

 Entry and initialization module for the browser.

 

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

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

 Copyright (c) 2014, Hewlett-Packard Development Company, L.P.<BR>

 This program and the accompanying materials

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

@@ -540,7 +540,7 @@ GetLineByWidth (
   //

   // Need extra glyph info and '\0' info, so +2.

   //

-  *OutputString = AllocateZeroPool (((UINTN) (StrOffset + 2) * sizeof(CHAR16)));

+  *OutputString = AllocateZeroPool ((StrOffset + 2) * sizeof(CHAR16));

   if (*OutputString == NULL) {

     return 0;

   }

@@ -2972,7 +2972,7 @@ UiDisplayMenu (
         gST->ConOut->SetAttribute (gST->ConOut, GetInfoTextColor ());

         for (Index = 0; Index < HelpHeaderLine; Index++) {

           ASSERT (HelpHeaderLine == 1);

-          ASSERT (GetStringWidth (HelpHeaderString) / 2 < (UINTN) (gHelpBlockWidth - 1));

+          ASSERT (GetStringWidth (HelpHeaderString) / 2 < ((UINT32) gHelpBlockWidth - 1));

           PrintStringAtWithWidth (

             gStatementDimensions.RightColumn - gHelpBlockWidth,

             Index + TopRow,

@@ -3053,7 +3053,7 @@ UiDisplayMenu (
         gST->ConOut->SetAttribute (gST->ConOut, GetInfoTextColor ());

         for (Index = 0; Index < HelpBottomLine; Index++) {

           ASSERT (HelpBottomLine == 1);

-          ASSERT (GetStringWidth (HelpBottomString) / 2 < (UINTN) (gHelpBlockWidth - 1)); 

+          ASSERT (GetStringWidth (HelpBottomString) / 2 < ((UINT32) gHelpBlockWidth - 1));

           PrintStringAtWithWidth (

             gStatementDimensions.RightColumn - gHelpBlockWidth,

             BottomRow + Index - HelpBottomLine + 1,

diff --git a/MdeModulePkg/Universal/EbcDxe/EbcExecute.c b/MdeModulePkg/Universal/EbcDxe/EbcExecute.c
index e5d290a..2dfed8e 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcExecute.c
+++ b/MdeModulePkg/Universal/EbcDxe/EbcExecute.c
@@ -1,7 +1,7 @@
 /** @file

   Contains code that implements the virtual machine.

 

-Copyright (c) 2006 - 2014, 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 of the BSD License

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

@@ -2867,7 +2867,7 @@ ExecutePOPn (
   if (OPERAND1_INDIRECT (Operands)) {

     VmWriteMemN (VmPtr, (UINTN) (VmPtr->Gpr[OPERAND1_REGNUM (Operands)] + Index16), DataN);

   } else {

-    VmPtr->Gpr[OPERAND1_REGNUM (Operands)] = (INT64) (UINT64) ((UINTN) DataN + Index16);

+    VmPtr->Gpr[OPERAND1_REGNUM (Operands)] = (INT64) (UINT64) (UINTN) (DataN + Index16);

   }

 

   return EFI_SUCCESS;

@@ -3592,7 +3592,7 @@ ExecuteSUB (
   if ((*VmPtr->Ip & DATAMANIP_M_64) != 0) {

     return (UINT64) ((INT64) ((INT64) Op1 - (INT64) Op2));

   } else {

-    return (UINT64) ((INT64) ((INT32) Op1 - (INT32) Op2));

+    return (UINT64) ((INT64) ((INT32) ((INT32) Op1 - (INT32) Op2)));

   }

 }

 

@@ -3620,7 +3620,7 @@ ExecuteMUL (
   if ((*VmPtr->Ip & DATAMANIP_M_64) != 0) {

     return MultS64x64 ((INT64)Op1, (INT64)Op2);

   } else {

-    return (UINT64) ((INT64) ((INT32) Op1 * (INT32) Op2));

+    return (UINT64) ((INT64) ((INT32) ((INT32) Op1 * (INT32) Op2)));

   }

 }

 

@@ -3648,7 +3648,7 @@ ExecuteMULU (
   if ((*VmPtr->Ip & DATAMANIP_M_64) != 0) {

     return MultU64x64 (Op1, Op2);

   } else {

-    return (UINT64) ((UINT32) Op1 * (UINT32) Op2);

+    return (UINT64) ((UINT32) ((UINT32) Op1 * (UINT32) Op2));

   }

 }

 

diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/UpdateWorkingBlock.c b/MdeModulePkg/Universal/FaultTolerantWriteDxe/UpdateWorkingBlock.c
index d46a37f..b4327b5 100644
--- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/UpdateWorkingBlock.c
+++ b/MdeModulePkg/Universal/FaultTolerantWriteDxe/UpdateWorkingBlock.c
@@ -2,7 +2,7 @@
 

    Internal functions to operate Working Block Space.

 

-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 of the BSD License         

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

@@ -55,7 +55,7 @@ InitializeLocalWorkSpaceHeader (
     &gEdkiiWorkingBlockSignatureGuid,

     sizeof (EFI_GUID)

     );

-  mWorkingBlockHeader.WriteQueueSize = (UINT64) (PcdGet32 (PcdFlashNvStorageFtwWorkingSize) - sizeof (EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER));

+  mWorkingBlockHeader.WriteQueueSize = PcdGet32 (PcdFlashNvStorageFtwWorkingSize) - sizeof (EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER);

 

   //

   // Crc is calculated with all the fields except Crc and STATE, so leave them as FTW_ERASED_BYTE.

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c b/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c
index 9bef064..b85cf88 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c
@@ -2,7 +2,7 @@
 Implementation for EFI_HII_FONT_PROTOCOL.

 

 

-Copyright (c) 2007 - 2016, 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

@@ -411,7 +411,7 @@ GlyphToBlt (
   // The glyph's upper left hand corner pixel is the most significant bit of the

   // first bitmap byte.

   //

-  for (Ypos = 0; Ypos < Cell->Height && ((UINTN) (Ypos + YposOffset) < RowHeight); Ypos++) {

+  for (Ypos = 0; Ypos < Cell->Height && (((UINT32) Ypos + YposOffset) < RowHeight); Ypos++) {

     OffsetY = BITMAP_LEN_1_BIT (Cell->Width, Ypos);

 

     //

@@ -419,7 +419,7 @@ GlyphToBlt (
     //

     for (Xpos = 0; Xpos < Cell->Width / 8; Xpos++) {

       Data  = *(GlyphBuffer + OffsetY + Xpos);

-      for (Index = 0; Index < 8 && ((UINTN) (Xpos * 8 + Index + Cell->OffsetX) < RowWidth); Index++) {

+      for (Index = 0; Index < 8 && (((UINT32) Xpos * 8 + Index + Cell->OffsetX) < RowWidth); Index++) {

         if ((Data & (1 << (8 - Index - 1))) != 0) {

           BltBuffer[Ypos * ImageWidth + Xpos * 8 + Index] = Foreground;

         } else {

@@ -435,7 +435,7 @@ GlyphToBlt (
       // There are some padding bits in this byte. Ignore them.

       //

       Data  = *(GlyphBuffer + OffsetY + Xpos);

-      for (Index = 0; Index < Cell->Width % 8 && ((UINTN) (Xpos * 8 + Index + Cell->OffsetX) < RowWidth); Index++) {

+      for (Index = 0; Index < Cell->Width % 8 && (((UINT32) Xpos * 8 + Index + Cell->OffsetX) < RowWidth); Index++) {

         if ((Data & (1 << (8 - Index - 1))) != 0) {

           BltBuffer[Ypos * ImageWidth + Xpos * 8 + Index] = Foreground;

         } else {

@@ -1927,7 +1927,7 @@ HiiStringToImage (
     // If this character is the last character of a row, we need not

     // draw its (AdvanceX - Width - OffsetX) for next character.

     //

-    LineWidth -= (UINTN) (Cell[Index].AdvanceX - Cell[Index].Width - Cell[Index].OffsetX);

+    LineWidth -= (Cell[Index].AdvanceX - Cell[Index].Width - Cell[Index].OffsetX);

 

     //

     // Clip the right-most character if cannot fit when EFI_HII_OUT_FLAG_CLEAN_X is set.

@@ -1950,8 +1950,8 @@ HiiStringToImage (
         //

         // Don't draw the last char on this row. And, don't draw the second last char (AdvanceX - Width - OffsetX).

         //

-        LineWidth -= (UINTN) (Cell[Index].Width + Cell[Index].OffsetX);

-        LineWidth -= (UINTN) (Cell[Index - 1].AdvanceX - Cell[Index - 1].Width - Cell[Index - 1].OffsetX);

+        LineWidth -= (Cell[Index].Width + Cell[Index].OffsetX);

+        LineWidth -= (Cell[Index - 1].AdvanceX - Cell[Index - 1].Width - Cell[Index - 1].OffsetX);

         RowInfo[RowIndex].EndIndex       = Index - 1;

         RowInfo[RowIndex].LineWidth      = LineWidth;

         RowInfo[RowIndex].LineHeight     = LineHeight;

@@ -2008,7 +2008,7 @@ HiiStringToImage (
           if (Index1 == RowInfo[RowIndex].StartIndex) {

             LineWidth = 0;

           } else {

-            LineWidth -= (UINTN) (Cell[Index1 - 1].AdvanceX - Cell[Index1 - 1].Width - Cell[Index1 - 1].OffsetX);

+            LineWidth -= (Cell[Index1 - 1].AdvanceX - Cell[Index1 - 1].Width - Cell[Index1 - 1].OffsetX);

           }

           RowInfo[RowIndex].LineWidth = LineWidth;

         }

@@ -2025,8 +2025,8 @@ HiiStringToImage (
             //

             // Don't draw the last char on this row. And, don't draw the second last char (AdvanceX - Width - OffsetX).

             //

-            LineWidth -= (UINTN) (Cell[Index1].Width + Cell[Index1].OffsetX);

-            LineWidth -= (UINTN) (Cell[Index1 - 1].AdvanceX - Cell[Index1 - 1].Width - Cell[Index1 - 1].OffsetX);

+            LineWidth -= (Cell[Index1].Width + Cell[Index1].OffsetX);

+            LineWidth -= (Cell[Index1 - 1].AdvanceX - Cell[Index1 - 1].Width - Cell[Index1 - 1].OffsetX);

             RowInfo[RowIndex].EndIndex       = Index1 - 1;

             RowInfo[RowIndex].LineWidth      = LineWidth;

           } else {

diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c
index 639da48..cd00f5c 100644
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c
@@ -1,7 +1,7 @@
 /** @file

   Interface routines for PxeBc.

 

-Copyright (c) 2007 - 2016, 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

@@ -353,8 +353,8 @@ EfiPxeBcStart (
   //

   // Configure block size for TFTP as a default value to handle all link layers.

   // 

-  Private->BlockSize   = (UINTN) (MIN (Private->Ip4MaxPacketSize, PXEBC_DEFAULT_PACKET_SIZE) - 

-                           PXEBC_DEFAULT_UDP_OVERHEAD_SIZE - PXEBC_DEFAULT_TFTP_OVERHEAD_SIZE);

+  Private->BlockSize   = MIN (Private->Ip4MaxPacketSize, PXEBC_DEFAULT_PACKET_SIZE) -

+                           PXEBC_DEFAULT_UDP_OVERHEAD_SIZE - PXEBC_DEFAULT_TFTP_OVERHEAD_SIZE;

   //

   // If PcdTftpBlockSize is set to non-zero, override the default value.

   //

diff --git a/MdeModulePkg/Universal/PCD/Dxe/Service.c b/MdeModulePkg/Universal/PCD/Dxe/Service.c
index bf77130..efe7248 100644
--- a/MdeModulePkg/Universal/PCD/Dxe/Service.c
+++ b/MdeModulePkg/Universal/PCD/Dxe/Service.c
@@ -2,7 +2,7 @@
     Help functions used by PCD DXE driver.

 

 Copyright (c) 2014, Hewlett-Packard Development Company, L.P.<BR>

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

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

 (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>

 This program and the accompanying materials

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

@@ -452,7 +452,7 @@ GetWorker (
   switch (LocalTokenNumber & PCD_TYPE_ALL_SET) {

     case PCD_TYPE_VPD:

       VpdHead = (VPD_HEAD *) ((UINT8 *) PcdDb + Offset);

-      RetPtr = (VOID *) (UINTN) (PcdGet32 (PcdVpdBaseAddress) + VpdHead->Offset);

+      RetPtr = (VOID *) ((UINTN) PcdGet32 (PcdVpdBaseAddress) + VpdHead->Offset);

 

       break;

 

diff --git a/MdeModulePkg/Universal/PCD/Pei/Service.c b/MdeModulePkg/Universal/PCD/Pei/Service.c
index 66ca892..5e1cb72 100644
--- a/MdeModulePkg/Universal/PCD/Pei/Service.c
+++ b/MdeModulePkg/Universal/PCD/Pei/Service.c
@@ -2,7 +2,7 @@
   The driver internal functions are implmented here.

   They build Pei PCD database, and provide access service to PCD database.

 

-Copyright (c) 2006 - 2016, 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 of the BSD License

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

@@ -985,7 +985,7 @@ GetWorker (
     {

       VPD_HEAD *VpdHead;

       VpdHead = (VPD_HEAD *) ((UINT8 *)PeiPcdDb + Offset);

-      return (VOID *) (UINTN) (PcdGet32 (PcdVpdBaseAddress) + VpdHead->Offset);

+      return (VOID *) ((UINTN) PcdGet32 (PcdVpdBaseAddress) + VpdHead->Offset);

     }

       

     case PCD_TYPE_HII|PCD_TYPE_STRING:

diff --git a/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.c b/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.c
index ea762d5..4e757e1 100644
--- a/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.c
+++ b/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.c
@@ -2,7 +2,7 @@
   This code produces the Smbios protocol. It also responsible for constructing 

   SMBIOS table into system table.

   

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

+Copyright (c) 2009 - 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        

@@ -1138,7 +1138,7 @@ SmbiosCreateTable (
     EntryPointStructure->MaxStructureSize = (UINT16) sizeof (EndStructure);

   }

 

-  if ((UINTN) EFI_SIZE_TO_PAGES (EntryPointStructure->TableLength) > mPreAllocatedPages) {

+  if (EFI_SIZE_TO_PAGES ((UINT32) EntryPointStructure->TableLength) > mPreAllocatedPages) {

     //

     // If new SMBIOS table size exceeds the previous allocated page, 

     // it is time to re-allocate memory (below 4GB).

@@ -1307,7 +1307,7 @@ SmbiosCreate64BitTable (
   EndStructure.Tailing[1] = 0;

   Smbios30EntryPointStructure->TableMaximumSize = (UINT32) (Smbios30EntryPointStructure->TableMaximumSize + sizeof (EndStructure));

 

-  if ((UINTN) EFI_SIZE_TO_PAGES (Smbios30EntryPointStructure->TableMaximumSize) > mPre64BitAllocatedPages) {

+  if (EFI_SIZE_TO_PAGES (Smbios30EntryPointStructure->TableMaximumSize) > mPre64BitAllocatedPages) {

     //

     // If new SMBIOS table size exceeds the previous allocated page, 

     // it is time to re-allocate memory at anywhere.

diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
index b0c7434..0a325de 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
@@ -3754,8 +3754,8 @@ InitNonVolatileVariableStore (
     return EFI_VOLUME_CORRUPTED;

   }

 

-  VariableStoreBase = (EFI_PHYSICAL_ADDRESS) ((UINTN) FvHeader + FvHeader->HeaderLength);

-  VariableStoreLength = (UINT64) (NvStorageSize - FvHeader->HeaderLength);

+  VariableStoreBase = (UINTN) FvHeader + FvHeader->HeaderLength;

+  VariableStoreLength = NvStorageSize - FvHeader->HeaderLength;

 

   mNvFvHeaderCache = FvHeader;

   mVariableModuleGlobal->VariableGlobal.NonVolatileVariableBase = VariableStoreBase;

@@ -4099,7 +4099,7 @@ VariableCommonInitialize (
   GuidHob = GetFirstGuidHob (VariableGuid);

   if (GuidHob != NULL) {

     VariableStoreHeader = GET_GUID_HOB_DATA (GuidHob);

-    VariableStoreLength = (UINT64) (GuidHob->Header.HobLength - sizeof (EFI_HOB_GUID_TYPE));

+    VariableStoreLength = GuidHob->Header.HobLength - sizeof (EFI_HOB_GUID_TYPE);

     if (GetVariableStoreStatus (VariableStoreHeader) == EfiValid) {

       mVariableModuleGlobal->VariableGlobal.HobVariableBase = (EFI_PHYSICAL_ADDRESS) (UINTN) AllocateRuntimeCopyPool ((UINTN) VariableStoreLength, (VOID *) VariableStoreHeader);

       if (mVariableModuleGlobal->VariableGlobal.HobVariableBase == 0) {