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.43; helo=mga05.intel.com; envelope-from=star.zeng@intel.com; receiver=edk2-devel@lists.01.org Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) (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 2FAC920347107 for ; Sun, 19 Nov 2017 22:11:46 -0800 (PST) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Nov 2017 22:15:59 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.44,425,1505804400"; d="scan'208";a="4780607" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by fmsmga001.fm.intel.com with ESMTP; 19 Nov 2017 22:15:59 -0800 Received: from fmsmsx117.amr.corp.intel.com (10.18.116.17) 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:15:59 -0800 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by fmsmsx117.amr.corp.intel.com (10.18.116.17) with Microsoft SMTP Server (TLS) id 14.3.319.2; Sun, 19 Nov 2017 22:15:58 -0800 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.175]) by SHSMSX152.ccr.corp.intel.com ([169.254.6.93]) with mapi id 14.03.0319.002; Mon, 20 Nov 2017 14:15:56 +0800 From: "Zeng, Star" To: "Wang, Jian J" , "edk2-devel@lists.01.org" CC: "Bi, Dandan" , "Dong, Eric" , "Zeng, Star" Thread-Topic: [edk2] [PATCH v2] MdeModulePkg/Core: Fix build error with old Visual Studio Thread-Index: AQHTYcIxcoOd5kFySEyiYvuQPUCdKKMcyZ+A Date: Mon, 20 Nov 2017 06:15:56 +0000 Message-ID: <0C09AFA07DD0434D9E2A0C6AEB0483103B9B83FD@shsmsx102.ccr.corp.intel.com> References: <20171120054109.16560-1-jian.j.wang@intel.com> In-Reply-To: <20171120054109.16560-1-jian.j.wang@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 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:11:46 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Please also update the "This patch change them to decimal to fix it" in the= commit log accordingly, with that fixed, Reviewed-by: Star Zeng . Thanks, Star -----Original Message----- From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Jian= J Wang Sent: Monday, November 20, 2017 1:41 PM To: edk2-devel@lists.01.org Cc: Bi, Dandan ; Dong, Eric ; Zen= g, Star Subject: [edk2] [PATCH v2] MdeModulePkg/Core: Fix build error with old Visu= al Studio > v2 > a. Change an incorrect comment on return value > b. Change constants to macros The build error is introduced by following check in: 2930ef9809976ce693d1d377851344c3b06bd926 235a4490c8ce8b6dbac49e6ae3559cb73d6bf620 The Visual Studio older than 2015 doesn't support constant integer in binary format (0bxxx). This patch change them to decimal to fix it. 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(-) 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/Pi= SmmCore/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 /** --=20 2.14.1.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel