diff options
Diffstat (limited to 'BaseTools/Source/Python/GenPatchPcdTable/GenPatchPcdTable.py')
| -rw-r--r-- | BaseTools/Source/Python/GenPatchPcdTable/GenPatchPcdTable.py | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/BaseTools/Source/Python/GenPatchPcdTable/GenPatchPcdTable.py b/BaseTools/Source/Python/GenPatchPcdTable/GenPatchPcdTable.py index 59748763a5..2a039480a0 100644 --- a/BaseTools/Source/Python/GenPatchPcdTable/GenPatchPcdTable.py +++ b/BaseTools/Source/Python/GenPatchPcdTable/GenPatchPcdTable.py @@ -24,7 +24,7 @@ import array from Common.BuildToolError import *
import Common.EdkLogger as EdkLogger
-from Common.Misc import PeImageClass
+from Common.Misc import PeImageClass, startPatternGeneral, addressPatternGeneral, valuePatternGcc, pcdPatternGcc, secReGeneral
from Common.BuildVersion import gBUILD_VERSION
from Common.LongFilePathSupport import OpenLongFilePath as open
@@ -36,7 +36,6 @@ __copyright__ = "Copyright (c) 2008 - 2010, Intel Corporation. All rights reserv #====================================== Internal Libraries ========================================
#============================================== Code ===============================================
-secRe = re.compile('^([\da-fA-F]+):([\da-fA-F]+) +([\da-fA-F]+)[Hh]? +([.\w\$]+) +(\w+)', re.UNICODE)
symRe = re.compile('^([\da-fA-F]+):([\da-fA-F]+) +([\.\-:\\\\\w\?@\$<>]+) +([\da-fA-F]+)', re.UNICODE)
def parsePcdInfoFromMapFile(mapfilepath, efifilepath):
@@ -80,9 +79,7 @@ def _parseForXcode(lines, efifilepath): def _parseForGCC(lines, efifilepath):
""" Parse map file generated by GCC linker """
- valuePattern = re.compile('^([\w_\.]+) +([\da-fA-Fx]+) +([\da-fA-Fx]+)$')
dataPattern = re.compile('^.data._gPcd_BinaryPatch_([\w_\d]+)$')
- pcdPattern = re.compile('^([\da-fA-Fx]+) +([\da-fA-Fx]+)')
status = 0
imageBase = -1
sections = []
@@ -102,7 +99,7 @@ def _parseForGCC(lines, efifilepath): # status handler
if status == 3:
- m = valuePattern.match(line)
+ m = valuePatternGcc.match(line)
if m is not None:
sections.append(m.groups(0))
if status == 3:
@@ -110,7 +107,7 @@ def _parseForGCC(lines, efifilepath): if m is not None:
if lines[index + 1]:
PcdName = m.groups(0)[0]
- m = pcdPattern.match(lines[index + 1].strip())
+ m = pcdPatternGcc.match(lines[index + 1].strip())
if m is not None:
bpcds.append((PcdName, int(m.groups(0)[0], 16) , int(sections[-1][1], 16), sections[-1][0]))
@@ -141,16 +138,14 @@ def _parseGeneral(lines, efifilepath): status = 0 #0 - beginning of file; 1 - PE section definition; 2 - symbol table
secs = [] # key = section name
bPcds = []
- startPattern = re.compile("^Start[' ']+Length[' ']+Name[' ']+Class")
- addressPattern = re.compile("^Address[' ']+Publics by Value[' ']+Rva\+Base")
symPattern = re.compile('^[_]+gPcd_BinaryPatch_([\w]+)')
for line in lines:
line = line.strip()
- if startPattern.match(line):
+ if startPatternGeneral.match(line):
status = 1
continue
- if addressPattern.match(line):
+ if addressPatternGeneral.match(line):
status = 2
continue
if line.startswith("entry point at"):
|