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.126; helo=mga18.intel.com; envelope-from=yonghong.zhu@intel.com; receiver=edk2-devel@lists.01.org Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) (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 16598226847A5 for ; Wed, 25 Apr 2018 01:49:25 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Apr 2018 01:49:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,325,1520924400"; d="scan'208";a="219224720" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by orsmga005.jf.intel.com with ESMTP; 25 Apr 2018 01:49:25 -0700 Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 25 Apr 2018 01:49:24 -0700 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.210]) by shsmsx102.ccr.corp.intel.com ([169.254.2.79]) with mapi id 14.03.0319.002; Wed, 25 Apr 2018 16:49:22 +0800 From: "Zhu, Yonghong" To: "Carsey, Jaben" , "edk2-devel@lists.01.org" CC: "Gao, Liming" , "Zhu, Yonghong" Thread-Topic: [PATCH v1 01/27] BaseTools: Misc - refactor RegEx to minimize multiple compiling Thread-Index: AQHT2L+Fxiwx9vEkZkGiwrjw2mcB3qQRHBIQ Date: Wed, 25 Apr 2018 08:49:22 +0000 Message-ID: References: <2a976f16c253e6d5074f1715d98337e3e63fd5c3.1524239027.git.jaben.carsey@intel.com> In-Reply-To: <2a976f16c253e6d5074f1715d98337e3e63fd5c3.1524239027.git.jaben.carsey@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 v1 01/27] BaseTools: Misc - refactor RegEx to minimize multiple compiling X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Apr 2018 08:49:26 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Yonghong Zhu =20 Best Regards, Zhu Yonghong -----Original Message----- From: Carsey, Jaben=20 Sent: Friday, April 20, 2018 11:51 PM To: edk2-devel@lists.01.org Cc: Gao, Liming ; Zhu, Yonghong Subject: [PATCH v1 01/27] BaseTools: Misc - refactor RegEx to minimize mult= iple compiling Cc: Liming Gao Cc: Yonghong Zhu Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Jaben Carsey --- BaseTools/Source/Python/Common/Misc.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Pyth= on/Common/Misc.py index 4f2bfd63cfc3..bc7d0c2d9d00 100644 --- a/BaseTools/Source/Python/Common/Misc.py +++ b/BaseTools/Source/Python/Common/Misc.py @@ -84,6 +84,7 @@ def _parseForXcode(lines, efifilepath, varnames): if status =3D=3D 1 and len(line) !=3D 0: for varname in varnames: if varname in line: + # cannot pregenerate this RegEx since it uses varname = from varnames. m =3D re.match('^([\da-fA-FxX]+)([\s\S]*)([_]*%s)$' % = varname, line) if m is not None: ret.append((varname, m.group(1))) @@ -91,6 +92,8 @= @ def _parseForXcode(lines, efifilepath, varnames): =20 def _parseForGCC(lines, efifilepath, varnames): """ Parse map file generated by GCC linker """ + valuePattern =3D re.compile('^([\w_\.]+) +([\da-fA-Fx]+) +([\da-fA-Fx]= +)$') + pcdPattern =3D re.compile('^([\da-fA-Fx]+) +([\da-fA-Fx]+)') status =3D 0 sections =3D [] varoffset =3D [] @@ -109,7 +112,7 @@ def _parseForGCC(lines, efifilepath, varnames): =20 # status handler if status =3D=3D 3: - m =3D re.match('^([\w_\.]+) +([\da-fA-Fx]+) +([\da-fA-Fx]+)$',= line) + m =3D valuePattern.match(line) if m is not None: sections.append(m.groups(0)) for varname in varnames: @@ -122,7 +125,7 @@ def _parseForGCC(lines, efifilepath, varnames): else: Str =3D line[len(".data.%s" % varname):] if Str: - m =3D re.match('^([\da-fA-Fx]+) +([\da-fA-Fx]+)', = Str.strip()) + m =3D pcdPattern.match(Str.strip()) if m is not None: varoffset.append((varname, int(m.groups(0)[0],= 16) , int(sections[-1][1], 16), sections[-1][0])) =20 @@ -152,16 +155,18 @@ def _parseGeneral(lines, efifilepath, varnames): varoffset =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) + startRe =3D re.compile("^Start[' ']+Length[' ']+Name[' ']+Class") + addressRe =3D re.compile("^Address[' ']+Publics by Value['=20 + ']+Rva\+Base") =20 for line in lines: line =3D line.strip() - if re.match("^Start[' ']+Length[' ']+Name[' ']+Class", line): + if startRe.match(line): status =3D 1 continue - if re.match("^Address[' ']+Publics by Value[' ']+Rva\+Base", line)= : + if addressRe.match(line): status =3D 2 continue - if re.match("^entry point at", line): + if line.startswith("entry point at"): status =3D 3 continue =20 if status =3D=3D 1 and len(line) !=3D 0: @@ -177,6 +182,7 @@ def _parseGeneral(lines, efifilepath, varnames): sec_no =3D int(sec_no, 16) sym_offset =3D int(sym_offset, 16) vir_addr =3D int(vir_addr, 16) + # cannot pregenerate this RegEx since it uses varname from= varnames. m2 =3D re.match('^[_]*(%s)' % varname, sym_name) if m2 is not None: # fond a binary pcd entry in map file -- 2.16.2.windows.1