From mboxrd@z Thu Jan  1 00:00:00 1970
Authentication-Results: mx.groups.io;
 dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.100, mailfrom: liming.gao@intel.com)
Received: from mga07.intel.com (mga07.intel.com [134.134.136.100])
 by groups.io with SMTP; Mon, 12 Aug 2019 21:58:51 -0700
X-Amp-Result: SKIPPED(no attachment in message)
X-Amp-File-Uploaded: False
Received: from orsmga003.jf.intel.com ([10.7.209.27])
  by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 Aug 2019 21:58:50 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.64,380,1559545200"; 
   d="scan'208";a="178561300"
Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203])
  by orsmga003.jf.intel.com with ESMTP; 12 Aug 2019 21:58:50 -0700
Received: from fmsmsx155.amr.corp.intel.com (10.18.116.71) by
 FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS)
 id 14.3.439.0; Mon, 12 Aug 2019 21:58:50 -0700
Received: from shsmsx105.ccr.corp.intel.com (10.239.4.158) by
 FMSMSX155.amr.corp.intel.com (10.18.116.71) with Microsoft SMTP Server (TLS)
 id 14.3.439.0; Mon, 12 Aug 2019 21:58:50 -0700
Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.112]) by
 SHSMSX105.ccr.corp.intel.com ([169.254.11.15]) with mapi id 14.03.0439.000;
 Tue, 13 Aug 2019 12:58:48 +0800
From: "Liming Gao" <liming.gao@intel.com>
To: "Feng, Bob C" <bob.c.feng@intel.com>, "devel@edk2.groups.io"
	<devel@edk2.groups.io>
Subject: Re: [Patch] BaseTools: Add "-" in a re to parse line in .map file
Thread-Topic: [Patch] BaseTools: Add "-" in a re to parse line in .map file
Thread-Index: AQHVUXqcySjBXM/dFUS9qyG/UiQ0Jab4hGJg
Date: Tue, 13 Aug 2019 04:58:48 +0000
Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E4CFAE2@SHSMSX104.ccr.corp.intel.com>
References: <20190813015810.1312-1-bob.c.feng@intel.com>
In-Reply-To: <20190813015810.1312-1-bob.c.feng@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
Return-Path: liming.gao@intel.com
Content-Language: en-US
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable

Reviewed-by: Liming Gao <liming.gao@intel.com>

>-----Original Message-----
>From: Feng, Bob C
>Sent: Tuesday, August 13, 2019 9:58 AM
>To: devel@edk2.groups.io
>Cc: Gao, Liming <liming.gao@intel.com>; Feng, Bob C <bob.c.feng@intel.com>
>Subject: [Patch] BaseTools: Add "-" in a re to parse line in .map file
>
>https://bugzilla.tianocore.org/show_bug.cgi?id=3D2058
>
>If there are multiple module instances with different
>guid used in .dsc file, the temp path of the module will
>contain 8-4-4-4-12 format guid string. So "-" need to be
>added into the regular expression for parsing it correctly.
>
>Cc: Liming Gao <liming.gao@intel.com>
>Signed-off-by: Bob Feng <bob.c.feng@intel.com>
>---
> BaseTools/Source/Python/Common/Misc.py | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/BaseTools/Source/Python/Common/Misc.py
>b/BaseTools/Source/Python/Common/Misc.py
>index 26d149c270..554ec010dd 100644
>--- a/BaseTools/Source/Python/Common/Misc.py
>+++ b/BaseTools/Source/Python/Common/Misc.py
>@@ -162,11 +162,11 @@ def _parseForGCC(lines, efifilepath, varnames):
>
> def _parseGeneral(lines, efifilepath, varnames):
>     status =3D 0    #0 - beginning of file; 1 - PE section definition; 2 =
- symbol table
>     secs  =3D []    # key =3D section name
>     varoffset =3D []
>-    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)
>
>     for line in lines:
>         line =3D line.strip()
>         if startPatternGeneral.match(line):
>             status =3D 1
>--
>2.20.1.windows.1