From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (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 B193E82156 for ; Fri, 24 Feb 2017 21:51:29 -0800 (PST) Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 24 Feb 2017 21:51:29 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.35,202,1484035200"; d="scan'208";a="68909346" Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by orsmga005.jf.intel.com with ESMTP; 24 Feb 2017 21:51:27 -0800 Received: from fmsmsx111.amr.corp.intel.com (10.18.116.5) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.248.2; Fri, 24 Feb 2017 21:51:19 -0800 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by fmsmsx111.amr.corp.intel.com (10.18.116.5) with Microsoft SMTP Server (TLS) id 14.3.248.2; Fri, 24 Feb 2017 21:51:19 -0800 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.88]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.204]) with mapi id 14.03.0248.002; Sat, 25 Feb 2017 13:51:06 +0800 From: "Yao, Jiewen" To: "Wu, Hao A" , "edk2-devel@lists.01.org" Thread-Topic: [PATCH v3 06/12] IntelFspWrapperPkg: Refine casting expression result to bigger size Thread-Index: AQHSjyXa3gPihnVYmE+Z9K73TaCGAqF5N/QQ Date: Sat, 25 Feb 2017 05:51:05 +0000 Message-ID: <74D8A39837DF1E4DA445A8C0B3885C503A8F54AA@shsmsx102.ccr.corp.intel.com> References: <1487999555-9764-1-git-send-email-hao.a.wu@intel.com> <1487999555-9764-7-git-send-email-hao.a.wu@intel.com> In-Reply-To: <1487999555-9764-7-git-send-email-hao.a.wu@intel.com> Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH v3 06/12] IntelFspWrapperPkg: Refine casting expression result to bigger size X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Feb 2017 05:51:29 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: jiewen.yao@intel.com > -----Original Message----- > From: Wu, Hao A > Sent: Saturday, February 25, 2017 1:12 PM > To: edk2-devel@lists.01.org > Cc: Wu, Hao A ; Yao, Jiewen > Subject: [PATCH v3 06/12] IntelFspWrapperPkg: Refine casting expression r= esult > to bigger size >=20 > 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. >=20 > 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 =3D (UINT64) (a + b); >=20 > 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. >=20 > The commit refines codes by the following rules: > 1). When the expression is possible to overflow the range of unsigned int= / > int: > c =3D (UINT64)a + b; >=20 > 2). When the expression will not overflow within the rank of "int", remov= e > the explicit type casts: > c =3D a + b; >=20 > 3). When the expression will be cast to pointer of possible greater size: > UINT32 a,b; > VOID *c; > c =3D (VOID *)(UINTN)(a + b); --> c =3D (VOID *)((UINTN)a + b); >=20 > 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) {...} >=20 > 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'. >=20 > Cc: Jiewen Yao > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Hao Wu > --- > IntelFspWrapperPkg/FspNotifyDxe/LoadBelow4G.c | 4 ++-- > IntelFspWrapperPkg/Library/BaseFspApiLib/FspApiLib.c | 12 ++++++------ > 2 files changed, 8 insertions(+), 8 deletions(-) >=20 > diff --git a/IntelFspWrapperPkg/FspNotifyDxe/LoadBelow4G.c > b/IntelFspWrapperPkg/FspNotifyDxe/LoadBelow4G.c > index 6f06e24..089413c 100644 > --- a/IntelFspWrapperPkg/FspNotifyDxe/LoadBelow4G.c > +++ b/IntelFspWrapperPkg/FspNotifyDxe/LoadBelow4G.c > @@ -1,6 +1,6 @@ > /** @file >=20 > -Copyright (c) 2015, Intel Corporation. All rights reserved.
> +Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.
>=20 > This program and the accompanying materials > are licensed and made available under the terms and conditions > @@ -115,7 +115,7 @@ RelocateImageUnder4GIfNeeded ( > // Align buffer on section boundary > // > ImageContext.ImageAddress +=3D ImageContext.SectionAlignment - 1; > - ImageContext.ImageAddress &=3D > ~((EFI_PHYSICAL_ADDRESS)(ImageContext.SectionAlignment - 1)); > + ImageContext.ImageAddress &=3D > ~((EFI_PHYSICAL_ADDRESS)ImageContext.SectionAlignment - 1); > // > // Load the image to our new buffer > // > diff --git a/IntelFspWrapperPkg/Library/BaseFspApiLib/FspApiLib.c > b/IntelFspWrapperPkg/Library/BaseFspApiLib/FspApiLib.c > index 162d244..accd6e4 100644 > --- a/IntelFspWrapperPkg/Library/BaseFspApiLib/FspApiLib.c > +++ b/IntelFspWrapperPkg/Library/BaseFspApiLib/FspApiLib.c > @@ -1,7 +1,7 @@ > /** @file > Provide FSP API related function. >=20 > - Copyright (c) 2014 - 2015, Intel Corporation. All rights reserved.
> + Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.
> 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 > @@ -98,7 +98,7 @@ CallFspInit ( > EFI_STATUS Status; > BOOLEAN InterruptState; >=20 > - FspInitApi =3D (FSP_INIT)(UINTN)(FspHeader->ImageBase + > FspHeader->FspInitEntryOffset); > + FspInitApi =3D (FSP_INIT)((UINTN)FspHeader->ImageBase + > FspHeader->FspInitEntryOffset); > InterruptState =3D SaveAndDisableInterrupts (); > Status =3D Execute32BitCode ((UINTN)FspInitApi, (UINTN)FspInitParams); > SetInterruptState (InterruptState); > @@ -125,7 +125,7 @@ CallFspNotifyPhase ( > EFI_STATUS Status; > BOOLEAN InterruptState; >=20 > - NotifyPhaseApi =3D (FSP_NOTIFY_PHASE)(UINTN)(FspHeader->ImageBase + > FspHeader->NotifyPhaseEntryOffset); > + NotifyPhaseApi =3D (FSP_NOTIFY_PHASE)((UINTN)FspHeader->ImageBase + > FspHeader->NotifyPhaseEntryOffset); > InterruptState =3D SaveAndDisableInterrupts (); > Status =3D Execute32BitCode ((UINTN)NotifyPhaseApi, > (UINTN)NotifyPhaseParams); > SetInterruptState (InterruptState); > @@ -152,7 +152,7 @@ CallFspMemoryInit ( > EFI_STATUS Status; > BOOLEAN InterruptState; >=20 > - FspMemoryInitApi =3D (FSP_MEMORY_INIT)(UINTN)(FspHeader->ImageBase + > FspHeader->FspMemoryInitEntryOffset); > + FspMemoryInitApi =3D (FSP_MEMORY_INIT)((UINTN)FspHeader->ImageBase + > FspHeader->FspMemoryInitEntryOffset); > InterruptState =3D SaveAndDisableInterrupts (); > Status =3D Execute32BitCode ((UINTN)FspMemoryInitApi, > (UINTN)FspMemoryInitParams); > SetInterruptState (InterruptState); > @@ -179,7 +179,7 @@ CallTempRamExit ( > EFI_STATUS Status; > BOOLEAN InterruptState; >=20 > - TempRamExitApi =3D (FSP_TEMP_RAM_EXIT)(UINTN)(FspHeader->ImageBase > + FspHeader->TempRamExitEntryOffset); > + TempRamExitApi =3D (FSP_TEMP_RAM_EXIT)((UINTN)FspHeader->ImageBase > + FspHeader->TempRamExitEntryOffset); > InterruptState =3D SaveAndDisableInterrupts (); > Status =3D Execute32BitCode ((UINTN)TempRamExitApi, > (UINTN)TempRamExitParam); > SetInterruptState (InterruptState); > @@ -206,7 +206,7 @@ CallFspSiliconInit ( > EFI_STATUS Status; > BOOLEAN InterruptState; >=20 > - FspSiliconInitApi =3D (FSP_SILICON_INIT)(UINTN)(FspHeader->ImageBase + > FspHeader->FspSiliconInitEntryOffset); > + FspSiliconInitApi =3D (FSP_SILICON_INIT)((UINTN)FspHeader->ImageBase + > FspHeader->FspSiliconInitEntryOffset); > InterruptState =3D SaveAndDisableInterrupts (); > Status =3D Execute32BitCode ((UINTN)FspSiliconInitApi, > (UINTN)FspSiliconInitParam); > SetInterruptState (InterruptState); > -- > 1.9.5.msysgit.0