From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.31; helo=mga06.intel.com; envelope-from=jian.j.wang@intel.com; receiver=edk2-devel-bounces@lists.01.org Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) (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 A86F92117B57A; Fri, 26 Oct 2018 01:05:58 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Oct 2018 01:05:58 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,427,1534834800"; d="scan'208";a="81732920" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by fmsmga008.fm.intel.com with ESMTP; 26 Oct 2018 01:05:57 -0700 Received: from fmsmsx118.amr.corp.intel.com (10.18.116.18) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.319.2; Fri, 26 Oct 2018 01:05:57 -0700 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by fmsmsx118.amr.corp.intel.com (10.18.116.18) with Microsoft SMTP Server (TLS) id 14.3.319.2; Fri, 26 Oct 2018 01:05:56 -0700 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.161]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.199]) with mapi id 14.03.0415.000; Fri, 26 Oct 2018 16:03:08 +0800 From: "Wang, Jian J" To: "Zeng, Star" , edk2-devel , "edk2-devel@lists.01.org" CC: "Zeng, Star" , "Gao, Liming" Thread-Topic: [edk2] [PATCH] MdeModulePkg/Core: fix an IA32 build failure Thread-Index: AQHUbOfql0xUPltPjUy3FTu6+szHdaUwdVEAgAC1SAA= Date: Fri, 26 Oct 2018 08:03:07 +0000 Message-ID: References: <20181026045346.10192-1-jian.j.wang@intel.com> <0C09AFA07DD0434D9E2A0C6AEB0483103BC5BC40@shsmsx102.ccr.corp.intel.com> In-Reply-To: <0C09AFA07DD0434D9E2A0C6AEB0483103BC5BC40@shsmsx102.ccr.corp.intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiZjk2MjBmMWEtNjg2MC00Nzc4LTliMzUtMWVlM2EwNTA1OTJiIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiUzR4WVZwT3YxSFkrN2lIdkRnU3drQmxqd29aaE1pTDhwNzJJOUFUZXQ3TkNSWnNWakhlQUQxZGxjdHhmS1VLSyJ9 x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.0.400.15 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH] MdeModulePkg/Core: fix an IA32 build failure X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Oct 2018 08:05:58 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Thanks. Since this failure blocks others work, I'll check in this patch soo= n. Regards, Jian > -----Original Message----- > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Ze= ng, > Star > Sent: Friday, October 26, 2018 1:13 PM > To: edk2-devel ; edk2-devel@lists.01.org > Cc: Zeng, Star ; Gao, Liming > Subject: Re: [edk2] [PATCH] MdeModulePkg/Core: fix an IA32 build failure >=20 > Reviewed-by: Star Zeng >=20 > -----Original Message----- > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] > Sent: Friday, October 26, 2018 12:54 PM > To: edk2-devel@lists.01.org > Cc: Gao, Liming ; Zeng, Star > Subject: [edk2] [PATCH] MdeModulePkg/Core: fix an IA32 build failure >=20 > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1277 >=20 > The failure is caused by data type conversion between UINTN and UINT64, > which is checked in at 63ebde8ef6d4ff497d054ccc010904ecd4441198. >=20 > Cc: Star Zeng > Cc: Liming Gao > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Jian J Wang > --- > MdeModulePkg/Core/Dxe/Mem/HeapGuard.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) >=20 > diff --git a/MdeModulePkg/Core/Dxe/Mem/HeapGuard.c > b/MdeModulePkg/Core/Dxe/Mem/HeapGuard.c > index 449a022658..521e0d7b2a 100644 > --- a/MdeModulePkg/Core/Dxe/Mem/HeapGuard.c > +++ b/MdeModulePkg/Core/Dxe/Mem/HeapGuard.c > @@ -463,7 +463,7 @@ IsGuardPage ( > IN EFI_PHYSICAL_ADDRESS Address > ) > { > - UINTN BitMap; > + UINT64 BitMap; >=20 > // > // There must be at least one guarded page before and/or after given > @@ -1368,7 +1368,7 @@ GuardAllFreedPages ( > UINT64 Address; > UINT64 GuardPage; > INTN Level; > - UINTN BitIndex; > + UINT64 BitIndex; > UINTN GuardPageNumber; >=20 > if (mGuardedMemoryMap =3D=3D 0 || > @@ -1475,12 +1475,12 @@ MergeGuardPages ( > } >=20 > Bitmap =3D 0; > - Pages =3D EFI_SIZE_TO_PAGES (MaxAddress - MemoryMapEntry->PhysicalSta= rt); > - Pages -=3D MemoryMapEntry->NumberOfPages; > + Pages =3D EFI_SIZE_TO_PAGES ((UINTN)(MaxAddress - MemoryMapEntry- > >PhysicalStart)); > + Pages -=3D (INTN)MemoryMapEntry->NumberOfPages; > while (Pages > 0) { > if (Bitmap =3D=3D 0) { > EndAddress =3D MemoryMapEntry->PhysicalStart + > - EFI_PAGES_TO_SIZE (MemoryMapEntry->NumberOfPages); > + EFI_PAGES_TO_SIZE ((UINTN)MemoryMapEntry->NumberOfPag= es); > Bitmap =3D GetGuardedMemoryBits (EndAddress, > GUARDED_HEAP_MAP_ENTRY_BITS); > } >=20 > -- > 2.19.0.windows.1 >=20 > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel