From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.93; helo=mga11.intel.com; envelope-from=jian.j.wang@intel.com; receiver=edk2-devel@lists.01.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (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 2B3BA20347105 for ; Sun, 19 Nov 2017 22:32:22 -0800 (PST) Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Nov 2017 22:36:35 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.44,425,1505804400"; d="scan'208";a="177874536" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by fmsmga005.fm.intel.com with ESMTP; 19 Nov 2017 22:36:35 -0800 Received: from shsmsx101.ccr.corp.intel.com (10.239.4.153) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.319.2; Sun, 19 Nov 2017 22:36:34 -0800 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.213]) by SHSMSX101.ccr.corp.intel.com ([169.254.1.159]) with mapi id 14.03.0319.002; Mon, 20 Nov 2017 14:36:33 +0800 From: "Wang, Jian J" To: "Zeng, Star" , "edk2-devel@lists.01.org" CC: "Bi, Dandan" , "Dong, Eric" Thread-Topic: [edk2] [PATCH v2] MdeModulePkg/Core: Fix build error with old Visual Studio Thread-Index: AQHTYcIxcoOd5kFySEyiYvuQPUCdKKMcyZ+AgAAGm3A= Date: Mon, 20 Nov 2017 06:36:32 +0000 Message-ID: References: <20171120054109.16560-1-jian.j.wang@intel.com> <0C09AFA07DD0434D9E2A0C6AEB0483103B9B83FD@shsmsx102.ccr.corp.intel.com> In-Reply-To: <0C09AFA07DD0434D9E2A0C6AEB0483103B9B83FD@shsmsx102.ccr.corp.intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiNWUyNGUzYWQtOWVlMy00M2Q0LTlmZjYtYzdmNTU5ZWU3NDRiIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX0lDIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjIuNS4xOCIsIlRydXN0ZWRMYWJlbEhhc2giOiJYNHRiWDdZSG5kNzR0cHJ5em93XC9XeHZcL2p5cTJ4SDJYMUsxTU93SjRNdVJNclhxQlJlVG5sTEFXK3Uzc3E1K24ifQ== x-ctpclassification: CTP_IC dlp-product: dlpe-windows dlp-version: 11.0.0.116 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH v2] MdeModulePkg/Core: Fix build error with old Visual Studio X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Nov 2017 06:32:22 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Sure. Thanks. > -----Original Message----- > From: Zeng, Star > Sent: Monday, November 20, 2017 2:16 PM > To: Wang, Jian J ; edk2-devel@lists.01.org > Cc: Bi, Dandan ; Dong, Eric ; > Zeng, Star > Subject: RE: [edk2] [PATCH v2] MdeModulePkg/Core: Fix build error with ol= d > Visual Studio >=20 > Please also update the "This patch change them to decimal to fix it" in t= he > commit log accordingly, with that fixed, Reviewed-by: Star Zeng > . >=20 > Thanks, > Star > -----Original Message----- > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Ji= an J > Wang > Sent: Monday, November 20, 2017 1:41 PM > To: edk2-devel@lists.01.org > Cc: Bi, Dandan ; Dong, Eric ; > Zeng, Star > Subject: [edk2] [PATCH v2] MdeModulePkg/Core: Fix build error with old Vi= sual > Studio >=20 > > v2 > > a. Change an incorrect comment on return value > > b. Change constants to macros >=20 > The build error is introduced by following check in: > 2930ef9809976ce693d1d377851344c3b06bd926 > 235a4490c8ce8b6dbac49e6ae3559cb73d6bf620 >=20 > The Visual Studio older than 2015 doesn't support constant integer > in binary format (0bxxx). This patch change them to decimal to fix > it. >=20 > Cc: Star Zeng > Cc: Eric Dong > Cc: Bi Dandan > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Jian J Wang > --- > MdeModulePkg/Core/Dxe/Mem/HeapGuard.c | 13 +++++++++---- > MdeModulePkg/Core/PiSmmCore/HeapGuard.c | 13 +++++++++---- > 2 files changed, 18 insertions(+), 8 deletions(-) >=20 > diff --git a/MdeModulePkg/Core/Dxe/Mem/HeapGuard.c > b/MdeModulePkg/Core/Dxe/Mem/HeapGuard.c > index 98d597b180..752befa44d 100644 > --- a/MdeModulePkg/Core/Dxe/Mem/HeapGuard.c > +++ b/MdeModulePkg/Core/Dxe/Mem/HeapGuard.c > @@ -373,7 +373,7 @@ ClearGuardedMemoryBits ( > @param[in] Address Memory address to retrieve from. > @param[in] NumberOfPages Number of pages to retrieve. >=20 > - @return VOID. > + @return An integer containing the guarded memory bitmap. > **/ > UINTN > GetGuardedMemoryBits ( > @@ -501,8 +501,13 @@ IsGuardPage ( > { > UINTN BitMap; >=20 > + // > + // There must be at least one guarded page before and/or after given > + // address if it's a Guard page. The bitmap pattern should be one of > + // 001, 100 and 101 > + // > BitMap =3D GetGuardedMemoryBits (Address - EFI_PAGE_SIZE, 3); > - return ((BitMap =3D=3D 0b001) || (BitMap =3D=3D 0b100) || (BitMap =3D= =3D 0b101)); > + return ((BitMap =3D=3D BIT0) || (BitMap =3D=3D BIT2) || (BitMap =3D=3D= (BIT2 | BIT0))); > } >=20 > /** > @@ -519,7 +524,7 @@ IsHeadGuard ( > IN EFI_PHYSICAL_ADDRESS Address > ) > { > - return (GetGuardedMemoryBits (Address, 2) =3D=3D 0b10); > + return (GetGuardedMemoryBits (Address, 2) =3D=3D BIT1); > } >=20 > /** > @@ -536,7 +541,7 @@ IsTailGuard ( > IN EFI_PHYSICAL_ADDRESS Address > ) > { > - return (GetGuardedMemoryBits (Address - EFI_PAGE_SIZE, 2) =3D=3D 0b01)= ; > + return (GetGuardedMemoryBits (Address - EFI_PAGE_SIZE, 2) =3D=3D BIT0)= ; > } >=20 > /** > diff --git a/MdeModulePkg/Core/PiSmmCore/HeapGuard.c > b/MdeModulePkg/Core/PiSmmCore/HeapGuard.c > index 6fda9ba430..c7a1408562 100644 > --- a/MdeModulePkg/Core/PiSmmCore/HeapGuard.c > +++ b/MdeModulePkg/Core/PiSmmCore/HeapGuard.c > @@ -385,7 +385,7 @@ ClearGuardedMemoryBits ( > @param[in] Address Memory address to retrieve from. > @param[in] NumberOfPages Number of pages to retrieve. >=20 > - @return VOID > + @return An integer containing the guarded memory bitmap. > **/ > UINTN > GetGuardedMemoryBits ( > @@ -513,8 +513,13 @@ IsGuardPage ( > { > UINTN BitMap; >=20 > + // > + // There must be at least one guarded page before and/or after given > + // address if it's a Guard page. The bitmap pattern should be one of > + // 001, 100 and 101 > + // > BitMap =3D GetGuardedMemoryBits (Address - EFI_PAGE_SIZE, 3); > - return ((BitMap =3D=3D 0b001) || (BitMap =3D=3D 0b100) || (BitMap =3D= =3D 0b101)); > + return ((BitMap =3D=3D BIT0) || (BitMap =3D=3D BIT2) || (BitMap =3D=3D= (BIT2 | BIT0))); > } >=20 > /** > @@ -531,7 +536,7 @@ IsHeadGuard ( > IN EFI_PHYSICAL_ADDRESS Address > ) > { > - return (GetGuardedMemoryBits (Address, 2) =3D=3D 0b10); > + return (GetGuardedMemoryBits (Address, 2) =3D=3D BIT1); > } >=20 > /** > @@ -548,7 +553,7 @@ IsTailGuard ( > IN EFI_PHYSICAL_ADDRESS Address > ) > { > - return (GetGuardedMemoryBits (Address - EFI_PAGE_SIZE, 2) =3D=3D 0b01)= ; > + return (GetGuardedMemoryBits (Address - EFI_PAGE_SIZE, 2) =3D=3D BIT0)= ; > } >=20 > /** > -- > 2.14.1.windows.1 >=20 > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel