From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.byosoft.com.cn (mail.byosoft.com.cn [58.240.74.242]) by mx.groups.io with SMTP id smtpd.web11.20470.1605677705271337125 for ; Tue, 17 Nov 2020 21:35:06 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: byosoft.com.cn, ip: 58.240.74.242, mailfrom: gaoliming@byosoft.com.cn) Received: from DESKTOPS6D0PVI ([58.246.60.130]) (envelope-sender ) by 192.168.6.13 with ESMTP for ; Wed, 18 Nov 2020 13:34:59 +0800 X-WM-Sender: gaoliming@byosoft.com.cn X-WM-AuthFlag: YES X-WM-AuthUser: gaoliming@byosoft.com.cn From: "gaoliming" To: , , "'Feng, Bob C'" Cc: "'Chiu, Chasel'" , "'Desimone, Nathaniel L'" , "'Yunhua Feng'" , "'Liu, Zhiguang'" References: <20201116022422.1597-1-bob.c.feng@intel.com> In-Reply-To: Subject: =?UTF-8?B?5Zue5aSNOiBbZWRrMi1kZXZlbF0gW1BhdGNoIFYyXSBJbnRlbEZzcDJQa2cvVG9vbHM6IEZpeGVkIFBhdGNoRnYucHkgdG8gcGFyc2UgbmV3IEZ2IG1hcCBmaWxlIGZvcm1hdA==?= Date: Wed, 18 Nov 2020 13:35:00 +0800 Message-ID: <00dc01d6bd6c$8f37e150$ada7a3f0$@byosoft.com.cn> MIME-Version: 1.0 X-Mailer: Microsoft Outlook 16.0 Thread-Index: AQDDCXaEY9r+X0QqLl1e0PMlnWPdCgE+vbKDAcnR2H0Be9Ulx6vQorgw Content-Type: text/plain; charset="gb2312" Content-Transfer-Encoding: quoted-printable Content-Language: zh-cn Bob: Thanks for your fix. This is a regression bug. I request to merge it for this stable tag. Reviewed-by: Liming Gao Thanks Liming > -----=D3=CA=BC=FE=D4=AD=BC=FE----- > =B7=A2=BC=FE=C8=CB: bounce+27952+67670+4905953+8761045@groups.io > =B4=FA=B1=ED Zeng, Star > =B7=A2=CB=CD=CA=B1=BC=E4: 2020=C4=EA11=D4=C218=C8=D5 11:48 > =CA=D5=BC=FE=C8=CB: Feng, Bob C ; devel@edk2.group= s.io > =B3=AD=CB=CD: Chiu, Chasel ; Desimone, Nathaniel = L > ; Yunhua Feng > ; Liu, Zhiguang ; > Zeng, Star > =D6=F7=CC=E2: Re: [edk2-devel] [Patch V2] IntelFsp2Pkg/Tools: Fixed Patc= hFv.py to > parse new Fv map file format >=20 > Oh, get the point. >=20 > -----Original Message----- > From: Feng, Bob C > Sent: Wednesday, November 18, 2020 10:41 AM > 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.p= y to > parse new Fv map file format >=20 > 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 logi= c. I think > it would be better not changing the original logic in this patch. >=20 > Thanks, > Bob >=20 > -----Original Message----- > From: Zeng, Star > 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, Zhiguang ; > Zeng, Star > Subject: RE: [edk2-devel] [Patch V2] IntelFsp2Pkg/Tools: Fixed PatchFv.p= y to > parse new Fv map file format >=20 > Reviewed-by: Star Zeng with a very minor comment > inline. >=20 > > -----Original Message----- > > From: devel@edk2.groups.io On Behalf Of Bob > > Feng > > Sent: Monday, November 16, 2020 10:24 AM > > To: devel@edk2.groups.io > > Cc: Chiu, Chasel ; Desimone, Nathaniel L > > ; Zeng, Star ; > > Yunhua Feng ; Liu, Zhiguang > > > > Subject: [edk2-devel] [Patch V2] IntelFsp2Pkg/Tools: Fixed PatchFv.py > > to parse new Fv map file format > > > > The commit 76e8aac158b0717fa27f12e4d008f79161ddb050 changed Fv > map > > format. > > It added the image type to better support source level debug. But it > > broke the function of PatchFv.py because PatchFv.py also consume Fv ma= p > file. > > > > This patch is to update PatchFv.py to make it work again. > > > > Signed-off-by: Bob Feng > > Cc: Chasel Chiu > > Cc: Nate DeSimone > > Cc: Star Zeng > > Cc: Yunhua Feng > > Cc: Zhiguang Liu > > --- > > > > V2: Support both the old Fv map file format and new Fv map file format= . > > > > > > IntelFsp2Pkg/Tools/PatchFv.py | 9 ++++++--- > > 1 file changed, 6 insertions(+), 3 deletions(-) > > > > diff --git a/IntelFsp2Pkg/Tools/PatchFv.py > > 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() > > > > modName =3D "" > > > > foundModHdr =3D False > > > > while (rptLine !=3D "" ): > > > > if rptLine[0] !=3D ' ': > > > > - #DxeIpl (Fixed Flash Address, > BaseAddress=3D0x00fffb4310, > > EntryPoint=3D0x00fffb4958) > > > > - #(GUID=3D86D70125-BAA3-4296-A62F- > > > 602BEBBB9081 .textbaseaddress=3D0x00fffb4398 .databaseaddress=3D0x00fffb= 41 > > 78) > > > > - 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) > > > > + #DxeIpl (Fixed Flash Address, > > + BaseAddress=3D0x00fffb4310, > > EntryPoint=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) > > > > + if match is None: > > > > + #DxeIpl (Fixed Flash Address, > > + BaseAddress=3D0x00fffb4310, > > EntryPoint=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) > > > > if match is not None: >=20 > Could here use 'else' ? >=20 > Thanks, > Star >=20 > > > > foundModHdr =3D True > > > > modName =3D match.group(1) > > > > if len(modName) =3D=3D 36: > > > > modName =3D > > self.dictGuidNameXref[modName.upper()] > > > > 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-A62F- > > > 602BEBBB9081 .textbaseaddress=3D0x00fffb4398 .databaseaddress=3D0x00fffb= 41 > > 78) > > > > 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) > > > > if match is not None: > > > > if foundModHdr: > > > > foundModHdr =3D False > > > > else: > > > > -- > > 2.29.1.windows.1 > > > > > > > > -=3D-=3D-=3D-=3D-=3D-=3D > > Groups.io Links: You receive all messages sent to this group. > > View/Reply Online (#67597): > > 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 > > [star.zeng@intel.com] -=3D-=3D-=3D-=3D-=3D-=3D > > >=20 >=20 >=20 >=20 >=20