From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web09.15025.1605407390859507665 for ; Sat, 14 Nov 2020 18:29:51 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=HKREaJfH; spf=pass (domain: intel.com, ip: 134.134.136.24, mailfrom: nathaniel.l.desimone@intel.com) IronPort-SDR: FNJmDY5trp5cmedX0zcctM2nbK44GPTlSmH4Gg+V+NyU+nUI2OMOxejoqartwLrz4SsT/MAi4B Om5OBwANf9Ow== X-IronPort-AV: E=McAfee;i="6000,8403,9805"; a="170783756" X-IronPort-AV: E=Sophos;i="5.77,479,1596524400"; d="scan'208";a="170783756" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Nov 2020 18:29:40 -0800 IronPort-SDR: I/Hhz27Abp196EC8XznE/LinvZwAUk5gSrj+WC1PwPWQh1JNEM25Bx2azJPRJtuAGTy7B4BEzH HsxpB4XlR3qg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,479,1596524400"; d="scan'208";a="358024133" Received: from fmsmsx602.amr.corp.intel.com ([10.18.126.82]) by fmsmga004.fm.intel.com with ESMTP; 14 Nov 2020 18:29:37 -0800 Received: from fmsmsx607.amr.corp.intel.com (10.18.126.87) by fmsmsx602.amr.corp.intel.com (10.18.126.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Sat, 14 Nov 2020 18:29:36 -0800 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx607.amr.corp.intel.com (10.18.126.87) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5 via Frontend Transport; Sat, 14 Nov 2020 18:29:36 -0800 Received: from NAM02-BL2-obe.outbound.protection.outlook.com (104.47.38.58) 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.1713.5; Sat, 14 Nov 2020 18:29:36 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Im+JmgmxV4whQpVMXwk+xgKP4BPIKRsbWLK6iuaFroEVn4LKTS6JCEGXsPdG1jxYdjqO/e2ucMzY7UhiaXfIOe4dq29Q7GfaGvGU7FoR7kQW8YoXFHJ8wr/BfKoUs2ezM6xCpKmZL8GJfWhseG/Yis5sqNrErELP4XfXsxzao2lNEGGwEwhzLCuZ4iem7o1MX5QtI3IQx4gvm3hoycVo/mus2at7DxZ9zLkvjuwu80UDxaP66MmQUvZDBoQ28s1+r7CpVXCO1Lc0ZyxzRvwvMxwsZBAqN4n3LBWhuu0PT9t982gtgr1pB18+OVjVzOxuj8UYyExWXLTOB8cL3BhiEw== 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=fRHLVLo+PLPaDZRlnP4js7LPBDSL4aELuMDkm1VgUaA=; b=RHz+UEepqqRLLsCUPyI9Br2ItO7/ku0und58NGO3Muc1McnQd30hJ2kkogVYWJ/jhXO/+WmFxmNYJ8lwuj7Y/RtvpYgZnfDQiRxBjssrv454XADk5tom1XJupTkCSy8551K0dwdmBf8kZHyyG+pVsCsYJZZgU7IjtcPzqnxCrGgJgvxA8d9g0OOBpqtXTdfSMApKvizPEdEIPEV2faDOhHhOmXZqVPtxCzbLw5P+x6OnQrEbKpNdauVHwwhRkCgmt1iHssEeIb1jJ3ZDGxv9rHjK104BWlPbGvt3QZ+uyMWzgNCTdnbiphPJxBmi4WiaDh3P9kT1sXD0LeNunAc5GQ== 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=fRHLVLo+PLPaDZRlnP4js7LPBDSL4aELuMDkm1VgUaA=; b=HKREaJfH54GEevYxiTl8+C6qo/NqX+Z2cV3L9N/HCxVD4gYJzvnbm/ls7TrhdrbR+UK4yNGbH95KETJ4Wmeb+GHm2+ALajUH0LvaaHZ4FBKT3VH1Dh+9I3jjEnUjF5rA+hj90YBTH5QH+8x1Snv1Hf3FzePzQHWBWj+DyHRKN2M= Received: from MWHPR1101MB2160.namprd11.prod.outlook.com (2603:10b6:301:5b::12) by CO1PR11MB4897.namprd11.prod.outlook.com (2603:10b6:303:97::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3564.25; Sun, 15 Nov 2020 02:29:34 +0000 Received: from MWHPR1101MB2160.namprd11.prod.outlook.com ([fe80::3161:c00f:c5c5:f710]) by MWHPR1101MB2160.namprd11.prod.outlook.com ([fe80::3161:c00f:c5c5:f710%8]) with mapi id 15.20.3564.028; Sun, 15 Nov 2020 02:29:34 +0000 From: "Nate DeSimone" To: "devel@edk2.groups.io" , "Feng, Bob C" CC: "Chiu, Chasel" , "Zeng, Star" , Yunhua Feng , "Liu, Zhiguang" Subject: Re: [edk2-devel] [Patch] IntelFsp2Pkg/Tools: Fixed PatchFv.py to parse new Fv map file format Thread-Topic: [edk2-devel] [Patch] IntelFsp2Pkg/Tools: Fixed PatchFv.py to parse new Fv map file format Thread-Index: AQHWucTyS1uux5ZnGk2k8EHPot0HiqnIenHQ Date: Sun, 15 Nov 2020 02:29:33 +0000 Message-ID: References: <20201113135716.159-1-bob.c.feng@intel.com> In-Reply-To: <20201113135716.159-1-bob.c.feng@intel.com> Accept-Language: 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: [50.53.190.176] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 92a1e98b-db71-4d61-c4d6-08d8890e4a36 x-ms-traffictypediagnostic: CO1PR11MB4897: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:92; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: N+B1k3BgifpGBZIRfesgh8NmDoaP13jfHllgg8MtTIN5hQxzu3U0qJc9wdbbMaYTItjU3VBLqd9D8vCeP/qgOfr1751E7f8htUZYtLxzV7X0MV/J2EiSMzRU7V5cpEzC26J9PjQ5MDppjsuzlFO0miBVj/h0H7M9QGdMailzrUqoShymIpzC1RWGdbp0zSnzqUntnd4hFlGDe8pvzpj5/PTv3ZbNB0wIgTbTB8Q+gIQxGfzodH6EHD/2w0/4r+jKPFTybILPlhGkdVPW7GDloLkFxL6NWdHrNirgL2F+ekBZ3IzqxwE4vfbeRxk0JO/23V0kcnB3K1D7XNOGw67mz09fX4ZZdfA6G0m/ueuQpHkcjq+QSTQ1dTv6nNFTZNBCoaY9ibMHsqRMCxGbVZg2+w== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR1101MB2160.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(376002)(396003)(39860400002)(346002)(366004)(136003)(110136005)(107886003)(6636002)(54906003)(9686003)(966005)(7696005)(186003)(53546011)(26005)(6506007)(4326008)(478600001)(33656002)(55016002)(86362001)(8936002)(2906002)(316002)(19627235002)(66556008)(8676002)(66946007)(71200400001)(83380400001)(52536014)(5660300002)(64756008)(66446008)(66476007)(76116006);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: C3y6fTZg4/6AcwKsmKCAjKe/CF7M1d4wub83GuDmjN3JYdJR2n1cGJ5BLS12auNoVdoWZzfSRhgmNPTdPXFzkdxNVaiQtm7JLlEQjYRtAAv6eQuIBO1Rml61cI3qXWeqU53vyTCc0We/PA8ARv3apZC6Ir8jU2MvBLiq60gHdrpwnqq5pfFzO5lGDs5LGgkfwSPSqZnjJtSLqtS0mtr0EL+2tygfJ7526xk4HDapZIxokK2F9TIofyQRM3G/xYtGxjzsPQJ7d6gKTIZwRpKsnSNISIYOF09do2PfoaI9o/wXSqTMcWTbIbsA/9ds5wWp2hVCuRbRJB9LxwCbEsYzGPL2+b9vluSjH1MuT1vuykd/4t6qgV08i231EQEuLYBdH+XzaGR/N/dYaubHkx7shPM6Avchcjoy/6iQBdxnfmZ+xHvaW6q2c6nQcRFNT0mB7SC+TwktRql48gyeSyQLHyUD5u4KwbjXNYgfWIH7Jui34gAp4dUR30ZJs+/QxAWuWQAQ47d6ZaWfGtQ0485rThIb8TSWSGAjU6yNvyRVUqAQybO1apu5THQo9BS9DQzI3wCuErP5SlVwC/ULmsvpR6hGN3O3zcOwPymH/HIu3r86fefpbvgd6iH0O75jcDflyjZy1yDYT1TX49lomlLCHBiRJlirwq5Aj57lKwNA/HCDMzr1MnpJ975PXTQBqMPdSyFPU7LHVkjQykp7G6jqFLaWH+5ez1x39r0hZJgefZrqpK6VlsToPLrjESmF+JUSw7j4dwgRtNsW3N7DCa5el/D3D8JvKnRwjSK1n1J1unl5BMttuNeQrXcvxWr3AGo1sT4uVccqh0maId6kNLwj6sHGo7Ko/E4+H+8UGsMBwT153h1gCE5da92O5VRpWmqrX2t4UHfWS+lPF8n9I+IWuQ== MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MWHPR1101MB2160.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 92a1e98b-db71-4d61-c4d6-08d8890e4a36 X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Nov 2020 02:29:33.8047 (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: lUx8zXA5zaqZ23k3EOBoAP06EsFUeAmt2gbcbpUGSgE92XMR9m2yn6sP4qrIPtKl4lFphEaWllJzZlolJpf7rf8gBDSgruI+rbHBYkyrPic= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR11MB4897 Return-Path: nathaniel.l.desimone@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi Bob, Does it make sense to have two regular expressions, one for the new format = and one for the old format? The user might be using a .map file generated b= y an older version of BaseTools. Thanks, Nate > -----Original Message----- > From: devel@edk2.groups.io On Behalf Of Bob > Feng > Sent: Friday, November 13, 2020 5:57 AM > To: devel@edk2.groups.io > Cc: Chiu, Chasel ; Desimone, Nathaniel L > ; Zeng, Star ; > Yunhua Feng ; Liu, Zhiguang > > Subject: [edk2-devel] [Patch] IntelFsp2Pkg/Tools: Fixed PatchFv.py to par= se > new Fv map file format >=20 > The commit 76e8aac158b0717fa27f12e4d008f79161ddb050 changed Fv map > format. > It added the image type to better support source level debug. But it brok= e > the function of PatchFv.py because PatchFv.py also consume Fv map file. >=20 > This patch is to update PatchFv.py to make it work again. >=20 > Signed-off-by: Bob Feng > Cc: Chasel Chiu > Cc: Nate DeSimone > Cc: Star Zeng > Cc: Yunhua Feng > Cc: Zhiguang Liu > --- > IntelFsp2Pkg/Tools/PatchFv.py | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) >=20 > diff --git a/IntelFsp2Pkg/Tools/PatchFv.py b/IntelFsp2Pkg/Tools/PatchFv.p= y > index 0c8d908063..f4c390a17b 100644 > --- a/IntelFsp2Pkg/Tools/PatchFv.py > +++ b/IntelFsp2Pkg/Tools/PatchFv.py > @@ -361,11 +361,11 @@ class Symbols: > foundModHdr =3D False while (rptLine !=3D "" ): = if rptLine[0] !=3D ' ': > #DxeIpl (Fixed Flash Address, BaseAddress=3D0x00fffb4310, > EntryPoint=3D0x00fffb4958) #(GUID=3D86D70125-BAA3-4296-A6= 2F- > 602BEBBB9081 .textbaseaddress=3D0x00fffb4398 > .databaseaddress=3D0x00fffb4178)- 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("([_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) if match is not None: > foundModHdr =3D True modName =3D match.group(1) = if > len(modName) =3D=3D 36: modName =3D > self.dictGuidNameXref[modName.upper()]-- > 2.29.1.windows.1 >=20 >=20 >=20 > -=3D-=3D-=3D-=3D-=3D-=3D > Groups.io Links: You receive all messages sent to this group. > View/Reply Online (#67527): https://edk2.groups.io/g/devel/message/67527 > Mute This Topic: https://groups.io/mt/78229423/1767664 > Group Owner: devel+owner@edk2.groups.io > Unsubscribe: https://edk2.groups.io/g/devel/unsub > [nathaniel.l.desimone@intel.com] -=3D-=3D-=3D-=3D-=3D-=3D >=20