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>

5 files changed, 26 insertions, 34 deletions

diff --git a/MdeModulePkg/Core/Dxe/Image/Image.c b/MdeModulePkg/Core/Dxe/Image/Image.c
index 652da8bf10..80128e729b 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 47660729ba..fda6d44043 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 68e40c027e..c8bb2300a0 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 1bddaf13ae..b2a6822048 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 26b71f163a..feb846ee9e 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.