[edk2-devel] [Patch] BaseTools: Add "-" in a re to parse line in .map file

Bob Feng posted 1 patch 1 week ago
Failed in applying to current master (apply log)
BaseTools/Source/Python/Common/Misc.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

[edk2-devel] [Patch] BaseTools: Add "-" in a re to parse line in .map file

Posted by Bob Feng 1 week ago
https://bugzilla.tianocore.org/show_bug.cgi?id=2058

If there are multiple module instances with different
guid used in .dsc file, the temp path of the module will
contain 8-4-4-4-12 format guid string. So "-" need to be
added into the regular expression for parsing it correctly.

Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Bob Feng <bob.c.feng@intel.com>
---
 BaseTools/Source/Python/Common/Misc.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Python/Common/Misc.py
index 26d149c270..554ec010dd 100644
--- a/BaseTools/Source/Python/Common/Misc.py
+++ b/BaseTools/Source/Python/Common/Misc.py
@@ -162,11 +162,11 @@ def _parseForGCC(lines, efifilepath, varnames):
 
 def _parseGeneral(lines, efifilepath, varnames):
     status = 0    #0 - beginning of file; 1 - PE section definition; 2 - symbol table
     secs  = []    # key = section name
     varoffset = []
-    symRe = re.compile('^([\da-fA-F]+):([\da-fA-F]+) +([\.:\\\\\w\?@\$]+) +([\da-fA-F]+)', re.UNICODE)
+    symRe = re.compile('^([\da-fA-F]+):([\da-fA-F]+) +([\.:\\\\\w\?@\$-]+) +([\da-fA-F]+)', re.UNICODE)
 
     for line in lines:
         line = line.strip()
         if startPatternGeneral.match(line):
             status = 1
-- 
2.20.1.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#45482): https://edk2.groups.io/g/devel/message/45482
Mute This Topic: https://groups.io/mt/32848513/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [Patch] BaseTools: Add "-" in a re to parse line in .map file

Posted by Liming Gao 1 week ago
Reviewed-by: Liming Gao <liming.gao@intel.com>

>-----Original Message-----
>From: Feng, Bob C
>Sent: Tuesday, August 13, 2019 9:58 AM
>To: devel@edk2.groups.io
>Cc: Gao, Liming <liming.gao@intel.com>; Feng, Bob C <bob.c.feng@intel.com>
>Subject: [Patch] BaseTools: Add "-" in a re to parse line in .map file
>
>https://bugzilla.tianocore.org/show_bug.cgi?id=2058
>
>If there are multiple module instances with different
>guid used in .dsc file, the temp path of the module will
>contain 8-4-4-4-12 format guid string. So "-" need to be
>added into the regular expression for parsing it correctly.
>
>Cc: Liming Gao <liming.gao@intel.com>
>Signed-off-by: Bob Feng <bob.c.feng@intel.com>
>---
> BaseTools/Source/Python/Common/Misc.py | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/BaseTools/Source/Python/Common/Misc.py
>b/BaseTools/Source/Python/Common/Misc.py
>index 26d149c270..554ec010dd 100644
>--- a/BaseTools/Source/Python/Common/Misc.py
>+++ b/BaseTools/Source/Python/Common/Misc.py
>@@ -162,11 +162,11 @@ def _parseForGCC(lines, efifilepath, varnames):
>
> def _parseGeneral(lines, efifilepath, varnames):
>     status = 0    #0 - beginning of file; 1 - PE section definition; 2 - symbol table
>     secs  = []    # key = section name
>     varoffset = []
>-    symRe = re.compile('^([\da-fA-F]+):([\da-fA-F]+) +([\.:\\\\\w\?@\$]+)
>+([\da-fA-F]+)', re.UNICODE)
>+    symRe = re.compile('^([\da-fA-F]+):([\da-fA-F]+) +([\.:\\\\\w\?@\$-]+)
>+([\da-fA-F]+)', re.UNICODE)
>
>     for line in lines:
>         line = line.strip()
>         if startPatternGeneral.match(line):
>             status = 1
>--
>2.20.1.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#45499): https://edk2.groups.io/g/devel/message/45499
Mute This Topic: https://groups.io/mt/32848513/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-