\r
from Common.BuildToolError import *\r
import Common.EdkLogger as EdkLogger\r
-from Common.Misc import PeImageClass\r
+from Common.Misc import PeImageClass, startPatternGeneral, addressPatternGeneral, valuePatternGcc, pcdPatternGcc, secReGeneral\r
from Common.BuildVersion import gBUILD_VERSION\r
from Common.LongFilePathSupport import OpenLongFilePath as open\r
\r
#====================================== Internal Libraries ========================================\r
\r
#============================================== Code ===============================================\r
-secRe = re.compile('^([\da-fA-F]+):([\da-fA-F]+) +([\da-fA-F]+)[Hh]? +([.\w\$]+) +(\w+)', re.UNICODE)\r
symRe = re.compile('^([\da-fA-F]+):([\da-fA-F]+) +([\.\-:\\\\\w\?@\$<>]+) +([\da-fA-F]+)', re.UNICODE)\r
\r
def parsePcdInfoFromMapFile(mapfilepath, efifilepath):\r
return _parseGeneral(lines, efifilepath)\r
\r
def _parseForXcode(lines, efifilepath):\r
+ valuePattern = re.compile('^([\da-fA-FxX]+)([\s\S]*)([_]*_gPcd_BinaryPatch_([\w]+))')\r
status = 0\r
pcds = []\r
for line in lines:\r
continue\r
if status == 1 and len(line) != 0:\r
if '_gPcd_BinaryPatch_' in line:\r
- m = re.match('^([\da-fA-FxX]+)([\s\S]*)([_]*_gPcd_BinaryPatch_([\w]+))', line)\r
+ m = valuePattern.match(line)\r
if m is not None:\r
pcds.append((m.groups(0)[3], int(m.groups(0)[0], 16)))\r
return pcds\r
\r
def _parseForGCC(lines, efifilepath):\r
""" Parse map file generated by GCC linker """\r
+ dataPattern = re.compile('^.data._gPcd_BinaryPatch_([\w_\d]+)$')\r
status = 0\r
imageBase = -1\r
sections = []\r
\r
# status handler\r
if status == 3:\r
- m = re.match('^([\w_\.]+) +([\da-fA-Fx]+) +([\da-fA-Fx]+)$', line)\r
+ m = valuePatternGcc.match(line)\r
if m is not None:\r
sections.append(m.groups(0))\r
if status == 3:\r
- m = re.match('^.data._gPcd_BinaryPatch_([\w_\d]+)$', line)\r
+ m = dataPattern.match(line)\r
if m is not None:\r
if lines[index + 1]:\r
PcdName = m.groups(0)[0]\r
- m = re.match('^([\da-fA-Fx]+) +([\da-fA-Fx]+)', lines[index + 1].strip())\r
+ m = pcdPatternGcc.match(lines[index + 1].strip())\r
if m is not None:\r
bpcds.append((PcdName, int(m.groups(0)[0], 16) , int(sections[-1][1], 16), sections[-1][0]))\r
\r
status = 0 #0 - beginning of file; 1 - PE section definition; 2 - symbol table\r
secs = [] # key = section name\r
bPcds = []\r
-\r
+ symPattern = re.compile('^[_]+gPcd_BinaryPatch_([\w]+)')\r
\r
for line in lines:\r
line = line.strip()\r
- if re.match("^Start[' ']+Length[' ']+Name[' ']+Class", line):\r
+ if startPatternGeneral.match(line):\r
status = 1\r
continue\r
- if re.match("^Address[' ']+Publics by Value[' ']+Rva\+Base", line):\r
+ if addressPatternGeneral.match(line):\r
status = 2\r
continue\r
- if re.match("^entry point at", line):\r
+ if line.startswith("entry point at"):\r
status = 3\r
continue\r
if status == 1 and len(line) != 0:\r
sec_no = int(sec_no, 16)\r
sym_offset = int(sym_offset, 16)\r
vir_addr = int(vir_addr, 16)\r
- m2 = re.match('^[_]+gPcd_BinaryPatch_([\w]+)', sym_name)\r
+ m2 = symPattern.match(sym_name)\r
if m2 is not None:\r
# fond a binary pcd entry in map file\r
for sec in secs:\r