From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mx.groups.io with SMTP id smtpd.web11.7846.1604025098361617333 for ; Thu, 29 Oct 2020 19:31:38 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=QMdBvgI6; spf=pass (domain: intel.com, ip: 134.134.136.20, mailfrom: zhiguang.liu@intel.com) IronPort-SDR: PUPjnwDNC+F7UqcyzkqfdI6SF0UqeayJBNSvDIlw8ygo6MS/YHhQGBhv/TlcOOKygCOPwZVa5V CZB6aJAXFbSQ== X-IronPort-AV: E=McAfee;i="6000,8403,9789"; a="155522543" X-IronPort-AV: E=Sophos;i="5.77,431,1596524400"; d="scan'208";a="155522543" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Oct 2020 19:31:37 -0700 IronPort-SDR: 7uWNQa9XqBl/Vr3pSjN/ZzphanZrIExCa6UA/KyxCBu4znf1rl+hvupS5lAu1/hqHWhfM+6cHo rnG8alV60VpA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,431,1596524400"; d="scan'208";a="526970256" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by fmsmga005.fm.intel.com with ESMTP; 29 Oct 2020 19:31:37 -0700 Received: from fmsmsx609.amr.corp.intel.com (10.18.126.89) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Thu, 29 Oct 2020 19:31:36 -0700 Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) by fmsmsx609.amr.corp.intel.com (10.18.126.89) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5 via Frontend Transport; Thu, 29 Oct 2020 19:31:36 -0700 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (104.47.70.107) by edgegateway.intel.com (192.55.55.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.1713.5; Thu, 29 Oct 2020 19:31:19 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aV2IQpS+mx2X0H4eddvZA5t1SZgMdXtMoHEQL6b2ZXF2+ERsqv2CWHo5ILOj0hFGVXS0qf3sPleRkCG3HmR53TrCkL9p6cygqR1FflnIvS6FwBuGVc1TezkxS094TjinnndyuyK6HSGsrHSeGWH8mow3Qsk/z31ux4iKGXoyGzUHMQQAZUXc5DGK8A1+xhrfRgcjErEDqCJircwVQg0eIuV2NvsVJEd35TQiFx/WDw2sH0+lHN/yyS8lxaVhRTCLIqdiCS40vKIv5eQaQaKFIWjGiHpyP3lGNOxzGDo4kBr4dlsU3Jpy5gkyKRqwUu7l6mVd62TlmXFV9Vc/JA14ZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zvLGEKuBef0F5R5c8hfpjxxstnv/Dk4O2QHdca98yaI=; b=jRJsO6SSr+PHoKnTiqgSJKKdLjUUuzhOipWqbo1uXl3Z0OWNAWKV4Uj3J3Qn5XrOJNuFpg4coTpXTJWXJBUYBgYzqI7+34PhZbDxqaS3lE9sDJ7QxcMQNogC42YWjnA9kv9zDty8kcbUU3z6CnDHYuykkNuwZ5yWTpmS0A0hh0fwn8Kw0VKXwQYDn/8TyFMzdqDzaiAlb1hNNXDTzd26vCwN5/eGflnh8qdzdVfv7dw+w+lZOSpjDanLgm9NZk3VXM+IElKKrC5Bh+jVIseTOq2tJYGv8KmmiwPSYjwm4W3xORG0genWhVUQe2qluCKcxHUd+LbMA96Zu1Mm30cmqg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zvLGEKuBef0F5R5c8hfpjxxstnv/Dk4O2QHdca98yaI=; b=QMdBvgI6q+gO5y0ZijHjgP3FiNzF8w7/zvoyDF31PJ3MghJh1Sb8jHam0m/zB/tUeZYb1+4rBshngfPw7l88MlNfMbmst7TsFl6ocs6c66JQZgTmSCBfWpwTPyUWzEhFruyaJBzefDbVafyjA5wSTMJPPC47waGV0WJ4bg84Slo= Received: from CY4PR11MB1687.namprd11.prod.outlook.com (2603:10b6:903:2e::11) by CY4PR11MB1909.namprd11.prod.outlook.com (2603:10b6:903:11f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.23; Fri, 30 Oct 2020 02:31:17 +0000 Received: from CY4PR11MB1687.namprd11.prod.outlook.com ([fe80::7596:99f8:30f6:b717]) by CY4PR11MB1687.namprd11.prod.outlook.com ([fe80::7596:99f8:30f6:b717%6]) with mapi id 15.20.3477.028; Fri, 30 Oct 2020 02:31:17 +0000 From: "Zhiguang Liu" To: "devel@edk2.groups.io" , "fengyunhua@byosoft.com.cn" CC: "Feng, Bob C" , Liming Gao , "Chen, Christine" Subject: Re: [edk2-devel] [PATCH 2/2] BaseTools: update report map file format Thread-Topic: [edk2-devel] [PATCH 2/2] BaseTools: update report map file format Thread-Index: AQHWrOkwAvaTQci51kujdLvcGGXkaqmvblvQ Date: Fri, 30 Oct 2020 02:31:17 +0000 Message-ID: References: <20201028051318.1075-1-fengyunhua@byosoft.com.cn> <20201028051318.1075-3-fengyunhua@byosoft.com.cn> In-Reply-To: <20201028051318.1075-3-fengyunhua@byosoft.com.cn> Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-reaction: no-action dlp-version: 11.5.1.3 dlp-product: dlpe-windows authentication-results: edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=none action=none header.from=intel.com; x-originating-ip: [192.55.46.36] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 74ac1e7d-72dc-44f5-0cfd-08d87c7be130 x-ms-traffictypediagnostic: CY4PR11MB1909: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:164; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: r5aQhUEhUnWoOKhYUcCppTlZsM1n+CVY3jftS960AgOQM0F406PiZ0EiOP3h0PVByqWHcKF0Fj7Hiv5Cli6LscJpspFzqgaxLo3sH3URfT++eU+Y4je7gv6rsfeMUm7T+vTyHRz2DWj2FFeajqEvobIRwxNKjzqGT7Vbgh042rbwXOQN2Wa+91ew1c0lV/wc6Yu0B830ZWfg3qmofrYaRWK3dzF4IMuRNJyY9UyX5Z2VJVC7eZ+citvVPpyOk33mMlwSvMFL9ySttx2toUUIPYVYTCjBz60+3oD7UoAXcH0PLmyhF+HNm+9jmiHAVLRtuoOTMgMV2kJUtfpnAgbdUWRLEzXC49NUqRv++crglqdXa0Zr4qgFwFJiMVrvwVfati5Xt+32uYwdB0OE8uOdCg== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CY4PR11MB1687.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(39860400002)(136003)(376002)(366004)(396003)(346002)(71200400001)(86362001)(53546011)(2906002)(26005)(4326008)(8936002)(966005)(33656002)(8676002)(110136005)(9686003)(316002)(66476007)(5660300002)(478600001)(6506007)(52536014)(7696005)(107886003)(54906003)(186003)(15650500001)(64756008)(66946007)(76116006)(66556008)(66446008)(83380400001)(55016002);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: wINwiLX3MrFggjlmIceIReFzIOlbydjcft1eZ+nJ+NjgCTdwJBVO+Urc77Sy9hLS5IS4ecKdoeJkyvRdSJenCe7edkFIRL78B8dY6A27dH55IDgiHGNBabaabk1HLs1ssS3bwxNIJ7piP0DsPwg71sAv4HMKEaPhXXnNkkRyHnrfm/flSaUruIoqztV+9qfCGGplsh44gp+SyL2ve/S2bcpNsdsGY0O1oaHVxDH/u1k0frX4eK0Hs5vVnxFyW421tw+9yHsoZBGfJVyZbSCavggNYEnQZjgVgaY0hn9yaCZAqiPP3EKEPGySnac2aKG+jnsPEnE0bQ6eXnQFHphW59wlgr6eZJVYpcI9kBxwvfQCnnYrGx5TkF3DEPXldMFrwyEIgkcVlVcFClDLXUilyEWAEyOJRZ+WYIz5t2m59Q+CCHSjgGFPO8mIM3a/OcFLMHc+DbPzBsR3J0psHXBYBFkYOB0Genjj0nDtzZ8digpTs7nZs+cxVVcTMBDLXWOG00q2/WS++/NhVgf1XmpaPw31TydwMRdCD+tlmMhpeKmUGt1ztkADVJV7VRy+neITKbQ0jzA/raNQrJERNrbH6x/xab+0ej6kJyFnCIVCAUK7HG/kVx7K3fRDI6vl/D5JCJALQwQzGbVaY9kSWLR8zQ== MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: CY4PR11MB1687.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 74ac1e7d-72dc-44f5-0cfd-08d87c7be130 X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Oct 2020 02:31:17.2210 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 3jlMPIHvENTm4cQ0U8jDyojvTRfBTNZnEo90AFtN0TGeYX3Q6ctUi+qoqiSUdMgrFM/F24t3RnHTG3VSc+/h+g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR11MB1909 Return-Path: zhiguang.liu@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi Yunhua, I believe you want to use r"\w+" to represent "Type=3DPE", but r"\w+" can = only represents '[A-Za-z0-9_]'. Maybe you can use "\w+=3D\w+" Thanks Zhiguang > -----Original Message----- > From: devel@edk2.groups.io On Behalf Of > fengyunhua > Sent: Wednesday, October 28, 2020 1:13 PM > To: devel@edk2.groups.io > Cc: Feng, Bob C ; Liming Gao > ; Chen, Christine > Subject: [edk2-devel] [PATCH 2/2] BaseTools: update report map file form= at >=20 > update report map file format >=20 > Cc: Bob Feng > Cc: Liming Gao > Cc: Yuwei Chen > Signed-off-by: Yunhua Feng > --- > BaseTools/Source/Python/build/BuildReport.py | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) >=20 > diff --git a/BaseTools/Source/Python/build/BuildReport.py > b/BaseTools/Source/Python/build/BuildReport.py > index 8efa869162..57701ec3e3 100644 > --- a/BaseTools/Source/Python/build/BuildReport.py > +++ b/BaseTools/Source/Python/build/BuildReport.py > @@ -60,7 +60,7 @@ gPcdGuidPattern =3D re.compile(r"PCD\((\w+)[.](\w+)\)"= ) > gOffsetGuidPattern =3D re.compile(r"(0x[0-9A-Fa-f]+) ([-A-Fa-f0-9]+)") >=20 > ## Pattern to find module base address and entry point in fixed flash m= ap > file > -gModulePattern =3D r"\n[- > \w]+\s*\(([^,]+),\s*BaseAddress=3D%(Address)s,\s*EntryPoint=3D%(Address)= s\ > )\s*\(GUID=3D([-0-9A-Fa-f]+)[^)]*\)" > +gModulePattern =3D r"\n[- > \w]+\s*\(([^,]+),\s*BaseAddress=3D%(Address)s,\s*EntryPoint=3D%(Address)= s, > \s*\w+\)\s*\(GUID=3D([-0-9A-Fa-f]+)[^)]*\)" > gMapFileItemPattern =3D re.compile(gModulePattern % {"Address" : "(- > ?0[xX][0-9A-Fa-f]+)"}) >=20 > ## Pattern to find all module referenced header files in source files > -- > 2.27.0.windows.1 >=20 >=20 >=20 >=20 >=20 >=20