From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail05.groups.io (mail05.groups.io [45.79.224.7]) by spool.mail.gandi.net (Postfix) with ESMTPS id A58DEAC0CB3 for ; Mon, 22 Apr 2024 06:13:01 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=mehX1dVp8/GimfAKVA6PZo3iNBimR3kBwdkHMA7gjR0=; c=relaxed/simple; d=groups.io; h=From:To:CC:Subject:Thread-Topic:Thread-Index:Date:Message-ID:References:In-Reply-To:Accept-Language:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Resent-Date:Resent-From:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Language:Content-Type:Content-Transfer-Encoding; s=20240206; t=1713766380; v=1; b=B4UtUxffztlwpHckMMTXWWnue7M4eKUsxdJ+FtPltcK2uc4G6tviGiz8+4wNPp9kCHE7a6bW ZJGdTLV257zCrZqKSZ8tK34Tj1s485tlrMtBUUYhMFn7BieroxUlMe1RIzh5Ieqse/Y4AIao8rS ZIhpo6jlgBYtpZNA57uW97+Cl//5xnjhqYXNUfbiFDLr4WqNk/Sb4pokRt0fPIE26Xv34VOWWcz D8g4Xs2fQZj6PsYAgX2lLWxfZ5ZMEY0TfFFCy/wF7mvm0euNHOY+8bi9uu5IlUDGseMEB2DyyxN 53owZPgH5PYcM10kAy9hU2eNnutx8wy+ITxOpvqZLFLUA== X-Received: by 127.0.0.2 with SMTP id O2gSYY7687511x9bzgbAvm1z; Sun, 21 Apr 2024 23:13:00 -0700 X-Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.16]) by mx.groups.io with SMTP id smtpd.web10.12184.1713766375105142060 for ; Sun, 21 Apr 2024 23:12:59 -0700 X-CSE-ConnectionGUID: ESDihPOLQg2Hvqc4cjFILA== X-CSE-MsgGUID: ZIOXTUD9SwC2HcDbkzYSFQ== X-IronPort-AV: E=McAfee;i="6600,9927,11051"; a="9406985" X-IronPort-AV: E=Sophos;i="6.07,219,1708416000"; d="scan'208";a="9406985" X-Received: from orviesa005.jf.intel.com ([10.64.159.145]) by orvoesa108.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Apr 2024 23:12:59 -0700 X-CSE-ConnectionGUID: 6g1ikN1ITPeWzBbEZxlLpg== X-CSE-MsgGUID: W8duej42Tniecl1+TyuHJg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,219,1708416000"; d="scan'208";a="28687533" X-Received: from fmsmsx603.amr.corp.intel.com ([10.18.126.83]) by orviesa005.jf.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 21 Apr 2024 23:12:59 -0700 X-Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Sun, 21 Apr 2024 23:12:58 -0700 X-Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Sun, 21 Apr 2024 23:12:58 -0700 X-Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35 via Frontend Transport; Sun, 21 Apr 2024 23:12:58 -0700 X-Received: from NAM11-BN8-obe.outbound.protection.outlook.com (104.47.58.173) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Sun, 21 Apr 2024 23:12:57 -0700 X-Received: from DM4PR11MB5280.namprd11.prod.outlook.com (2603:10b6:5:38b::18) by PH7PR11MB6857.namprd11.prod.outlook.com (2603:10b6:510:1ed::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7519.20; Mon, 22 Apr 2024 06:12:55 +0000 X-Received: from DM4PR11MB5280.namprd11.prod.outlook.com ([fe80::e797:dd8d:b92b:41ee]) by DM4PR11MB5280.namprd11.prod.outlook.com ([fe80::e797:dd8d:b92b:41ee%7]) with mapi id 15.20.7519.018; Mon, 22 Apr 2024 06:12:55 +0000 From: "Ashraf Ali S" To: "Guo, Gua" , "devel@edk2.groups.io" CC: "Chiu, Chasel" , "Desimone, Nathaniel L" , "Duggapu, Chinni B" , "Zeng, Star" , "Kuo, Ted" , Susovan Mohapatra Subject: Re: [edk2-devel] [PATCH v1 2/2] IntelFsp2Pkg/PatchFv.py: Python 3.12 support Thread-Topic: [PATCH v1 2/2] IntelFsp2Pkg/PatchFv.py: Python 3.12 support Thread-Index: AQHalFWYBkXySFdCIEaml7y4TRt/f7Fzz4tw Date: Mon, 22 Apr 2024 06:12:55 +0000 Message-ID: References: <20240422013646.1769-1-gua.guo@intel.com> <20240422013646.1769-3-gua.guo@intel.com> In-Reply-To: <20240422013646.1769-3-gua.guo@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: DM4PR11MB5280:EE_|PH7PR11MB6857:EE_ x-ms-office365-filtering-correlation-id: ba4bf8a2-d8dd-4835-3812-08dc62934050 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam-message-info: =?us-ascii?Q?wOxLux8mZLLy2AAYBgj3b7PQH+3h7lYOKV8Y8d0aTlKstW5nM0YR/UppACmZ?= =?us-ascii?Q?FjCpA/J8AmgRSWdT2p8TElnO/l3Ygl5d2haoefcBrCsbmaWTvhFiTUVfh8+Z?= =?us-ascii?Q?7IOK8rwRpNJqVh3wBCyFy8l7Y2CikBmUHXWxHfylOGXYZ3lEsB+LLqz9zdQI?= =?us-ascii?Q?uAoQyosJfqOBsii7eMok8zYl0STHAk88RVcUwybwNOpk40QkQEdzV9hxSjAw?= =?us-ascii?Q?ayQekO0hXZijLSl4x5noBzDmuJv/943QWwbBMoK+3q0WwNxpdwqjnESSzsOR?= =?us-ascii?Q?QnmWVnUlTB2yV+zlQvZQL8SG0T0OwY7Wt+N39tBncO/aN8J+rFgYgfqOZAjt?= =?us-ascii?Q?gId2oZm5CusNYH5b/BWhWdz2Tha4ZnlsfLPSWb8CwjXg1jB5d0DJ24Gxw3EV?= =?us-ascii?Q?8iUBs259jtVLuMRtKfmBltELXUbLVHNQW0T+yUqUtluKCBDXtWrrD4rokPoJ?= =?us-ascii?Q?M2FHDESczsjyz/MG5FEC+HlsqTWsDWekULK00WDgNYJFbMQa88D3v+tdaQJG?= =?us-ascii?Q?sGMeQCeedX+A95ZvvnmmWqJgLKCr+bUYz3nMXKhoH3FIGMIYTGiajtC+XLBp?= =?us-ascii?Q?DqXSCT+SS2dFBm1vRAW1GVTxZFwF/R+vaDgTOua2gUEg3nm1PyKrsuhQE4Gh?= =?us-ascii?Q?WeiROp6VaFC/OS/mLZmrbqiTmUV0FNa1+CQ2i5oX6PdQok8gf4Z3/yBcmGf7?= =?us-ascii?Q?UbVE2ZHUXzAOz/KSDNZJk/of3WwZVM2fB9uCv+LxYFG/dD3ywBvNyjipah/G?= =?us-ascii?Q?uNCTQvCxP0z18h+yPdvnhDy0DUDoD1SvpYTrJ7bGbNmrxqdhu1X2/VAi0DaX?= =?us-ascii?Q?yF2uZ5g/sERr4tjLCXrRHZf2MXr7R6eoWA6LlIV1AcAhtxTWNMTX0cA64RoJ?= =?us-ascii?Q?3zmBwFh4f6Qa3bTceuYpwOht7Qyvs6pvPnga++dyLriKVbXRPVWjA2SFq/D6?= =?us-ascii?Q?zWebXtP4Qxr5oMCZC72pWXsb90yCzl3QCQIAKwOD8lXob79WzepEmKR/5oXX?= =?us-ascii?Q?r7Pf1caAHdOmUnfe5qLCTeiRw1oVP9BaDD0Jn+BneP+mdliUyvjh90r1q2ya?= =?us-ascii?Q?h9uKqV1m7rbWtlvhzdFoMaRCYjVJmSThc5IlL0cP2oQ90u1GwTONrR/wnJ5C?= =?us-ascii?Q?m06cT8vUmHQjATCoZxXwIY/Rk8gIaNLJh9CcEY7pCWJJ+xuWpP0k2gnk0Tj0?= =?us-ascii?Q?JYGPNtsOhp5rHckBjJpxAUtJR9hDvMdOn5pDOEz4Z+GAz2B9TtU9NQTH8mjt?= =?us-ascii?Q?P9nwGyLgN67nqAB13unr1/ol6nSYrOdQ9+UfNaj3VwltUMcrdpz+kPSPqKnb?= =?us-ascii?Q?+fTcb/lb4FDaVOD3yIENS3vKNWbiPPIw732Mnmh2pfaxPA=3D=3D?= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?409dOTau+1hcZb4+MOw9XiQNaPkZRO0Xa6Ui0iAyeBUxE4m/pvlRqDJJQo/f?= =?us-ascii?Q?XymHYmyZcFj1QMBbpjbbVhoaAi9LnmJLqF/PFKgJjmULVSjFjgxzU6PcE2C8?= =?us-ascii?Q?cYzSzUHesprRAZwpixFrOq759HmoRRXQaaRyE5ECu5UobjbDodQy4o2fmyvW?= =?us-ascii?Q?fGuYbRGZS/ggwlNvcm9Hbb/mOtMySxo99MCLBR7gjByhW7K1EuBRDXnpFDhd?= =?us-ascii?Q?9WVhNIq8K/ns2/7dU0yBEI0ov9aLx9Lb7Lwlzx5NHcH7rRMfC9uSEa1wQwbM?= =?us-ascii?Q?IrIOAZoHPmRmysgW0Ro50Htpv7Srsqr4I6OSu5SODGbkgpIS8z122ERa4Lf1?= =?us-ascii?Q?EDxN1r+dM5GzXEKSOQvsKq4uI2bZEt2ixfB3c9Fj9TM69CBMqj8b7JWqIOmf?= =?us-ascii?Q?PoiL8zRVoIDrYrZQdvCT1byg4b9DUOTEoUO9aXPp+XLZd/sj1TtTfYUHfggT?= =?us-ascii?Q?A74hmeBhL5V8L2dI7qvjnUOqOhGWycuv6/sI6sn3eE4mmvBa4PHK6PRd+u6v?= =?us-ascii?Q?DG/oo2Xtz72BngbM0IHDCCZyh+cSm6a/q2QRWz4WS+RxGrabN3tgInv/rB5j?= =?us-ascii?Q?u+0aQ0CiU+kJh7kNLZR2oRrgotm1SkMSYO4ErsURRBBA3nFwMcEwtgZk74zx?= =?us-ascii?Q?uL4ZJQTYrD2BUPFPtmkHCNYz9sxj5e/xVhn4oUF4AHr8D0pRjLBxAzOrBvGP?= =?us-ascii?Q?90o6uihulyYH3u16Xl0eeTVq52CQ6z3OmI3xuaZ7ZYazAkYP7lSTuw0zLT/g?= =?us-ascii?Q?9bGm8a5Osj7nC3NTu6jWRjm2W89Fw3mFsy1JnPCPB+PhH27O8jpM4c9mVsqI?= =?us-ascii?Q?a3E3A53atTaENrfHEiZP8G8LTPyHYJGmZ2w6d80aBfzAlbbBiTPenKCRW2ot?= =?us-ascii?Q?etEXE8Fap3JOuSTCQjZUm0bGRUudMPe9Y26yPHJd7ltAK87t04mvc3DHpGHg?= =?us-ascii?Q?iAmsLyijv4pSnk467sN5f/oh33cecJ87hcU5W/ynzxvnw3vSWDYwrfu0ouAL?= =?us-ascii?Q?gWpFCAv7FH2jtQUbytEXGWMDtlWEDUW3tX30tLL4v43t4qWkVmYnIpUX4o8a?= =?us-ascii?Q?qMx8FnMaKghzNIwIly774tfBQAFuI15P/2iTmX4Lgz3sEYXTpnxH2o2sfa3V?= =?us-ascii?Q?9C0iFw06Lzi10cxI4+Yd1GO9Olyh4GIZxiGVf1z8wza0qWbzIIb861WjiO61?= =?us-ascii?Q?RUUE76zOaBgLyRtiJCnIICDQPDDpNXPyQNT9h59LWAQpYtYXaG6aMVoY6pe/?= =?us-ascii?Q?f30eZS+sk4A66fq9OiEoUAxBlV2BvM3G+gbqg7Td8P7YIKjp5u/VRU9sWPtW?= =?us-ascii?Q?vwKx85dvGo0FzIxozQFluzb3RNpbFdNw+18dJIiBllr0zFvz8FQJbxglkfbb?= =?us-ascii?Q?tvTjO6SjQPsjP+DlEcZHCoQEIJ28q/ZiqeosNg6K8dRTkfU0PxgGPbd7ayB6?= =?us-ascii?Q?yQ6maXq+MNicyu7KRiaYFoj6jJ56BzkRcEDq33KFESworIdXg3KUtpgTZgjg?= =?us-ascii?Q?ok0H0ebHnyH1s+jvNgU8qWcGhhpEs7912zOmSu/DLQ3DUfAwXqTkPNLrUoue?= =?us-ascii?Q?OpR7SRyPNUlO7VOfZFyNfcz80YyHW6p7OO93GF5F?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5280.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ba4bf8a2-d8dd-4835-3812-08dc62934050 X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Apr 2024 06:12:55.8168 (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: c3dL9nslmNJ44W04+0hY/cdRDacA4BNrSvOKxlSW+5cJFDAkcBECTGzLSHm9/BLi+ITbTU4wzCUdz87ev5t/CA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR11MB6857 X-OriginatorOrg: intel.com Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Resent-Date: Sun, 21 Apr 2024 23:12:59 -0700 Resent-From: ashraf.ali.s@intel.com Reply-To: devel@edk2.groups.io,ashraf.ali.s@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: 2CIh6phe4P0n59WPoThQ9fgRx7686176AA= Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20240206 header.b=B4UtUxff; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=intel.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 45.79.224.7 as permitted sender) smtp.mailfrom=bounce@groups.io Reviewed-by: S, Ashraf Ali Thanks., S, Ashraf Ali -----Original Message----- From: Guo, Gua =20 Sent: Monday, April 22, 2024 7:07 AM To: devel@edk2.groups.io Cc: Guo, Gua ; Chiu, Chasel ; Des= imone, Nathaniel L ; Duggapu, Chinni B ; Zeng, Star ; Kuo, Ted ; S, Ashraf Ali ; Susovan Mohapatra Subject: [PATCH v1 2/2] IntelFsp2Pkg/PatchFv.py: Python 3.12 support From: Gua Guo Ref to https://docs.python.org/3/whatsnew/3.12.html A backslash-character pair that is not a valid escape sequence now generate= s Cc: Chasel Chiu Cc: Nate DeSimone Cc: Duggapu Chinni B Cc: Star Zeng Cc: Ted Kuo Cc: Ashraf Ali S Cc: Susovan Mohapatra Signed-off-by: Gua Guo --- IntelFsp2Pkg/Tools/PatchFv.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/IntelFsp2Pkg/Tools/PatchFv.py b/IntelFsp2Pkg/Tools/PatchFv.py = index 73ab877c71..bd9aa71e3c 100644 --- a/IntelFsp2Pkg/Tools/PatchFv.py +++ b/IntelFsp2Pkg/Tools/PatchFv.py @@ -143,7 +143,7 @@ class Symbols: fdIn.close() fvInfo['Base'] =3D 0 for rptLine in r= ptLines:- match =3D re.match("^EFI_BASE_ADDRESS\s*=3D\s*(0x[a-fA= -F0-9]+)", rptLine)+ match =3D re.match(r"^EFI_BASE_ADDRESS\s*= =3D\s*(0x[a-fA-F0-9]+)", rptLine) if match: fvI= nfo['Base'] =3D int(match.group(1), 16) break@@ -312,7 +312= ,7 @@ class Symbols: self.fdBase =3D 0xFFFFFFFF while (rptLine !=3D "" ): = #EFI_BASE_ADDRESS =3D 0xFFFDF400- match =3D re.match("^EF= I_BASE_ADDRESS\s*=3D\s*(0x[a-fA-F0-9]+)", rptLine)+ match =3D re= .match(r"^EFI_BASE_ADDRESS\s*=3D\s*(0x[a-fA-F0-9]+)", rptLine) = if match is not None: self.fdBase =3D int(match.group(1), 1= 6) - fvOffset break@@ -340,7 +340,7 @@ class Symbols: fdIn =3D open(fvTxtFile, "r") rptLine =3D fdIn.readli= ne() while (rptLine !=3D "" ):- match =3D re.match("(0x[= a-fA-F0-9]+)\s([0-9a-fA-F\-]+)", rptLine)+ match =3D re.match(r"= (0x[a-fA-F0-9]+)\s([0-9a-fA-F\-]+)", rptLine) if match is not N= one: if match.group(2) in self.dictFfsOffset: = self.dictFfsOffset[fvName + ':' + match.group(2)] =3D "0x%08X" % (in= t(match.group(1), 16) + fvOffset)@@ -374,10 +374,10 @@ class Symbols: while (rptLine !=3D "" ): if rptLine[0] !=3D ' ': = #DxeIpl (Fixed Flash Address, BaseAddress=3D0x00fffb4310, Entry= Point=3D0x00fffb4958,Type=3DPE)- match =3D re.match("([_a-zA= -Z0-9\-]+)\s\(.+BaseAddress=3D(0x[0-9a-fA-F]+),\s+EntryPoint=3D(0x[0-9a-fA-= F]+),\s*Type=3D\w+\)", rptLine)+ match =3D re.match(r"([_a-z= A-Z0-9\-]+)\s\(.+BaseAddress=3D(0x[0-9a-fA-F]+),\s+EntryPoint=3D(0x[0-9a-fA= -F]+),\s*Type=3D\w+\)", rptLine) if match is None: = #DxeIpl (Fixed Flash Address, BaseAddress=3D0x00fffb4310, Entry= Point=3D0x00fffb4958)- match =3D re.match("([_a-zA-Z0-9\= -]+)\s\(.+BaseAddress=3D(0x[0-9a-fA-F]+),\s+EntryPoint=3D(0x[0-9a-fA-F]+)\)= ", rptLine)+ match =3D re.match(r"([_a-zA-Z0-9\-]+)\s\(.= +BaseAddress=3D(0x[0-9a-fA-F]+),\s+EntryPoint=3D(0x[0-9a-fA-F]+)\)", rptLin= e) if match is not None: foundModHdr = =3D True modName =3D match.group(1)@@ -386,7 +386,7 @@ = class Symbols: self.dictModBase['%s:BASE' % modName] =3D int (match.= group(2), 16) self.dictModBase['%s:ENTRY' % modName] = =3D int (match.group(3), 16) #(GUID=3D86D70125-BAA3-4296-A6= 2F-602BEBBB9081 .textbaseaddress=3D0x00fffb4398 .databaseaddress=3D0x00fffb= 4178)- match =3D re.match("\(GUID=3D([A-Z0-9\-]+)\s+\.textba= seaddress=3D(0x[0-9a-fA-F]+)\s+\.databaseaddress=3D(0x[0-9a-fA-F]+)\)", rpt= Line)+ match =3D re.match(r"\(GUID=3D([A-Z0-9\-]+)\s+\.textb= aseaddress=3D(0x[0-9a-fA-F]+)\s+\.databaseaddress=3D(0x[0-9a-fA-F]+)\)", rp= tLine) if match is not None: if foundMo= dHdr: foundModHdr =3D False@@ -399,7 +399,7 @@ clas= s Symbols: else: # 0x00fff8016c __ModuleEntryPoint = foundModHdr =3D False- match =3D re.match("^\= s+(0x[a-z0-9]+)\s+([_a-zA-Z0-9]+)", rptLine)+ match =3D re.m= atch(r"^\s+(0x[a-z0-9]+)\s+([_a-zA-Z0-9]+)", rptLine) if ma= tch is not None: self.dictSymbolAddress["%s:%s"%(modNam= e, match.group(2))] =3D match.group(1) rptLine =3D fdIn.readli= ne()@@ -432,14 +432,14 @@ class Symbols: if reportLine.strip().find("Archive member included") !=3D -1: = #GCC # 0x0000000000001d55 = IoRead8- patchMapFileMatchString =3D "\s+(0x[0-9a-fA-F]{16})\s= +([^\s][^0x][_a-zA-Z0-9\-]+)\s"+ patchMapFileMatchString =3D r"\= s+(0x[0-9a-fA-F]{16})\s+([^\s][^0x][_a-zA-Z0-9\-]+)\s" matchKey= GroupIndex =3D 2 matchSymbolGroupIndex =3D 1 prefi= x =3D '_' else: #MSFT #0003:00000190 = _gComBase 00007a50 SerialPo- patchMapFileMa= tchString =3D "^\s[0-9a-fA-F]{4}:[0-9a-fA-F]{8}\s+(\w+)\s+([0-9a-fA-F]{8,1= 6}\s+)"+ patchMapFileMatchString =3D r"^\s[0-9a-fA-F]{4}:[0-9a-= fA-F]{8}\s+(\w+)\s+([0-9a-fA-F]{8,16}\s+)" matchKeyGroupIndex = =3D 1 matchSymbolGroupIndex =3D 2 prefix =3D ''@@ = -458,11 +458,11 @@ class Symbols: if handleNext: handleNext =3D False = pcdName =3D match.group(1)- match = =3D re.match("\s+(0x[0-9a-fA-F]{16})\s+", reportLine)+ m= atch =3D re.match(r"\s+(0x[0-9a-fA-F]{16})\s+", reportLine) = if match is not None: modSymbols[prefix + pc= dName] =3D match.group(1) else:- match = =3D re.match("^\s\.data\.(_gPcd_BinaryPatch[_a-zA-Z0-9\-]+)", reportLine)+ = match =3D re.match(r"^\s\.data\.(_gPcd_BinaryPatch[_a-zA= -Z0-9\-]+)", reportLine) if match is not None: = handleNext =3D True continue@@ -507= ,7 +507,7 @@ class Symbols: fdIn =3D open(xrefFile, "r") rptLine =3D fdIn.readlin= e() while (rptLine !=3D "" ):- match =3D re.match("([0-9= a-fA-F\-]+)\s([_a-zA-Z0-9]+)", rptLine)+ match =3D re.match(r"([= 0-9a-fA-F\-]+)\s([_a-zA-Z0-9]+)", rptLine) if match is not None= : self.dictGuidNameXref[match.group(1).upper()] =3D match.g= roup(2) rptLine =3D fdIn.readline()--=20 2.39.2.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 (#118067): https://edk2.groups.io/g/devel/message/118067 Mute This Topic: https://groups.io/mt/105662401/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-