From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mx.groups.io with SMTP id smtpd.web09.15026.1605407392923017747 for ; Sat, 14 Nov 2020 18:29:52 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=p7YSJzJy; spf=pass (domain: intel.com, ip: 192.55.52.93, mailfrom: nathaniel.l.desimone@intel.com) IronPort-SDR: clhfJ+XRVhgomB67OFD8fueOfWeuWRgo5wUSsTLdk+LAMSfdOq76++nBgwxFNtZjnvFnOS5ebD NJzF8aD3KTNA== X-IronPort-AV: E=McAfee;i="6000,8403,9805"; a="167104329" X-IronPort-AV: E=Sophos;i="5.77,479,1596524400"; d="scan'208";a="167104329" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Nov 2020 18:29:44 -0800 IronPort-SDR: Oks5PafSLSoB9Hdwk81zLT5AuWZbAypR5CJrDXM8D8eCzESn83ZaHTjg5ZuIXPimxl7xGjOyIE ZJXgKEi3VK3Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,479,1596524400"; d="scan'208";a="531467023" Received: from orsmsx602.amr.corp.intel.com ([10.22.229.15]) by fmsmga006.fm.intel.com with ESMTP; 14 Nov 2020 18:29:42 -0800 Received: from orsmsx605.amr.corp.intel.com (10.22.229.18) by ORSMSX602.amr.corp.intel.com (10.22.229.15) 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:41 -0800 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx605.amr.corp.intel.com (10.22.229.18) 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:41 -0800 Received: from NAM02-BL2-obe.outbound.protection.outlook.com (104.47.38.51) by edgegateway.intel.com (134.134.137.100) 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:41 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CCe3eTs7qN8V03PkVrFXqgPjl3vvnWsDIJLKlWI1c40jbGVbAI14GQlhino4UrXQAu+E87EUOw1T2ZU1x/sP/6fTkK1LuoVFSeOiS3Fgw7UQ+l6lkMkbQsH/a2uMrjbuEDuUrzkybq4skwnFR3lGIG1XqqZbGt6kQkVUZXCmXsJXSHIOjwmNq73WHUF/0fsuZs1sNsnFkc8bM24cq5W13t4clJ4Ly7O3j/fE1jeLkbH5DWHd/0/c1sACHngcfAWTWLXgU5ydidW5yfXujJ6348ZjK/bZQxrLSQI9x3/aIXVo7CIr5d7bNiyYkAPo+kD48iCmOMAnfNZI6cLc+H1+0g== 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=NU3qokThUNzmR9msNxhT3xRCdADKDcU1RFODEvpL8Bqx2lOSiB0xBQAEtBSfEgxGY666B139q4+u04/dNCyNPaUqh1Gx5hlnvVmGMgnKyKZoi8drQMAKYmLtZieWZDX79geA5zOYWnLloD68HI05G+yC7NPsWOBvAJXkFxQFqx9Bx3UriVNeLdG2krBXONQ0aOX8bsN5BFO8ZvbXUsY9nMPgMG5mkYzVxEvlOwHZqRbKhsWToBGv8Iond1tgqm2danlevEHevlQxn2IPjU6KPi4+3ySciEB6eSOwOBwvK130RhrB2buL7KHg6ZHCGS5uSL3TNq4QvRpqdMvxxCT+rQ== 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=p7YSJzJy4diOUHcN+X9rw/cqLIORrnf9w09r5qn3ujD9Xzo1Z547gEOSe65Uw4EU/Fu8lRmOX6FVqEnKNXHv44k4j6gNg2mzScMh/UqpNmzQ9jcG4XM2ypcGeRoEfy+iyYdCeb7TimQELwYs4M4dXzBk/2ZcYclVP/JIq3olwFY= 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:40 +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:40 +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:39 +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: 6e9e813c-ace8-43f6-26ef-08d8890e4dd7 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: ydSdB7hkacM+SWJ0BoqnNkZC+8Gt0ZDAZjpwvfwDrrhLJ+wXkAmrsJ5IWq0k8ZxqrYxXpKBODN+79pAKhmhXM5RUOh+H3Ra5TYoM+A1fiZ8xeyMAe+6ftZXvfGWJRcYdnm54/AqL6zSOtNjhwp3j7QkWMslyO1nITnEoMmAoyex2CMbcIzckyv87v3XwHyJPUT3Zwegi6NNBiwwkB3pLvpPz3J5uuOZuBnM1u7AvrTj+eUJykOKKms6Bllj6SlmN9xk6tqVl3Cbx+uzqPTxtAhrCfLyptsNNvhJitQyUSPaw8zNXITe0M5H77fVsHblr+sHMfBT/lu+5A1NkgRIyuvLYrgDzUjgkbWOob+lfZ0v3z25HlI6EYyFHPXx1LPH2/i0SEo2DDxw6VQmPkQLOMA== 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: jqsEfPhimdy8Y5pasLpiA9croENUZt4eo6DeFcYEwPKrBaO4zhWlb/2B6g+93pKu0VKXllMWt0xTrx/A66IoeFuDMVoUkfdhoYVopG2LOXrqagTlI2B04xeDJxGQQJeYT1iiDf02EHm8nMID9Sljln51lRdqZ/OCjarfdi6wQuxj+rJCCMdTYZwTKohh0xSfrNvNzXUnveKmWVXThM/SmDUG3E++KEADrXwaN3MEfWucjqbjxHGsGGRIFIRilQ/+duBBQeyi/ZrllY7YKYqVubOFR4RmucmssHa7kd4+zNdYqY6kAheisUEPNiIFhuRGXRl95TcjnX1sHy4WKr+WNVlcvztXOKJ3FXtMZCg9coniOcCfsAoRqqk4FoKswPO6eeiWJ3eHfDzcBFOeA/ON5c6HGn3MFCHyqM16iDcL/6+D/gDumUzE/iGUJ87Tg3yEw75+4csRtAKjVystklcvSx1cvgu5BEJZe2goEyf6kCTZQxY1VHnZLOC8jizaBS7RiZQmCpagt/7Lxipd8JKDBslAeO7rWdQce4TJvUIOGATXlccDClLrusNdPv6wLzyGu6euUZg/SYVH+maxuTcchPr0n7Fz9ZiLTxGqodVMWE49XFL3+eFwxrDzcGtzfpqBXdV6sUtijNfXZ/FSz1aic0CpczLpmopoz2ed/tnxF4inkiybr2Rd1y6ko3ecbQ7dGqDCtvshoGO7y0a1Joy/bZBrCZHOYkIgC7cKplUBw2XLgCynOZhyC4mhBK3hh/elpjuVJ+dt0UgJ4BEVHB2yx1COrIDaZQeRG63pjVUhQTn/55C58a+7zaCaoGdbP/kj8+X6IMmxwlMy2ojwByj6rK5y5ZNzKm3vp9MAZVZL880S5XWOtGZnYXsqw1HmICUBjHVOiIePEq0grVsHfrLlKQ== 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: 6e9e813c-ace8-43f6-26ef-08d8890e4dd7 X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Nov 2020 02:29:39.8809 (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: Aa/JDlmLurTQFDchlU/42JPEyuNLZvyEsEVaRcePCYYj+UKGxR/P98eVX+Ld1WP76aVXZn19RMYmJH7dhgltLFq9qVg4qg77CPuou5KEsHM= 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