def _parseForXcode(lines, efifilepath, varnames):\r
status = 0\r
ret = []\r
- for index, line in enumerate(lines):\r
+ for line in lines:\r
line = line.strip()\r
if status == 0 and line == "# Symbols:":\r
status = 1\r
for varname in varnames:\r
if varname in line:\r
m = re.match('^([\da-fA-FxX]+)([\s\S]*)([_]*%s)$' % varname, line)\r
- if m != None:\r
+ if m is not None:\r
ret.append((varname, m.group(1)))\r
return ret\r
\r
# status handler\r
if status == 3:\r
m = re.match('^([\w_\.]+) +([\da-fA-Fx]+) +([\da-fA-Fx]+)$', line)\r
- if m != None:\r
+ if m is not None:\r
sections.append(m.groups(0))\r
for varname in varnames:\r
Str = ''\r
m = re.match("^.data.(%s)" % varname, line)\r
- if m != None:\r
+ if m is not None:\r
m = re.match(".data.(%s)$" % varname, line)\r
- if m != None:\r
+ if m is not None:\r
Str = lines[index + 1]\r
else:\r
Str = line[len(".data.%s" % varname):]\r
if Str:\r
m = re.match('^([\da-fA-Fx]+) +([\da-fA-Fx]+)', Str.strip())\r
- if m != None:\r
+ if m is not None:\r
varoffset.append((varname, int(m.groups(0)[0], 16) , int(sections[-1][1], 16), sections[-1][0]))\r
\r
if not varoffset:\r
return []\r
# get section information from efi file\r
efisecs = PeImageClass(efifilepath).SectionHeaderList\r
- if efisecs == None or len(efisecs) == 0:\r
+ if efisecs is None or len(efisecs) == 0:\r
return []\r
#redirection\r
redirection = 0\r
continue \r
if status == 1 and len(line) != 0:\r
m = secRe.match(line)\r
- assert m != None, "Fail to parse the section in map file , line is %s" % line\r
+ assert m is not None, "Fail to parse the section in map file , line is %s" % line\r
sec_no, sec_start, sec_length, sec_name, sec_class = m.groups(0)\r
secs.append([int(sec_no, 16), int(sec_start, 16), int(sec_length, 16), sec_name, sec_class])\r
if status == 2 and len(line) != 0:\r
for varname in varnames:\r
m = symRe.match(line)\r
- assert m != None, "Fail to parse the symbol in map file, line is %s" % line\r
+ assert m is not None, "Fail to parse the symbol in map file, line is %s" % line\r
sec_no, sym_offset, sym_name, vir_addr = m.groups(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('^[_]*(%s)' % varname, sym_name)\r
- if m2 != None:\r
+ if m2 is not None:\r
# fond a binary pcd entry in map file\r
for sec in secs:\r
if sec[0] == sec_no and (sym_offset >= sec[1] and sym_offset < sec[1] + sec[2]):\r
\r
# get section information from efi file\r
efisecs = PeImageClass(efifilepath).SectionHeaderList\r
- if efisecs == None or len(efisecs) == 0:\r
+ if efisecs is None or len(efisecs) == 0:\r
return []\r
\r
ret = []\r
if os.path.exists(File):\r
os.remove(File)\r
\r
-## callback routine for processing variable option\r
-#\r
-# This function can be used to process variable number of option values. The\r
-# typical usage of it is specify architecure list on command line.\r
-# (e.g. <tool> -a IA32 X64 IPF)\r
-#\r
-# @param Option Standard callback function parameter\r
-# @param OptionString Standard callback function parameter\r
-# @param Value Standard callback function parameter\r
-# @param Parser Standard callback function parameter\r
-#\r
-# @retval\r
-#\r
-def ProcessVariableArgument(Option, OptionString, Value, Parser):\r
- assert Value is None\r
- Value = []\r
- RawArgs = Parser.rargs\r
- while RawArgs:\r
- Arg = RawArgs[0]\r
- if (Arg[:2] == "--" and len(Arg) > 2) or \\r
- (Arg[:1] == "-" and len(Arg) > 1 and Arg[1] != "-"):\r
- break\r
- Value.append(Arg)\r
- del RawArgs[0]\r
- setattr(Parser.values, Option.dest, Value)\r
-\r
## Convert GUID string in xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx style to C structure style\r
#\r
# @param Guid The GUID string\r
# @param Directory The directory name\r
#\r
def CreateDirectory(Directory):\r
- if Directory == None or Directory.strip() == "":\r
+ if Directory is None or Directory.strip() == "":\r
return True\r
try:\r
if not os.access(Directory, os.F_OK):\r
# @param Directory The directory name\r
#\r
def RemoveDirectory(Directory, Recursively=False):\r
- if Directory == None or Directory.strip() == "" or not os.path.exists(Directory):\r
+ if Directory is None or Directory.strip() == "" or not os.path.exists(Directory):\r
return\r
if Recursively:\r
CurrentDirectory = os.getcwd()\r
os.chdir(CurrentDirectory)\r
os.rmdir(Directory)\r
\r
-## Check if given file is changed or not\r
-#\r
-# This method is used to check if a file is changed or not between two build\r
-# actions. It makes use a cache to store files timestamp.\r
-#\r
-# @param File The path of file\r
-#\r
-# @retval True If the given file is changed, doesn't exist, or can't be\r
-# found in timestamp cache\r
-# @retval False If the given file is changed\r
-#\r
-def IsChanged(File):\r
- if not os.path.exists(File):\r
- return True\r
-\r
- FileState = os.stat(File)\r
- TimeStamp = FileState[-2]\r
-\r
- if File in gFileTimeStampCache and TimeStamp == gFileTimeStampCache[File]:\r
- FileChanged = False\r
- else:\r
- FileChanged = True\r
- gFileTimeStampCache[File] = TimeStamp\r
-\r
- return FileChanged\r
-\r
## Store content in file\r
#\r
# This method is used to save file only when its content is changed. This is\r
except:\r
EdkLogger.error("", FILE_OPEN_FAILURE, ExtraData=File, RaiseError=False)\r
finally:\r
- if Fd != None:\r
+ if Fd is not None:\r
Fd.close()\r
\r
## Restore a Python object from a file\r
EdkLogger.verbose("Failed to load [%s]\n\t%s" % (File, str(e)))\r
Data = None\r
finally:\r
- if Fd != None:\r
+ if Fd is not None:\r
Fd.close()\r
return Data\r
\r
return os.path.join(self._Root, self._UPPER_CACHE_[UpperPath])\r
return None\r
\r
-## Get all files of a directory\r
-#\r
-# @param Root: Root dir\r
-# @param SkipList : The files need be skipped\r
-#\r
-# @retval A list of all files\r
-#\r
-def GetFiles(Root, SkipList=None, FullPath=True):\r
- OriPath = Root\r
- FileList = []\r
- for Root, Dirs, Files in os.walk(Root):\r
- if SkipList:\r
- for Item in SkipList:\r
- if Item in Dirs:\r
- Dirs.remove(Item)\r
-\r
- for File in Files:\r
- File = os.path.normpath(os.path.join(Root, File))\r
- if not FullPath:\r
- File = File[len(OriPath) + 1:]\r
- FileList.append(File)\r
-\r
- return FileList\r
-\r
-## Check if gvien file exists or not\r
-#\r
-# @param File File name or path to be checked\r
-# @param Dir The directory the file is relative to\r
-#\r
-# @retval True if file exists\r
-# @retval False if file doesn't exists\r
-#\r
-def ValidFile(File, Ext=None):\r
- if Ext != None:\r
- Dummy, FileExt = os.path.splitext(File)\r
- if FileExt.lower() != Ext.lower():\r
- return False\r
- if not os.path.exists(File):\r
- return False\r
- return True\r
-\r
def RealPath(File, Dir='', OverrideDir=''):\r
NewFile = os.path.normpath(os.path.join(Dir, File))\r
NewFile = GlobalData.gAllFiles[NewFile]\r
\r
return None, None\r
\r
-## Check if gvien file exists or not\r
-#\r
-#\r
-def ValidFile2(AllFiles, File, Ext=None, Workspace='', EfiSource='', EdkSource='', Dir='.', OverrideDir=''):\r
- NewFile = File\r
- if Ext != None:\r
- Dummy, FileExt = os.path.splitext(File)\r
- if FileExt.lower() != Ext.lower():\r
- return False, File\r
-\r
- # Replace the Edk macros\r
- if OverrideDir != '' and OverrideDir != None:\r
- if OverrideDir.find('$(EFI_SOURCE)') > -1:\r
- OverrideDir = OverrideDir.replace('$(EFI_SOURCE)', EfiSource)\r
- if OverrideDir.find('$(EDK_SOURCE)') > -1:\r
- OverrideDir = OverrideDir.replace('$(EDK_SOURCE)', EdkSource)\r
-\r
- # Replace the default dir to current dir\r
- if Dir == '.':\r
- Dir = os.getcwd()\r
- Dir = Dir[len(Workspace) + 1:]\r
-\r
- # First check if File has Edk definition itself\r
- if File.find('$(EFI_SOURCE)') > -1 or File.find('$(EDK_SOURCE)') > -1:\r
- NewFile = File.replace('$(EFI_SOURCE)', EfiSource)\r
- NewFile = NewFile.replace('$(EDK_SOURCE)', EdkSource)\r
- NewFile = AllFiles[os.path.normpath(NewFile)]\r
- if NewFile != None:\r
- return True, NewFile\r
-\r
- # Second check the path with override value\r
- if OverrideDir != '' and OverrideDir != None:\r
- NewFile = AllFiles[os.path.normpath(os.path.join(OverrideDir, File))]\r
- if NewFile != None:\r
- return True, NewFile\r
-\r
- # Last check the path with normal definitions\r
- File = os.path.join(Dir, File)\r
- NewFile = AllFiles[os.path.normpath(File)]\r
- if NewFile != None:\r
- return True, NewFile\r
-\r
- return False, File\r
-\r
-## Check if gvien file exists or not\r
-#\r
-#\r
-def ValidFile3(AllFiles, File, Workspace='', EfiSource='', EdkSource='', Dir='.', OverrideDir=''):\r
- # Replace the Edk macros\r
- if OverrideDir != '' and OverrideDir != None:\r
- if OverrideDir.find('$(EFI_SOURCE)') > -1:\r
- OverrideDir = OverrideDir.replace('$(EFI_SOURCE)', EfiSource)\r
- if OverrideDir.find('$(EDK_SOURCE)') > -1:\r
- OverrideDir = OverrideDir.replace('$(EDK_SOURCE)', EdkSource)\r
-\r
- # Replace the default dir to current dir\r
- # Dir is current module dir related to workspace\r
- if Dir == '.':\r
- Dir = os.getcwd()\r
- Dir = Dir[len(Workspace) + 1:]\r
-\r
- NewFile = File\r
- RelaPath = AllFiles[os.path.normpath(Dir)]\r
- NewRelaPath = RelaPath\r
-\r
- while(True):\r
- # First check if File has Edk definition itself\r
- if File.find('$(EFI_SOURCE)') > -1 or File.find('$(EDK_SOURCE)') > -1:\r
- File = File.replace('$(EFI_SOURCE)', EfiSource)\r
- File = File.replace('$(EDK_SOURCE)', EdkSource)\r
- NewFile = AllFiles[os.path.normpath(File)]\r
- if NewFile != None:\r
- NewRelaPath = os.path.dirname(NewFile)\r
- File = os.path.basename(NewFile)\r
- #NewRelaPath = NewFile[:len(NewFile) - len(File.replace("..\\", '').replace("../", '')) - 1]\r
- break\r
-\r
- # Second check the path with override value\r
- if OverrideDir != '' and OverrideDir != None:\r
- NewFile = AllFiles[os.path.normpath(os.path.join(OverrideDir, File))]\r
- if NewFile != None:\r
- #NewRelaPath = os.path.dirname(NewFile)\r
- NewRelaPath = NewFile[:len(NewFile) - len(File.replace("..\\", '').replace("../", '')) - 1]\r
- break\r
-\r
- # Last check the path with normal definitions\r
- NewFile = AllFiles[os.path.normpath(os.path.join(Dir, File))]\r
- if NewFile != None:\r
- break\r
-\r
- # No file found\r
- break\r
-\r
- return NewRelaPath, RelaPath, File\r
-\r
-\r
-def GetRelPath(Path1, Path2):\r
- FileName = os.path.basename(Path2)\r
- L1 = os.path.normpath(Path1).split(os.path.normpath('/'))\r
- L2 = os.path.normpath(Path2).split(os.path.normpath('/'))\r
- for Index in range(0, len(L1)):\r
- if L1[Index] != L2[Index]:\r
- FileName = '../' * (len(L1) - Index)\r
- for Index2 in range(Index, len(L2)):\r
- FileName = os.path.join(FileName, L2[Index2])\r
- break\r
- return os.path.normpath(FileName)\r
-\r
-\r
## Get GUID value from given packages\r
#\r
# @param CName The CName of the GUID\r
self.CodaMessage = CloseMessage\r
self.ProgressChar = ProgressChar\r
self.Interval = Interval\r
- if Progressor._StopFlag == None:\r
+ if Progressor._StopFlag is None:\r
Progressor._StopFlag = threading.Event()\r
\r
## Start to print progress charater\r
# @param OpenMessage The string printed before progress charaters\r
#\r
def Start(self, OpenMessage=None):\r
- if OpenMessage != None:\r
+ if OpenMessage is not None:\r
self.PromptMessage = OpenMessage\r
Progressor._StopFlag.clear()\r
- if Progressor._ProgressThread == None:\r
+ if Progressor._ProgressThread is None:\r
Progressor._ProgressThread = threading.Thread(target=self._ProgressThreadEntry)\r
Progressor._ProgressThread.setDaemon(False)\r
Progressor._ProgressThread.start()\r
#\r
def Stop(self, CloseMessage=None):\r
OriginalCodaMessage = self.CodaMessage\r
- if CloseMessage != None:\r
+ if CloseMessage is not None:\r
self.CodaMessage = CloseMessage\r
self.Abort()\r
self.CodaMessage = OriginalCodaMessage\r
## Abort the progress display\r
@staticmethod\r
def Abort():\r
- if Progressor._StopFlag != None:\r
+ if Progressor._StopFlag is not None:\r
Progressor._StopFlag.set()\r
- if Progressor._ProgressThread != None:\r
+ if Progressor._ProgressThread is not None:\r
Progressor._ProgressThread.join()\r
Progressor._ProgressThread = None\r
\r
return key, value\r
\r
def update(self, dict=None, **kwargs):\r
- if dict != None:\r
+ if dict is not None:\r
for k, v in dict.items():\r
self[k] = v\r
if len(kwargs):\r
if self._Level_ > 1:\r
RestKeys = [self._Wildcard for i in range(0, self._Level_ - 1)]\r
\r
- if FirstKey == None or str(FirstKey).upper() in self._ValidWildcardList:\r
+ if FirstKey is None or str(FirstKey).upper() in self._ValidWildcardList:\r
FirstKey = self._Wildcard\r
\r
if self._Single_:\r
if FirstKey == self._Wildcard:\r
if FirstKey in self.data:\r
Value = self.data[FirstKey][RestKeys]\r
- if Value == None:\r
+ if Value is None:\r
for Key in self.data:\r
Value = self.data[Key][RestKeys]\r
- if Value != None: break\r
+ if Value is not None: break\r
else:\r
if FirstKey in self.data:\r
Value = self.data[FirstKey][RestKeys]\r
- if Value == None and self._Wildcard in self.data:\r
+ if Value is None and self._Wildcard in self.data:\r
#print "Value=None"\r
Value = self.data[self._Wildcard][RestKeys]\r
else:\r
if FirstKey == self._Wildcard:\r
if FirstKey in self.data:\r
Value = self.data[FirstKey]\r
- if Value == None:\r
+ if Value is None:\r
for Key in self.data:\r
Value = self.data[Key]\r
- if Value != None: break\r
+ if Value is not None: break\r
else:\r
if FirstKey in self.data:\r
Value = self.data[FirstKey]\r
keys |= self.data[Key].GetKeys(KeyIndex - 1)\r
return keys\r
\r
-## Boolean chain list\r
-#\r
-class Blist(UserList):\r
- def __init__(self, initlist=None):\r
- UserList.__init__(self, initlist)\r
- def __setitem__(self, i, item):\r
- if item not in [True, False]:\r
- if item == 0:\r
- item = False\r
- else:\r
- item = True\r
- self.data[i] = item\r
- def _GetResult(self):\r
- Value = True\r
- for item in self.data:\r
- Value &= item\r
- return Value\r
- Result = property(_GetResult)\r
-\r
-def ParseConsoleLog(Filename):\r
- Opr = open(os.path.normpath(Filename), 'r')\r
- Opw = open(os.path.normpath(Filename + '.New'), 'w+')\r
- for Line in Opr.readlines():\r
- if Line.find('.efi') > -1:\r
- Line = Line[Line.rfind(' ') : Line.rfind('.efi')].strip()\r
- Opw.write('%s\n' % Line)\r
-\r
- Opr.close()\r
- Opw.close()\r
-\r
def IsFieldValueAnArray (Value):\r
Value = Value.strip()\r
if Value.startswith('GUID') and Value.endswith(')'):\r
return FieldList\r
\r
def ParseDevPathValue (Value):\r
- DevPathList = [ "Path","HardwarePath","Pci","PcCard","MemoryMapped","VenHw","Ctrl","BMC","AcpiPath","Acpi","PciRoot",\r
- "PcieRoot","Floppy","Keyboard","Serial","ParallelPort","AcpiEx","AcpiExp","AcpiAdr","Msg","Ata","Scsi",\r
- "Fibre","FibreEx","I1394","USB","I2O","Infiniband","VenMsg","VenPcAnsi","VenVt100","VenVt100Plus",\r
- "VenUtf8","UartFlowCtrl","SAS","SasEx","NVMe","UFS","SD","eMMC","DebugPort","MAC","IPv4","IPv6","Uart",\r
- "UsbClass","UsbAudio","UsbCDCControl","UsbHID","UsbImage","UsbPrinter","UsbMassStorage","UsbHub",\r
- "UsbCDCData","UsbSmartCard","UsbVideo","UsbDiagnostic","UsbWireless","UsbDeviceFirmwareUpdate",\r
- "UsbIrdaBridge","UsbTestAndMeasurement","UsbWwid","Unit","iSCSI","Vlan","Uri","Bluetooth","Wi-Fi",\r
- "MediaPath","HD","CDROM","VenMedia","Media","Fv","FvFile","Offset","RamDisk","VirtualDisk","VirtualCD",\r
- "PersistentVirtualDisk","PersistentVirtualCD","BbsPath","BBS","Sata" ]\r
if '\\' in Value:\r
Value.replace('\\', '/').replace(' ', '')\r
- for Item in Value.split('/'):\r
- Key = Item.strip().split('(')[0]\r
- if Key not in DevPathList:\r
- pass\r
\r
Cmd = 'DevicePath ' + '"' + Value + '"'\r
try:\r
## AnalyzeDscPcd\r
#\r
# Analyze DSC PCD value, since there is no data type info in DSC\r
-# This fuction is used to match functions (AnalyzePcdData, AnalyzeHiiPcdData, AnalyzeVpdPcdData) used for retrieving PCD value from database\r
+# This fuction is used to match functions (AnalyzePcdData) used for retrieving PCD value from database\r
# 1. Feature flag: TokenSpace.PcdCName|PcdValue\r
# 2. Fix and Patch:TokenSpace.PcdCName|PcdValue[|MaxSize]\r
# 3. Dynamic default:\r
\r
return ValueList \r
\r
-## AnalyzeHiiPcdData\r
-#\r
-# Analyze the pcd Value, variable name, variable Guid and variable offset.\r
-# Used to avoid split issue while the value string contain "|" character\r
-#\r
-# @param[in] Setting: A String contain VariableName, VariableGuid, VariableOffset, DefaultValue information;\r
-# \r
-# @retval ValueList: A List contaian VariableName, VariableGuid, VariableOffset, DefaultValue. \r
-#\r
-def AnalyzeHiiPcdData(Setting):\r
- ValueList = ['', '', '', '']\r
-\r
- TokenList = GetSplitValueList(Setting)\r
- ValueList[0:len(TokenList)] = TokenList\r
-\r
- return ValueList\r
-\r
-## AnalyzeVpdPcdData\r
-#\r
-# Analyze the vpd pcd VpdOffset, MaxDatumSize and InitialValue.\r
-# Used to avoid split issue while the value string contain "|" character\r
-#\r
-# @param[in] Setting: A String contain VpdOffset/MaxDatumSize/InitialValue information;\r
-# \r
-# @retval ValueList: A List contain VpdOffset, MaxDatumSize and InitialValue. \r
-#\r
-def AnalyzeVpdPcdData(Setting):\r
- ValueList = ['', '', '']\r
-\r
- ValueRe = re.compile(r'\s*L?\".*\|.*\"\s*$')\r
- PtrValue = ValueRe.findall(Setting)\r
- \r
- ValueUpdateFlag = False\r
- \r
- if len(PtrValue) >= 1:\r
- Setting = re.sub(ValueRe, '', Setting)\r
- ValueUpdateFlag = True\r
-\r
- TokenList = Setting.split(TAB_VALUE_SPLIT)\r
- ValueList[0:len(TokenList)] = TokenList\r
- \r
- if ValueUpdateFlag:\r
- ValueList[2] = PtrValue[0]\r
- \r
- return ValueList \r
-\r
## check format of PCD value against its the datum type\r
#\r
# For PCD value setting\r
return hash(self.Path)\r
\r
def _GetFileKey(self):\r
- if self._Key == None:\r
+ if self._Key is None:\r
self._Key = self.Path.upper() # + self.ToolChainFamily + self.TagName + self.ToolCode + self.Target\r
return self._Key\r
\r
projects / mirror_edk2.git / blobdiff