From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mx.groups.io with SMTP id smtpd.web09.18555.1605667279777765052 for ; Tue, 17 Nov 2020 18:41:19 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=EqZqwMOw; spf=pass (domain: intel.com, ip: 192.55.52.120, mailfrom: bob.c.feng@intel.com) IronPort-SDR: C5BTuXlsfAHSICJqvxe8UNyA5i2bOri459kBdGNbJFxcNUWTYLhJjhn3MBjhkXPgjUhz9d9YgR h2YhQQ8kzHbQ== X-IronPort-AV: E=McAfee;i="6000,8403,9808"; a="168481993" X-IronPort-AV: E=Sophos;i="5.77,486,1596524400"; d="scan'208";a="168481993" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Nov 2020 18:41:19 -0800 IronPort-SDR: GFEaLHPElql8C870GhaWVtAydQY4emrTj11XnThaaPO8STl9FfD7OuA62GYoCOFsi6FyydfJ1I G3QqvQrb1kzQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,486,1596524400"; d="scan'208";a="310421162" Received: from fmsmsx606.amr.corp.intel.com ([10.18.126.86]) by fmsmga008.fm.intel.com with ESMTP; 17 Nov 2020 18:41:19 -0800 Received: from fmsmsx611.amr.corp.intel.com (10.18.126.91) by fmsmsx606.amr.corp.intel.com (10.18.126.86) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Tue, 17 Nov 2020 18:41:18 -0800 Received: from fmsmsx601.amr.corp.intel.com (10.18.126.81) by fmsmsx611.amr.corp.intel.com (10.18.126.91) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Tue, 17 Nov 2020 18:41:17 -0800 Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) 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 via Frontend Transport; Tue, 17 Nov 2020 18:41:17 -0800 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (104.47.58.108) 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; Tue, 17 Nov 2020 18:41:17 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MUyX9TGY2ktw9ihniWqw72GR1z5Q/vIolVVzIkBdKH1M1LYpY23CJzOYLepotrlCdVmlqk8gg4tr6J5QaMycaFJr7jKtXw1+SFLXOiJBL9J82W99/y/b5Ji5W/WSXrDPVmX64gq9vJKncwkc2NHxUc8X+yNOaIXwalejatlN773oW5rPQRH41T2GEia4jwBSEtsAPYHUIWVgjQnAxy1nQinvOb6xriRLShfZChG5sZmQ2fNK4NJgIDAQaCTbjP72L2760Kjb1LVtyddbtHOKlReKC4qj6zI6I08IzVIMH0wuxCA/IL4ufMMfFx3orgCWylL+Zv6DZxrRn5CChAv44Q== 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=DKpYTGB0lICfu+CH5ieOypdf5vZvgFl1y6C1s9areXo=; b=LFl2AesjU9mtxxz2gexUc/4gnHkTANrEtXW5xx8aPOeynxPftG+R18qnh53i1oSUxxX1wSgPUqcLJcJ63TPpfURnHHHyH6NHDPrJnnP12JskKqqapF5NHDiARNYRNUp6oKoNIr8tqki7B2nZmLn+PTVYA6YkSpDWZ70mFHx7ihsRqyFgv0ikfZno5WOM9c6bucKbpvDzhb4nSbmwLbZ2SBVJ2hMY7d4xbsBsWXXJW+9judZrsdGwwfrEioMIYFRB8IKptimJ0xsj75FDNeuwHS4JawASVFwYkeysQlJb8EBpuM0WM6Wu3ZXOg3yClXnW0heLH6e9DURBK68Cm6x9hg== 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=DKpYTGB0lICfu+CH5ieOypdf5vZvgFl1y6C1s9areXo=; b=EqZqwMOwwfbUEuw7cnHsvn5AwnJnOqvxfIh+GuHWJqg8JGVwJka/ScSvsmLfF/swhCVr4T6spmho2oUqYuCHgxa4A5J0Bor802astLWw9oRk9sd5T3TP9SY3PQZNwNxBccMkTq+inawNP+BGb0Z4prHN4d/b7nNc+dANTL/GURs= Received: from DM6PR11MB4073.namprd11.prod.outlook.com (2603:10b6:5:19f::22) by DM6PR11MB2538.namprd11.prod.outlook.com (2603:10b6:5:be::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3541.21; Wed, 18 Nov 2020 02:41:14 +0000 Received: from DM6PR11MB4073.namprd11.prod.outlook.com ([fe80::c9f:47ea:6321:5ccb]) by DM6PR11MB4073.namprd11.prod.outlook.com ([fe80::c9f:47ea:6321:5ccb%3]) with mapi id 15.20.3589.020; Wed, 18 Nov 2020 02:41:14 +0000 From: "Bob Feng" To: "Zeng, Star" , "devel@edk2.groups.io" CC: "Chiu, Chasel" , "Desimone, Nathaniel L" , Yunhua Feng , "Liu, Zhiguang" Subject: Re: [edk2-devel] [Patch V2] IntelFsp2Pkg/Tools: Fixed PatchFv.py to parse new Fv map file format Thread-Topic: [edk2-devel] [Patch V2] IntelFsp2Pkg/Tools: Fixed PatchFv.py to parse new Fv map file format Thread-Index: AQHWu7+kteKbriiRWUGlNqPwyePLU6nNLBVAgAACrJA= Date: Wed, 18 Nov 2020 02:41:14 +0000 Message-ID: References: <20201116022422.1597-1-bob.c.feng@intel.com> In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-originating-ip: [192.102.204.36] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: c32bb17f-1ec9-4a85-232d-08d88b6b6af6 x-ms-traffictypediagnostic: DM6PR11MB2538: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:605; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: H5ZoF6X+6RrU4R3E0VykHnucyZEUlZzJnScGyd+QMplW5QvbKiBAG50VHJcRbBTyaMdmKkPAJnYhHTGmP+W3M9Q5VZ5KIxchm5ct5ekOq7OkOPLgkyCGZwxqaLC/6XUyAj4uwmCkdFBVRkYQRH7J8Mehe9N/aqUPf0YisYrcoAKZnUXH2izf0yLkoFX8ZJ8ctY6NWd3I2BD6/YRLLFk6oXKAXEgPjE44t3QO6SNIqY1ycYnARAl1lEzCNjeTAChAJmvP0KVYGKNZeKEZBjhe4+b0vMsjePlOOPomWx7J7ZwyuLSZdX8EhVlGV+f+a9Ys0MqRovOaOKtJHfQw6u0k5NUwx5hljayjgsizsWa4AWgZJsF6sxsnIZew57ZgG5ueSpqoUXjx9ExdYphEqKHU5g== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR11MB4073.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(376002)(346002)(396003)(136003)(39850400004)(366004)(86362001)(64756008)(8936002)(186003)(6506007)(53546011)(66446008)(478600001)(55016002)(66556008)(66476007)(76116006)(2906002)(966005)(110136005)(54906003)(66946007)(33656002)(52536014)(83380400001)(316002)(7696005)(4326008)(19627235002)(8676002)(71200400001)(107886003)(26005)(5660300002)(9686003);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: z4DErDlXlWkgFlpgdI4N29b8qf/KBXZoQEr/X05W4k3Tinuv8OSZZTIMbBSfFAYYFYr1uneaS/VKUklOsWL+h9P6c2zSILlRDiWAjNsQfrxVsO/oZLxv5LQROyae1d9KZDEFvqvglK6FU+aDfgii0B8K+R8wl7bWtYlkNjZa94v1xdojcT2ijjpotH+8LozZtQQoGQMdbB9AZkGJwXl8nR/di0vZ1CCvEutUail/ckDQqZ5KtbNRiuSkslcgLDgLEE1pBsBZ4w/T1Wg4Nm7RRSqW6GqoB5NX6L9cfVyC32ORnRgLOYwBtgDfchLQFQzJuA9JhPY+QjkDqP5c4HITkmRsRWV/mU/CsocCHzs2aW06YGuu7mTJa81yVmtNXzs9sZX0Xs8D0NoiIKQZb5n95/HFhAQ6zJE8jVcMiDv/D1QynPF4yfjztXgFfC2NkFL+kKFS3eoyLtsTWRpysOkmH2k2boNBEGDOSa3cOK4xyLCYg2bH1f+0nDyU/hKESEAiFiQspVCZZWUp/YLb79gw24eVIA+jZa55VJT1Qnqj2YFwL8A/OHMkrOlve8lvtcpIZYMIkU0CXWwbHUoTzCRBHzrWRjdDaMiqIC2HLqas6ho2KSnlQMnd5kVpDz8lurJTcvJCd7y8btrmS5o2NU48yuSAg2Jtvf5hKfjRK0lQ0pzs4j8fMnAIm6dNbEULPkttTEo0xqbpJuEDN1iz20Mox/wlAyPVRVB7+82fGZwgvPkJ5EeOhDFXd11BdCtinpJz+FdbPSrx3tMsXKqHv72LMdAe/1ZdIOBnSZQ+lm+BRzJvljO8psorPRUDxTj4u4PF4X9qc6jveCxJx+zj3a9N0do/t9mG/SDysAJXEyIRsAOLXK+B5ynjVuocA/+9/sOoVWXutD0DZduWX6UKM4rpaA== MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM6PR11MB4073.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c32bb17f-1ec9-4a85-232d-08d88b6b6af6 X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Nov 2020 02:41:14.0834 (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: UagD1fNcmj1ZNjr9qiIe6lOge/5PNLKc71GONSbTMebKfx5SEY8iLzsM5Tfvv3/2dNVe2MkjnU+efT7i60WVjw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB2538 Return-Path: bob.c.feng@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Star,=20 Thanks for review. This patch try to match the new .map file format, if not= match, it will try to match the old format and then do the original logic.= I think it would be better not changing the original logic in this patch. Thanks, Bob -----Original Message----- From: Zeng, Star =20 Sent: Wednesday, November 18, 2020 10:24 AM To: devel@edk2.groups.io; Feng, Bob C Cc: Chiu, Chasel ; Desimone, Nathaniel L ; Yunhua Feng ; Liu, Zhigua= ng ; Zeng, Star Subject: RE: [edk2-devel] [Patch V2] IntelFsp2Pkg/Tools: Fixed PatchFv.py t= o parse new Fv map file format Reviewed-by: Star Zeng with a very minor comment inli= ne. > -----Original Message----- > From: devel@edk2.groups.io On Behalf Of Bob=20 > Feng > Sent: Monday, November 16, 2020 10:24 AM > To: devel@edk2.groups.io > Cc: Chiu, Chasel ; Desimone, Nathaniel L=20 > ; Zeng, Star ;=20 > Yunhua Feng ; Liu, Zhiguang=20 > > Subject: [edk2-devel] [Patch V2] IntelFsp2Pkg/Tools: Fixed PatchFv.py=20 > to parse new Fv map file format >=20 > The commit 76e8aac158b0717fa27f12e4d008f79161ddb050 changed Fv map=20 > format. > It added the image type to better support source level debug. But it=20 > broke the function of PatchFv.py because PatchFv.py also consume Fv map f= ile. >=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 > --- >=20 > V2: Support both the old Fv map file format and new Fv map file format. >=20 >=20 > IntelFsp2Pkg/Tools/PatchFv.py | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) >=20 > diff --git a/IntelFsp2Pkg/Tools/PatchFv.py=20 > b/IntelFsp2Pkg/Tools/PatchFv.py index 0c8d908063..112de4077a 100644 > --- a/IntelFsp2Pkg/Tools/PatchFv.py > +++ b/IntelFsp2Pkg/Tools/PatchFv.py > @@ -359,20 +359,23 @@ class Symbols: > rptLine =3D fdIn.readline() >=20 > modName =3D "" >=20 > foundModHdr =3D False >=20 > while (rptLine !=3D "" ): >=20 > if rptLine[0] !=3D ' ': >=20 > - #DxeIpl (Fixed Flash Address, BaseAddress=3D0x00fffb4310= , > EntryPoint=3D0x00fffb4958) >=20 > - #(GUID=3D86D70125-BAA3-4296-A62F- > 602BEBBB9081 .textbaseaddress=3D0x00fffb4398 .databaseaddress=3D0x00fffb4= 1 > 78) >=20 > - 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) >=20 > + #DxeIpl (Fixed Flash Address,=20 > + BaseAddress=3D0x00fffb4310, > EntryPoint=3D0x00fffb4958,Type=3DPE) >=20 > + match =3D=20 > + 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) >=20 > + if match is None: >=20 > + #DxeIpl (Fixed Flash Address,=20 > + BaseAddress=3D0x00fffb4310, > EntryPoint=3D0x00fffb4958) >=20 > + match =3D=20 > + re.match("([_a-zA-Z0-9\-]+)\s\(.+BaseAddress=3D(0x[0-9a- > fA-F]+),\s+EntryPoint=3D(0x[0-9a-fA-F]+)\)", rptLine) >=20 > if match is not None: Could here use 'else' ? Thanks, Star >=20 > foundModHdr =3D True >=20 > modName =3D match.group(1) >=20 > if len(modName) =3D=3D 36: >=20 > modName =3D=20 > self.dictGuidNameXref[modName.upper()] >=20 > self.dictModBase['%s:BASE' % modName] =3D int=20 > (match.group(2), > 16) >=20 > self.dictModBase['%s:ENTRY' % modName] =3D int=20 > (match.group(3), > 16) >=20 > + #(GUID=3D86D70125-BAA3-4296-A62F- > 602BEBBB9081 .textbaseaddress=3D0x00fffb4398 .databaseaddress=3D0x00fffb4= 1 > 78) >=20 > match =3D re.match("\(GUID=3D([A-Z0-9\- > ]+)\s+\.textbaseaddress=3D(0x[0-9a-fA-F]+)\s+\.databaseaddress=3D(0x[0-9a= - > fA- > F]+)\)", rptLine) >=20 > if match is not None: >=20 > if foundModHdr: >=20 > foundModHdr =3D False >=20 > else: >=20 > -- > 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 (#67597):=20 > https://edk2.groups.io/g/devel/message/67597 > Mute This Topic: https://groups.io/mt/78284512/1779220 > Group Owner: devel+owner@edk2.groups.io > Unsubscribe: https://edk2.groups.io/g/devel/unsub=20 > [star.zeng@intel.com] -=3D-=3D-=3D-=3D-=3D-=3D >=20