From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (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 7D4EA81D65 for ; Thu, 3 Nov 2016 19:06:40 -0700 (PDT) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga105.jf.intel.com with ESMTP; 03 Nov 2016 19:06:42 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,589,1473145200"; d="scan'208";a="897544872" Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by orsmga003.jf.intel.com with ESMTP; 03 Nov 2016 19:06:42 -0700 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.248.2; Thu, 3 Nov 2016 19:06:41 -0700 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.206]) by SHSMSX152.ccr.corp.intel.com ([169.254.6.2]) with mapi id 14.03.0248.002; Fri, 4 Nov 2016 10:06:39 +0800 From: "Gao, Liming" To: "Zhu, Yonghong" , "edk2-devel@lists.01.org" Thread-Topic: [Patch] BaseTools: Add the support for character '<' and '>' in the map file Thread-Index: AQHSNjKk382eT3gyi0Kuwqphmip+r6DIE6+A Date: Fri, 4 Nov 2016 02:06:38 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14B49E920@shsmsx102.ccr.corp.intel.com> References: <1478219421-46324-1-git-send-email-yonghong.zhu@intel.com> In-Reply-To: <1478219421-46324-1-git-send-email-yonghong.zhu@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [Patch] BaseTools: Add the support for character '<' and '>' in the map file 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: Fri, 04 Nov 2016 02:06:40 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Liming Gao > -----Original Message----- > From: Zhu, Yonghong > Sent: Friday, November 04, 2016 8:30 AM > To: edk2-devel@lists.01.org > Cc: Gao, Liming > Subject: [Patch] BaseTools: Add the support for character '<' and '>' in = the > map file >=20 > Current the regex for the symbol in the map file doesn't support the '<' > and '>' character, while user use Lambda Expression (C++11 feature), it > would generate the something like @V@ in the map file which > cause build fail to parse the symbol in map file. >=20 > Cc: Liming Gao > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Yonghong Zhu > --- > BaseTools/Source/Python/GenPatchPcdTable/GenPatchPcdTable.py | 4 ++- > - > 1 file changed, 2 insertions(+), 2 deletions(-) >=20 > diff --git > a/BaseTools/Source/Python/GenPatchPcdTable/GenPatchPcdTable.py > b/BaseTools/Source/Python/GenPatchPcdTable/GenPatchPcdTable.py > index 59bc7c4..f4fd51a 100644 > --- a/BaseTools/Source/Python/GenPatchPcdTable/GenPatchPcdTable.py > +++ b/BaseTools/Source/Python/GenPatchPcdTable/GenPatchPcdTable.py > @@ -3,11 +3,11 @@ > # The Patch PCD table like: > # > # PCD Name Offset in binary > # =3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > # > -# Copyright (c) 2008 - 2014, Intel Corporation. All rights reserved.
> +# Copyright (c) 2008 - 2016, 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 > # http://opensource.org/licenses/bsd-license.php > # > @@ -35,11 +35,11 @@ __copyright__ =3D "Copyright (c) 2008 - 2010, Intel > Corporation. All rights reserv >=20 > #=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Internal Libraries > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >=20 > #=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Code > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > secRe =3D re.compile('^([\da-fA-F]+):([\da-fA-F]+) +([\da-fA-F]+)[Hh]? > +([.\w\$]+) +(\w+)', re.UNICODE) > -symRe =3D re.compile('^([\da-fA-F]+):([\da-fA-F]+) +([\.\-:\\\\\w\?@\$]+= ) > +([\da-fA-F]+)', re.UNICODE) > +symRe =3D re.compile('^([\da-fA-F]+):([\da-fA-F]+) +([\.\-:\\\\\w\?@\$<>= ]+) > +([\da-fA-F]+)', re.UNICODE) >=20 > def parsePcdInfoFromMapFile(mapfilepath, efifilepath): > """ Parse map file to get binary patch pcd information > @param path Map file absolution path >=20 > -- > 2.6.1.windows.1