* [PATCH 0/2] Add image type information into map file @ 2020-10-28 5:13 fengyunhua 2020-10-28 5:13 ` [PATCH 1/2] BaseTools: Add image type into generate " fengyunhua 2020-10-28 5:13 ` [PATCH 2/2] BaseTools: update report map file format fengyunhua 0 siblings, 2 replies; 5+ messages in thread From: fengyunhua @ 2020-10-28 5:13 UTC (permalink / raw) To: devel REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2977 1, Add image type information into map file 2, Update report map file information Yunhua Feng (2): BaseTools: Add image type into generate map file BaseTools: update report map file format BaseTools/Source/C/GenFv/GenFvInternalLib.c | 7 ++++++- BaseTools/Source/Python/build/BuildReport.py | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) -- 2.27.0.windows.1 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/2] BaseTools: Add image type into generate map file 2020-10-28 5:13 [PATCH 0/2] Add image type information into map file fengyunhua @ 2020-10-28 5:13 ` fengyunhua 2020-10-28 5:13 ` [PATCH 2/2] BaseTools: update report map file format fengyunhua 1 sibling, 0 replies; 5+ messages in thread From: fengyunhua @ 2020-10-28 5:13 UTC (permalink / raw) To: devel; +Cc: Bob Feng, Liming Gao, Yuwei Chen REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2977 For a source-level BIOS debugger the .map files are quite useful with one major shortcoming: the debugger cannot know, solely from the .map file, the format (PE/COFF vs. TE) of the image included in the final BIOS ROM Cc: Bob Feng <bob.c.feng@intel.com> Cc: Liming Gao <gaoliming@byosoft.com.cn> Cc: Yuwei Chen <yuwei.chen@intel.com> Signed-off-by: Yunhua Feng <fengyunhua@byosoft.com.cn> --- BaseTools/Source/C/GenFv/GenFvInternalLib.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/BaseTools/Source/C/GenFv/GenFvInternalLib.c b/BaseTools/Source/C/GenFv/GenFvInternalLib.c index b5ffed93a9..6e296b8ad6 100644 --- a/BaseTools/Source/C/GenFv/GenFvInternalLib.c +++ b/BaseTools/Source/C/GenFv/GenFvInternalLib.c @@ -903,7 +903,12 @@ Returns: fprintf (FvMapFile, "BaseAddress=0x%010llx, ", (unsigned long long) (ImageBaseAddress + Offset)); } - fprintf (FvMapFile, "EntryPoint=0x%010llx", (unsigned long long) (ImageBaseAddress + AddressOfEntryPoint)); + fprintf (FvMapFile, "EntryPoint=0x%010llx, ", (unsigned long long) (ImageBaseAddress + AddressOfEntryPoint)); + if (!pImageContext->IsTeImage) { + fprintf (FvMapFile, "Type=PE"); + } else { + fprintf (FvMapFile, "Type=TE"); + } fprintf (FvMapFile, ")\n"); fprintf (FvMapFile, "(GUID=%s", FileGuidName); -- 2.27.0.windows.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] BaseTools: update report map file format 2020-10-28 5:13 [PATCH 0/2] Add image type information into map file fengyunhua 2020-10-28 5:13 ` [PATCH 1/2] BaseTools: Add image type into generate " fengyunhua @ 2020-10-28 5:13 ` fengyunhua 2020-10-30 2:31 ` [edk2-devel] " Zhiguang Liu 1 sibling, 1 reply; 5+ messages in thread From: fengyunhua @ 2020-10-28 5:13 UTC (permalink / raw) To: devel; +Cc: Bob Feng, Liming Gao, Yuwei Chen update report map file format Cc: Bob Feng <bob.c.feng@intel.com> Cc: Liming Gao <gaoliming@byosoft.com.cn> Cc: Yuwei Chen <yuwei.chen@intel.com> Signed-off-by: Yunhua Feng <fengyunhua@byosoft.com.cn> --- BaseTools/Source/Python/build/BuildReport.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BaseTools/Source/Python/build/BuildReport.py b/BaseTools/Source/Python/build/BuildReport.py index 8efa869162..57701ec3e3 100644 --- a/BaseTools/Source/Python/build/BuildReport.py +++ b/BaseTools/Source/Python/build/BuildReport.py @@ -60,7 +60,7 @@ gPcdGuidPattern = re.compile(r"PCD\((\w+)[.](\w+)\)") gOffsetGuidPattern = re.compile(r"(0x[0-9A-Fa-f]+) ([-A-Fa-f0-9]+)") ## Pattern to find module base address and entry point in fixed flash map file -gModulePattern = r"\n[-\w]+\s*\(([^,]+),\s*BaseAddress=%(Address)s,\s*EntryPoint=%(Address)s\)\s*\(GUID=([-0-9A-Fa-f]+)[^)]*\)" +gModulePattern = r"\n[-\w]+\s*\(([^,]+),\s*BaseAddress=%(Address)s,\s*EntryPoint=%(Address)s,\s*\w+\)\s*\(GUID=([-0-9A-Fa-f]+)[^)]*\)" gMapFileItemPattern = re.compile(gModulePattern % {"Address" : "(-?0[xX][0-9A-Fa-f]+)"}) ## Pattern to find all module referenced header files in source files -- 2.27.0.windows.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [edk2-devel] [PATCH 2/2] BaseTools: update report map file format 2020-10-28 5:13 ` [PATCH 2/2] BaseTools: update report map file format fengyunhua @ 2020-10-30 2:31 ` Zhiguang Liu 2020-10-30 3:21 ` 回复: " fengyunhua 0 siblings, 1 reply; 5+ messages in thread From: Zhiguang Liu @ 2020-10-30 2:31 UTC (permalink / raw) To: devel@edk2.groups.io, fengyunhua@byosoft.com.cn Cc: Feng, Bob C, Liming Gao, Chen, Christine Hi Yunhua, I believe you want to use r"\w+" to represent "Type=PE", but r"\w+" can only represents '[A-Za-z0-9_]'. Maybe you can use "\w+=\w+" Thanks Zhiguang > -----Original Message----- > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of > fengyunhua > Sent: Wednesday, October 28, 2020 1:13 PM > To: devel@edk2.groups.io > Cc: Feng, Bob C <bob.c.feng@intel.com>; Liming Gao > <gaoliming@byosoft.com.cn>; Chen, Christine <yuwei.chen@intel.com> > Subject: [edk2-devel] [PATCH 2/2] BaseTools: update report map file format > > update report map file format > > Cc: Bob Feng <bob.c.feng@intel.com> > Cc: Liming Gao <gaoliming@byosoft.com.cn> > Cc: Yuwei Chen <yuwei.chen@intel.com> > Signed-off-by: Yunhua Feng <fengyunhua@byosoft.com.cn> > --- > BaseTools/Source/Python/build/BuildReport.py | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/BaseTools/Source/Python/build/BuildReport.py > b/BaseTools/Source/Python/build/BuildReport.py > index 8efa869162..57701ec3e3 100644 > --- a/BaseTools/Source/Python/build/BuildReport.py > +++ b/BaseTools/Source/Python/build/BuildReport.py > @@ -60,7 +60,7 @@ gPcdGuidPattern = re.compile(r"PCD\((\w+)[.](\w+)\)") > gOffsetGuidPattern = re.compile(r"(0x[0-9A-Fa-f]+) ([-A-Fa-f0-9]+)") > > ## Pattern to find module base address and entry point in fixed flash map > file > -gModulePattern = r"\n[- > \w]+\s*\(([^,]+),\s*BaseAddress=%(Address)s,\s*EntryPoint=%(Address)s\ > )\s*\(GUID=([-0-9A-Fa-f]+)[^)]*\)" > +gModulePattern = r"\n[- > \w]+\s*\(([^,]+),\s*BaseAddress=%(Address)s,\s*EntryPoint=%(Address)s, > \s*\w+\)\s*\(GUID=([-0-9A-Fa-f]+)[^)]*\)" > gMapFileItemPattern = re.compile(gModulePattern % {"Address" : "(- > ?0[xX][0-9A-Fa-f]+)"}) > > ## Pattern to find all module referenced header files in source files > -- > 2.27.0.windows.1 > > > > > > ^ permalink raw reply [flat|nested] 5+ messages in thread
* 回复: [edk2-devel] [PATCH 2/2] BaseTools: update report map file format 2020-10-30 2:31 ` [edk2-devel] " Zhiguang Liu @ 2020-10-30 3:21 ` fengyunhua 0 siblings, 0 replies; 5+ messages in thread From: fengyunhua @ 2020-10-30 3:21 UTC (permalink / raw) To: 'Liu, Zhiguang', devel Cc: 'Feng, Bob C', 'Liming Gao', 'Chen, Christine' Hi Zhiguang, You are right, I will update the patch. Thanks Yunhua -----邮件原件----- 发件人: Liu, Zhiguang <zhiguang.liu@intel.com> 发送时间: 2020年10月30日 10:31 收件人: devel@edk2.groups.io; fengyunhua@byosoft.com.cn 抄送: Feng, Bob C <bob.c.feng@intel.com>; Liming Gao <gaoliming@byosoft.com. cn>; Chen, Christine <yuwei.chen@intel.com> 主题: RE: [edk2-devel] [PATCH 2/2] BaseTools: update report map file format Hi Yunhua, I believe you want to use r"\w+" to represent "Type=PE", but r"\w+" can only represents '[A-Za-z0-9_]'. Maybe you can use "\w+=\w+" Thanks Zhiguang > -----Original Message----- > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of > fengyunhua > Sent: Wednesday, October 28, 2020 1:13 PM > To: devel@edk2.groups.io > Cc: Feng, Bob C <bob.c.feng@intel.com>; Liming Gao > <gaoliming@byosoft.com.cn>; Chen, Christine <yuwei.chen@intel.com> > Subject: [edk2-devel] [PATCH 2/2] BaseTools: update report map file format > > update report map file format > > Cc: Bob Feng <bob.c.feng@intel.com> > Cc: Liming Gao <gaoliming@byosoft.com.cn> > Cc: Yuwei Chen <yuwei.chen@intel.com> > Signed-off-by: Yunhua Feng <fengyunhua@byosoft.com.cn> > --- > BaseTools/Source/Python/build/BuildReport.py | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/BaseTools/Source/Python/build/BuildReport.py > b/BaseTools/Source/Python/build/BuildReport.py > index 8efa869162..57701ec3e3 100644 > --- a/BaseTools/Source/Python/build/BuildReport.py > +++ b/BaseTools/Source/Python/build/BuildReport.py > @@ -60,7 +60,7 @@ gPcdGuidPattern = re.compile(r"PCD\((\w+)[.](\w+)\)") > gOffsetGuidPattern = re.compile(r"(0x[0-9A-Fa-f]+) ([-A-Fa-f0-9]+)") > > ## Pattern to find module base address and entry point in fixed flash map > file > -gModulePattern = r"\n[- > \w]+\s*\(([^,]+),\s*BaseAddress=%(Address)s,\s*EntryPoint=%(Address)s\ > )\s*\(GUID=([-0-9A-Fa-f]+)[^)]*\)" > +gModulePattern = r"\n[- > \w]+\s*\(([^,]+),\s*BaseAddress=%(Address)s,\s*EntryPoint=%(Address)s, > \s*\w+\)\s*\(GUID=([-0-9A-Fa-f]+)[^)]*\)" > gMapFileItemPattern = re.compile(gModulePattern % {"Address" : "(- > ?0[xX][0-9A-Fa-f]+)"}) > > ## Pattern to find all module referenced header files in source files > -- > 2.27.0.windows.1 > > > > > > ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-10-30 3:21 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2020-10-28 5:13 [PATCH 0/2] Add image type information into map file fengyunhua 2020-10-28 5:13 ` [PATCH 1/2] BaseTools: Add image type into generate " fengyunhua 2020-10-28 5:13 ` [PATCH 2/2] BaseTools: update report map file format fengyunhua 2020-10-30 2:31 ` [edk2-devel] " Zhiguang Liu 2020-10-30 3:21 ` 回复: " fengyunhua
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox