BaseTools MemoryProfileSymbolGen.py: Handle 64bits rva from "nm -l xxx.dll"

Current MemoryProfileSymbolGen.py assumes the rva is 32bits,
the patch is to remove the restriction to match any lengths
of rva.

Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>

diff --git a/BaseTools/Scripts/MemoryProfileSymbolGen.py b/BaseTools/Scripts/MemoryProfileSymbolGen.py
index a9790d8883c8ef004ac2169cae3d110f9c1a5f36..5709ad4641cb9cb65d8e80cb850bc0fb031dd46e 100644 (file)
--- a/BaseTools/Scripts/MemoryProfileSymbolGen.py
+++ b/BaseTools/Scripts/MemoryProfileSymbolGen.py
@@ -19,7 +19,7 @@ import re
 import sys\r
 from optparse import OptionParser\r
 \r
-versionNumber = "1.0"\r
+versionNumber = "1.1"\r
 __copyright__ = "Copyright (c) 2016, Intel Corporation. All rights reserved."\r
 \r
 class Symbols:\r
@@ -72,7 +72,7 @@ class Symbols:
         linefile.close()\r
 \r
         # 000113ca T AllocatePool      c:\home\edk-ii\MdePkg\Library\UefiMemoryAllocationLib\MemoryAllocationLib.c:399\r
-        patchLineFileMatchString = "([0-9a-fA-F]{8})\s+[T|D|t|d]\s+(\w+)\s*((?:[a-zA-Z]:)?[\w+\-./_a-zA-Z0-9\\\\]*):?([0-9]*)"\r
+        patchLineFileMatchString = "([0-9a-fA-F]*)\s+[T|D|t|d]\s+(\w+)\s*((?:[a-zA-Z]:)?[\w+\-./_a-zA-Z0-9\\\\]*):?([0-9]*)"\r
 \r
         for reportLine in reportLines:\r
             #print "check - " + reportLine\r