From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.43; helo=mga05.intel.com; envelope-from=jaben.carsey@intel.com; receiver=edk2-devel@lists.01.org Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id CDFE022512131 for ; Fri, 20 Apr 2018 08:51:55 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 Apr 2018 08:51:55 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,302,1520924400"; d="scan'208";a="44811535" Received: from jcarsey-desk1.amr.corp.intel.com ([10.7.159.144]) by orsmga003.jf.intel.com with ESMTP; 20 Apr 2018 08:51:52 -0700 From: Jaben Carsey To: edk2-devel@lists.01.org Cc: Liming Gao , Yonghong Zhu Date: Fri, 20 Apr 2018 08:51:22 -0700 Message-Id: <9ee84ed884976a5ee7d3c019ee28881fecdbece0.1524239027.git.jaben.carsey@intel.com> X-Mailer: git-send-email 2.16.2.windows.1 In-Reply-To: References: In-Reply-To: References: Subject: [PATCH v1 02/27] BaseTools: GenPatchPcdTable - refactor RegEx to minimize multiple compiling X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Apr 2018 15:51:56 -0000 Cc: Liming Gao Cc: Yonghong Zhu Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Jaben Carsey --- BaseTools/Source/Python/GenPatchPcdTable/GenPatchPcdTable.py | 24 ++++++++++++-------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/BaseTools/Source/Python/GenPatchPcdTable/GenPatchPcdTable.py b/BaseTools/Source/Python/GenPatchPcdTable/GenPatchPcdTable.py index dc2ceaf775d8..59748763a553 100644 --- a/BaseTools/Source/Python/GenPatchPcdTable/GenPatchPcdTable.py +++ b/BaseTools/Source/Python/GenPatchPcdTable/GenPatchPcdTable.py @@ -63,6 +63,7 @@ def parsePcdInfoFromMapFile(mapfilepath, efifilepath): return _parseGeneral(lines, efifilepath) def _parseForXcode(lines, efifilepath): + valuePattern = re.compile('^([\da-fA-FxX]+)([\s\S]*)([_]*_gPcd_BinaryPatch_([\w]+))') status = 0 pcds = [] for line in lines: @@ -72,13 +73,16 @@ def _parseForXcode(lines, efifilepath): continue if status == 1 and len(line) != 0: if '_gPcd_BinaryPatch_' in line: - m = re.match('^([\da-fA-FxX]+)([\s\S]*)([_]*_gPcd_BinaryPatch_([\w]+))', line) + m = valuePattern.match(line) if m is not None: pcds.append((m.groups(0)[3], int(m.groups(0)[0], 16))) return pcds 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 = [] @@ -98,15 +102,15 @@ def _parseForGCC(lines, efifilepath): # status handler if status == 3: - m = re.match('^([\w_\.]+) +([\da-fA-Fx]+) +([\da-fA-Fx]+)$', line) + m = valuePattern.match(line) if m is not None: sections.append(m.groups(0)) if status == 3: - m = re.match('^.data._gPcd_BinaryPatch_([\w_\d]+)$', line) + m = dataPattern.match(line) if m is not None: if lines[index + 1]: PcdName = m.groups(0)[0] - m = re.match('^([\da-fA-Fx]+) +([\da-fA-Fx]+)', lines[index + 1].strip()) + m = pcdPattern.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])) @@ -137,17 +141,19 @@ 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 re.match("^Start[' ']+Length[' ']+Name[' ']+Class", line): + if startPattern.match(line): status = 1 continue - if re.match("^Address[' ']+Publics by Value[' ']+Rva\+Base", line): + if addressPattern.match(line): status = 2 continue - if re.match("^entry point at", line): + if line.startswith("entry point at"): status = 3 continue if status == 1 and len(line) != 0: @@ -162,7 +168,7 @@ def _parseGeneral(lines, efifilepath): sec_no = int(sec_no, 16) sym_offset = int(sym_offset, 16) vir_addr = int(vir_addr, 16) - m2 = re.match('^[_]+gPcd_BinaryPatch_([\w]+)', sym_name) + m2 = symPattern.match(sym_name) if m2 is not None: # fond a binary pcd entry in map file for sec in secs: -- 2.16.2.windows.1