From nobody Sun Feb 8 07:37:49 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+45482+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+45482+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1565661508; cv=none; d=zoho.com; s=zohoarc; b=lcqksbPBc5rD0IW+7j9plBGA9Zi43gDrFFohDBoyVY5g3+o+oQ52Uc5rzR7LC6KF/BMMpIsgYVJGaGDjdvSBJ22qbh0AwsJozJRK/iGuVu/fVlHOcghpeXtC4e3edQ4FdwsP4pTIvjnRfT9dynufytkl0i1SAqAyse2SzpxMzvY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565661508; h=Content-Transfer-Encoding:Cc:Date:From:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To:ARC-Authentication-Results; bh=6VakTPndv+ylnWsasnMb0tJd4UAocuh0kxYdFC/5BOQ=; b=DO09GxddJTKTj4+rmA6V/eJj8WsolIWpm+x+c3nIq/GTiflQfgo7krZvLdahsSp0qTH4BZrqQtfV7TxvmRZurc4IS4lxdyrMpgiKsvQ3+7RLpdQpVT/U9MmA9LnOMSKD5xuXdP6fsDQxU/Eu0umJGxdV7NeLwihvwOmIlCqi9SA= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+45482+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 15656615084097.36940135521013; Mon, 12 Aug 2019 18:58:28 -0700 (PDT) Return-Path: X-Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by groups.io with SMTP; Mon, 12 Aug 2019 18:58:27 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 Aug 2019 18:58:27 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,379,1559545200"; d="scan'208";a="327537679" X-Received: from shwdepsi1121.ccr.corp.intel.com ([10.239.158.47]) by orsmga004.jf.intel.com with ESMTP; 12 Aug 2019 18:58:26 -0700 From: "Bob Feng" To: devel@edk2.groups.io Cc: Liming Gao , Bob Feng Subject: [edk2-devel] [Patch] BaseTools: Add "-" in a re to parse line in .map file Date: Tue, 13 Aug 2019 09:58:10 +0800 Message-Id: <20190813015810.1312-1-bob.c.feng@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,bob.c.feng@intel.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1565661507; bh=FVdOfFugQGBdIrkNLO2o7/SQEHOKPsv7YpwktqRKSj4=; h=Cc:Date:From:Reply-To:Subject:To; b=PPfaiqShDx6E13h/wbDAVXVjhhY4MLD3UqAM0hdbxYxMMF7Zsc1ISgOnUxbvbmea9kW 4Tl9M0/9SfFbUlaAOFwoU5J0aR9JMlJsVA8mkJOnVF/hk4yYCiVDv/z0LId+g3hnMMZEo BNaWv14S2dlCn1VYeLrKVgjdh9DQCmEJm3c= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" 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 Signed-off-by: Bob Feng Reviewed-by: Liming Gao --- 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/Pyth= on/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): =20 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) =20 for line in lines: line =3D line.strip() if startPatternGeneral.match(line): status =3D 1 --=20 2.20.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#45482): https://edk2.groups.io/g/devel/message/45482 Mute This Topic: https://groups.io/mt/32848513/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-