X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=BaseTools%2FSource%2FPython%2FCommon%2FMisc.py;h=a7e7797d0499df0a70026c2f6674e83ae0a0054c;hp=0374be06310c2606f6cc5ccdcabda73e49dbc4a2;hb=ea927d2f3f2e34f4b26c10829f5887830cb0720e;hpb=c05c2c0526aadb0bc9ff0939bab1dec21c41c3ef

diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Python/Common/Misc.py
index 0374be0631..a7e7797d04 100644
--- a/BaseTools/Source/Python/Common/Misc.py
+++ b/BaseTools/Source/Python/Common/Misc.py
@@ -1,7 +1,7 @@
 ## @file
 # Common routines used by all tools
 #
-# Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
 # This program and the accompanying materials
 # are licensed and made available under the terms and conditions of the BSD License
 # which accompanies this distribution.  The full text of the license may be found at
@@ -37,7 +37,8 @@ from Parsing import GetSplitValueList
 from Common.LongFilePathSupport import OpenLongFilePath as open
 from Common.MultipleWorkspace import MultipleWorkspace as mws
 import uuid
-
+from CommonDataClass.Exceptions import BadExpression
+import subprocess
 ## Regular expression used to find out place holders in string template
 gPlaceholderPattern = re.compile("\$\{([^$()\s]+)\}", re.MULTILINE | re.UNICODE)
 
@@ -1442,21 +1443,26 @@ def ParseConsoleLog(Filename):
 
 def AnalyzePcdExpression(Setting):
     Setting = Setting.strip()
-    # There might be escaped quote in a string: \", \\\"
-    Data = Setting.replace('\\\\', '//').replace('\\\"', '\\\'')
+    # There might be escaped quote in a string: \", \\\" , \', \\\'
+    Data = Setting
     # There might be '|' in string and in ( ... | ... ), replace it with '-'
     NewStr = ''
-    InStr = False
+    InSingleQuoteStr = False
+    InDoubleQuoteStr = False
     Pair = 0
-    for ch in Data:
-        if ch == '"':
-            InStr = not InStr
-        elif ch == '(' and not InStr:
+    for Index, ch in enumerate(Data):
+        if ch == '"' and not InSingleQuoteStr:
+            if Data[Index - 1] != '\\':
+                InDoubleQuoteStr = not InDoubleQuoteStr
+        elif ch == "'" and not InDoubleQuoteStr:
+            if Data[Index - 1] != '\\':
+                InSingleQuoteStr = not InSingleQuoteStr
+        elif ch == '(' and not (InSingleQuoteStr or InDoubleQuoteStr):
             Pair += 1
-        elif ch == ')' and not InStr:
+        elif ch == ')' and not (InSingleQuoteStr or InDoubleQuoteStr):
             Pair -= 1
 
-        if (Pair > 0 or InStr) and ch == TAB_VALUE_SPLIT:
+        if (Pair > 0 or InSingleQuoteStr or InDoubleQuoteStr) and ch == TAB_VALUE_SPLIT:
             NewStr += '-'
         else:
             NewStr += ch
@@ -1472,99 +1478,148 @@ def AnalyzePcdExpression(Setting):
 
     return FieldList
 
+def ParseDevPathValue (Value):
+    DevPathList = [ "Path","HardwarePath","Pci","PcCard","MemoryMapped","VenHw","Ctrl","BMC","AcpiPath","Acpi","PciRoot",
+                    "PcieRoot","Floppy","Keyboard","Serial","ParallelPort","AcpiEx","AcpiExp","AcpiAdr","Msg","Ata","Scsi",
+                    "Fibre","FibreEx","I1394","USB","I2O","Infiniband","VenMsg","VenPcAnsi","VenVt100","VenVt100Plus",
+                    "VenUtf8","UartFlowCtrl","SAS","SasEx","NVMe","UFS","SD","eMMC","DebugPort","MAC","IPv4","IPv6","Uart",
+                    "UsbClass","UsbAudio","UsbCDCControl","UsbHID","UsbImage","UsbPrinter","UsbMassStorage","UsbHub",
+                    "UsbCDCData","UsbSmartCard","UsbVideo","UsbDiagnostic","UsbWireless","UsbDeviceFirmwareUpdate",
+                    "UsbIrdaBridge","UsbTestAndMeasurement","UsbWwid","Unit","iSCSI","Vlan","Uri","Bluetooth","Wi-Fi",
+                    "MediaPath","HD","CDROM","VenMedia","Media","Fv","FvFile","Offset","RamDisk","VirtualDisk","VirtualCD",
+                    "PersistentVirtualDisk","PersistentVirtualCD","BbsPath","BBS","Sata" ]
+    if '\\' in Value:
+        Value.replace('\\', '/').replace(' ', '')
+    for Item in Value.split('/'):
+        Key = Item.strip().split('(')[0]
+        if Key not in DevPathList:
+            pass
+
+    Cmd = 'DevicePath ' + '"' + Value + '"'
+    try:
+        p = subprocess.Popen(Cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
+        out, err = p.communicate()
+    except Exception, X:
+        raise BadExpression("DevicePath: %s" % (str(X)) )
+    finally:
+        subprocess._cleanup()
+        p.stdout.close()
+        p.stderr.close()
+    if err:
+        raise BadExpression("DevicePath: %s" % str(err))
+    Size = len(out.split())
+    out = ','.join(out.split())
+    return '{' + out + '}', Size
+
 def ParseFieldValue (Value):
-  if type(Value) == type(0):
-    return Value, (Value.bit_length() + 7) / 8
-  if type(Value) <> type(''):
-    raise ValueError
-  Value = Value.strip()
-  if Value.startswith('UINT8') and Value.endswith(')'):
-    Value, Size = ParseFieldValue(Value.split('(', 1)[1][:-1])
-    if Size > 1:
-      raise ValueError
+    if type(Value) == type(0):
+        return Value, (Value.bit_length() + 7) / 8
+    if type(Value) <> type(''):
+        raise BadExpression('Type %s is %s' %(Value, type(Value)))
+    Value = Value.strip()
+    if Value.startswith('UINT8') and Value.endswith(')'):
+        Value, Size = ParseFieldValue(Value.split('(', 1)[1][:-1])
+        if Size > 1:
+            raise BadExpression('Value (%s) Size larger than %d' %(Value, Size))
+        return Value, 1
+    if Value.startswith('UINT16') and Value.endswith(')'):
+        Value, Size = ParseFieldValue(Value.split('(', 1)[1][:-1])
+        if Size > 2:
+            raise BadExpression('Value (%s) Size larger than %d' %(Value, Size))
+        return Value, 2
+    if Value.startswith('UINT32') and Value.endswith(')'):
+        Value, Size = ParseFieldValue(Value.split('(', 1)[1][:-1])
+        if Size > 4:
+            raise BadExpression('Value (%s) Size larger than %d' %(Value, Size))
+        return Value, 4
+    if Value.startswith('UINT64') and Value.endswith(')'):
+        Value, Size = ParseFieldValue(Value.split('(', 1)[1][:-1])
+        if Size > 8:
+            raise BadExpression('Value (%s) Size larger than %d' % (Value, Size))
+        return Value, 8
+    if Value.startswith('GUID') and Value.endswith(')'):
+        Value = Value.split('(', 1)[1][:-1].strip()
+        if Value[0] == '{' and Value[-1] == '}':
+            TmpValue = GuidStructureStringToGuidString(Value)
+            if len(TmpValue) == 0:
+                raise BadExpression("Invalid GUID value string %s" % Value)
+            Value = TmpValue
+        if Value[0] == '"' and Value[-1] == '"':
+            Value = Value[1:-1]
+        try:
+            Value = "'" + uuid.UUID(Value).get_bytes_le() + "'"
+        except ValueError, Message:
+            raise BadExpression('%s' % Message)
+        Value, Size = ParseFieldValue(Value)
+        return Value, 16
+    if Value.startswith('L"') and Value.endswith('"'):
+        # Unicode String
+        List = list(eval(Value[1:]))  # translate escape character
+        List.reverse()
+        Value = 0
+        for Char in List:
+            Value = (Value << 16) | ord(Char)
+        return Value, (len(List) + 1) * 2
+    if Value.startswith('"') and Value.endswith('"'):
+        # ASCII String
+        List = list(eval(Value))  # translate escape character
+        List.reverse()
+        Value = 0
+        for Char in List:
+            Value = (Value << 8) | ord(Char)
+        return Value, len(List) + 1
+    if Value.startswith("L'") and Value.endswith("'"):
+        # Unicode Character Constant
+        List = list(eval(Value[1:])) # translate escape character
+        if len(List) == 0:
+            raise BadExpression('Length %s is %s' % (Value, len(List)))
+        List.reverse()
+        Value = 0
+        for Char in List:
+            Value = (Value << 16) | ord(Char)
+        return Value, len(List) * 2
+    if Value.startswith("'") and Value.endswith("'"):
+        # Character constant
+        List = list(eval(Value)) # translate escape character
+        if len(List) == 0:
+            raise BadExpression('Length %s is %s' % (Value, len(List)))
+        List.reverse()
+        Value = 0
+        for Char in List:
+            Value = (Value << 8) | ord(Char)
+        return Value, len(List)
+    if Value.startswith('{') and Value.endswith('}'):
+        # Byte array
+        Value = Value[1:-1]
+        List = [Item.strip() for Item in Value.split(',')]
+        List.reverse()
+        Value = 0
+        RetSize = 0
+        for Item in List:
+            ItemValue, Size = ParseFieldValue(Item)
+            RetSize += Size
+            for I in range(Size):
+                Value = (Value << 8) | ((ItemValue >> 8 * I) & 0xff)
+        return Value, RetSize
+    if Value.startswith('DEVICE_PATH(') and Value.endswith(')'):
+        Value = Value.replace("DEVICE_PATH(", '').rstrip(')')
+        Value = Value.strip().strip('"')
+        return ParseDevPathValue(Value)
+    if Value.lower().startswith('0x'):
+        Value = int(Value, 16)
+        if Value == 0:
+            return 0, 1
+        return Value, (Value.bit_length() + 7) / 8
+    if Value[0].isdigit():
+        Value = int(Value, 10)
+        if Value == 0:
+            return 0, 1
+        return Value, (Value.bit_length() + 7) / 8
+    if Value.lower() == 'true':
+        return 1, 1
+    if Value.lower() == 'false':
+        return 0, 1
     return Value, 1
-  if Value.startswith('UINT16') and Value.endswith(')'):
-    Value, Size = ParseFieldValue(Value.split('(', 1)[1][:-1])
-    if Size > 2:
-      raise ValueError
-    return Value, 2
-  if Value.startswith('UINT32') and Value.endswith(')'):
-    Value, Size = ParseFieldValue(Value.split('(', 1)[1][:-1])
-    if Size > 4:
-      raise ValueError
-    return Value, 4
-  if Value.startswith('UINT64') and Value.endswith(')'):
-    Value, Size = ParseFieldValue(Value.split('(', 1)[1][:-1])
-    if Size > 8:
-      raise ValueError
-    return Value, 8
-  if Value.startswith('GUID') and Value.endswith(')'):
-    Value = Value.split('(', 1)[1][:-1].strip()
-    if Value[0] == '{' and Value[-1] == '}':
-      Value = Value[1:-1].strip()
-      Value = Value.split('{', 1)
-      Value = [Item.strip()[2:] for Item in (Value[0] + Value[1][:-1]).split(',')]
-      Value = '-'.join(Value[0:3]) + '-' + ''.join(Value[3:5]) + '-' + ''.join(Value[5:11])
-    if Value[0] == '"' and Value[-1] == '"':
-      Value = Value[1:-1]
-    Value = "'" + uuid.UUID(Value).get_bytes_le() + "'"
-    Value, Size = ParseFieldValue(Value)
-    return Value, 16
-  if Value.startswith('L"') and Value.endswith('"'):
-    # Unicode String
-    List = list(Value[2:-1])
-    List.reverse()
-    Value = 0
-    for Char in List:
-      Value = (Value << 16) | ord(Char)
-    return Value, (len(List) + 1) * 2
-  if Value.startswith('"') and Value.endswith('"'):
-    # ASCII String
-    List = list(Value[1:-1])
-    List.reverse()
-    Value = 0
-    for Char in List:
-      Value = (Value << 8) | ord(Char)
-    return Value, len(List) + 1
-  if Value.startswith("L'") and Value.endswith("'"):
-    # Unicode Character Constant
-    List = list(Value[2:-1])
-    List.reverse()
-    Value = 0
-    for Char in List:
-      Value = (Value << 16) | ord(Char)
-    return Value, len(List) * 2
-  if Value.startswith("'") and Value.endswith("'"):
-    # Character constant
-    List = list(Value[1:-1])
-    List.reverse()
-    Value = 0
-    for Char in List:
-      Value = (Value << 8) | ord(Char)
-    return Value, len(List)
-  if Value.startswith('{') and Value.endswith('}'):
-    # Byte array
-    Value = Value[1:-1]
-    List = [Item.strip() for Item in Value.split(',')]
-    List.reverse()
-    Value = 0
-    for Item in List:
-      ItemValue, Size = ParseFieldValue(Item)
-      if Size > 1:
-        raise ValueError
-      Value = (Value << 8) | ItemValue
-    return Value, len(List)
-  if Value.lower().startswith('0x'):
-    Value = int(Value, 16)
-    return Value, (Value.bit_length() + 7) / 8
-  if Value[0].isdigit():
-    Value = int(Value, 10)
-    return Value, (Value.bit_length() + 7) / 8
-  if Value.lower() == 'true':
-    return 1, 1
-  if Value.lower() == 'false':
-    return 0, 1
-  return Value, 1
 
 ## AnalyzeDscPcd
 #
@@ -1767,10 +1822,10 @@ def CheckPcdDatum(Type, Value):
     if Type == "VOID*":
         ValueRe = re.compile(r'\s*L?\".*\"\s*$')
         if not (((Value.startswith('L"') or Value.startswith('"')) and Value.endswith('"'))
-                or (Value.startswith('{') and Value.endswith('}'))
+                or (Value.startswith('{') and Value.endswith('}')) or (Value.startswith("L'") or Value.startswith("'") and Value.endswith("'"))
                ):
             return False, "Invalid value [%s] of type [%s]; must be in the form of {...} for array"\
-                          ", or \"...\" for string, or L\"...\" for unicode string" % (Value, Type)
+                          ", \"...\" or \'...\' for string, L\"...\" or L\'...\' for unicode string" % (Value, Type)
         elif ValueRe.match(Value):
             # Check the chars in UnicodeString or CString is printable
             if Value.startswith("L"):
@@ -2149,10 +2204,10 @@ class SkuClass():
         for SkuName in SkuIds:
             SkuId = SkuIds[SkuName][0]
             skuid_num = int(SkuId,16) if SkuId.upper().startswith("0X") else int(SkuId)
-            if skuid_num > 0xFFFF:
+            if skuid_num > 0xFFFFFFFFFFFFFFFF:
                 EdkLogger.error("build", PARAMETER_INVALID,
-                            ExtraData = "SKU-ID [%s] must less than 65535"
-                                      % (SkuName))
+                            ExtraData = "SKU-ID [%s] value %s exceeds the max value of UINT64"
+                                      % (SkuName, SkuId))
         
         self.AvailableSkuIds = sdict()
         self.SkuIdSet = []
@@ -2189,6 +2244,10 @@ class SkuClass():
             GlobalData.gSkuids = (self.SkuIdSet)
             if 'COMMON' in GlobalData.gSkuids:
                 GlobalData.gSkuids.remove('COMMON')
+            if self.SkuUsageType == self.SINGLE:
+                if len(GlobalData.gSkuids) != 1:
+                    if 'DEFAULT' in GlobalData.gSkuids:
+                        GlobalData.gSkuids.remove('DEFAULT')
             if GlobalData.gSkuids:
                 GlobalData.gSkuids.sort()
 
@@ -2200,6 +2259,8 @@ class SkuClass():
         return self.__SkuInherit.get(skuname,"DEFAULT")
 
     def GetSkuChain(self,sku):
+        if sku == "DEFAULT":
+            return ["DEFAULT"]
         skulist = [sku]
         nextsku = sku
         while 1:
@@ -2295,11 +2356,11 @@ def PackRegistryFormatGuid(Guid):
                 )
 
 def BuildOptionPcdValueFormat(TokenSpaceGuidCName, TokenCName, PcdDatumType, Value):
-    if PcdDatumType == 'VOID*':
-        if Value.startswith('L'):
+    if PcdDatumType not in [TAB_UINT8, TAB_UINT16, TAB_UINT32, TAB_UINT64,'BOOLEAN']:
+        if Value.startswith('L') or Value.startswith('"'):
             if not Value[1]:
                 EdkLogger.error("build", FORMAT_INVALID, 'For Void* type PCD, when specify the Value in the command line, please use the following format: "string", L"string", H"{...}"')
-            Value = Value[0] + '"' + Value[1:] + '"'
+            Value = Value
         elif Value.startswith('H'):
             if not Value[1]:
                 EdkLogger.error("build", FORMAT_INVALID, 'For Void* type PCD, when specify the Value in the command line, please use the following format: "string", L"string", H"{...}"')