UefiCpuPkg: Move AsmRelocateApLoopStart from Mpfuncs.nasm to AmdSev.nasm

[mirror_edk2.git] / BaseTools / Source / Python / GenPatchPcdTable / GenPatchPcdTable.py

diff --git a/BaseTools/Source/Python/GenPatchPcdTable/GenPatchPcdTable.py b/BaseTools/Source/Python/GenPatchPcdTable/GenPatchPcdTable.py
index 9645e9b08db4eea5e7e143615396e52941330601..d962ab0adda73f9e0e3a5edaff32384dd3c3fcb3 100644 (file)
--- a/BaseTools/Source/Python/GenPatchPcdTable/GenPatchPcdTable.py
+++ b/BaseTools/Source/Python/GenPatchPcdTable/GenPatchPcdTable.py
@@ -1,18 +1,12 @@
 ## @file\r
 # Generate PCD table for 'Patchable In Module' type PCD with given .map file.\r
 #    The Patch PCD table like:\r
-#    \r
+#\r
 #    PCD Name    Offset in binary\r
 #    ========    ================\r
 #\r
 # Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.<BR>\r
-# This program and the accompanying materials\r
-# are licensed and made available under the terms and conditions of the BSD License\r
-# which accompanies this distribution.  The full text of the license may be found at\r
-# http://opensource.org/licenses/bsd-license.php\r
-#\r
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+# SPDX-License-Identifier: BSD-2-Clause-Patent\r
 #\r
 #\r
 \r
@@ -40,9 +34,9 @@ __copyright__ = "Copyright (c) 2008 - 2018, Intel Corporation. All rights reserv
 symRe = re.compile('^([\da-fA-F]+):([\da-fA-F]+) +([\.\-:\\\\\w\?@\$<>]+) +([\da-fA-F]+)', re.UNICODE)\r
 \r
 def parsePcdInfoFromMapFile(mapfilepath, efifilepath):\r
-    """ Parse map file to get binary patch pcd information \r
+    """ Parse map file to get binary patch pcd information\r
     @param path    Map file absolution path\r
-    \r
+\r
     @return a list which element hold (PcdName, Offset, SectionName)\r
     """\r
     lines = []\r
@@ -52,23 +46,26 @@ def parsePcdInfoFromMapFile(mapfilepath, efifilepath):
         f.close()\r
     except:\r
         return None\r
-    \r
+\r
     if len(lines) == 0: return None\r
     firstline = lines[0].strip()\r
+    if re.match('^\s*Address\s*Size\s*Align\s*Out\s*In\s*Symbol\s*$', firstline):\r
+        return _parseForXcodeAndClang9(lines, efifilepath)\r
     if (firstline.startswith("Archive member included ") and\r
         firstline.endswith(" file (symbol)")):\r
         return _parseForGCC(lines, efifilepath)\r
     if firstline.startswith("# Path:"):\r
-        return _parseForXcode(lines, efifilepath)\r
+        return _parseForXcodeAndClang9(lines, efifilepath)\r
     return _parseGeneral(lines, efifilepath)\r
 \r
-def _parseForXcode(lines, efifilepath):\r
+def _parseForXcodeAndClang9(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
         line = line.strip()\r
-        if status == 0 and line == "# Symbols:":\r
+        if status == 0 and (re.match('^\s*Address\s*Size\s*Align\s*Out\s*In\s*Symbol\s*$', line) \\r
+            or line == "# Symbols:"):\r
             status = 1\r
             continue\r
         if status == 1 and len(line) != 0:\r
@@ -111,7 +108,7 @@ def _parseForGCC(lines, efifilepath):
                     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
+\r
     # get section information from efi file\r
     efisecs = PeImageClass(efifilepath).SectionHeaderList\r
     if efisecs is None or len(efisecs) == 0:\r
@@ -129,11 +126,11 @@ def _parseForGCC(lines, efifilepath):
                 #assert efisec[0].strip() == pcd[3].strip() and efisec[1] + redirection == pcd[2], "There are some differences between map file and efi file"\r
                 pcds.append([pcd[0], efisec[2] + pcd[1] - efisec[1] - redirection, efisec[0]])\r
     return pcds\r
-                \r
+\r
 def _parseGeneral(lines, efifilepath):\r
-    """ For MSFT, ICC, EBC \r
+    """ For MSFT, ICC, EBC\r
     @param lines    line array for map file\r
-    \r
+\r
     @return a list which element hold (PcdName, Offset, SectionName)\r
     """\r
     status = 0    #0 - beginning of file; 1 - PE section definition; 2 - symbol table\r
@@ -177,7 +174,7 @@ def _parseGeneral(lines, efifilepath):
     efisecs = PeImageClass(efifilepath).SectionHeaderList\r
     if efisecs is None or len(efisecs) == 0:\r
         return None\r
-    \r
+\r
     pcds = []\r
     for pcd in bPcds:\r
         index = 0\r
@@ -188,7 +185,7 @@ def _parseGeneral(lines, efifilepath):
             elif pcd[4] == index:\r
                 pcds.append([pcd[0], efisec[2] + pcd[2], efisec[0]])\r
     return pcds\r
-    \r
+\r
 def generatePcdTable(list, pcdpath):\r
     try:\r
         f = open(pcdpath, 'w')\r
@@ -196,12 +193,12 @@ def generatePcdTable(list, pcdpath):
         pass\r
 \r
     f.write('PCD Name                       Offset    Section Name\r\n')\r
-    \r
+\r
     for pcditem in list:\r
         f.write('%-30s 0x%-08X %-6s\r\n' % (pcditem[0], pcditem[1], pcditem[2]))\r
     f.close()\r
 \r
-    #print 'Success to generate Binary Patch PCD table at %s!' % pcdpath \r
+    #print 'Success to generate Binary Patch PCD table at %s!' % pcdpath\r
 \r
 if __name__ == '__main__':\r
     UsageString = "%prog -m <MapFile> -e <EfiFile> -o <OutFile>"\r
@@ -213,7 +210,7 @@ if __name__ == '__main__':
                       help='Absolute path of EFI binary file.')\r
     parser.add_option('-o', '--outputfile', action='store', dest='outfile',\r
                       help='Absolute path of output file to store the got patchable PCD table.')\r
-  \r
+\r
     (options, args) = parser.parse_args()\r
 \r
     if options.mapfile is None or options.efifile is None:\r