Linting.

Author: ianamason

wllvm/arglistfilter.py

@@ -201,7 +201,7 @@ def __init__(self, inputList, exactMatches={}, patternMatches={}):
             '--coverage' : (0, ArgumentListFilter.compileLinkUnaryCallback),
 
             # ian's additions while building the linux kernel
-            '/dev/null' : (0,  ArgumentListFilter.inputFileCallback),
+            '/dev/null' : (0, ArgumentListFilter.inputFileCallback),
             '-mno-80387': (0, ArgumentListFilter.compileUnaryCallback), #gcc Don't generate output containing 80387 instructions for floating point.
 
 
@@ -256,8 +256,6 @@ def __init__(self, inputList, exactMatches={}, patternMatches={}):
             r'^-stdlib=.+$' : (0, ArgumentListFilter.compileLinkUnaryCallback),
             r'^-mtune=.+$' : (0, ArgumentListFilter.compileUnaryCallback),
             r'^-mstack-alignment=.+$': (0, ArgumentListFilter.compileUnaryCallback),                     #iam: linux kernel stuff
-            r'^-march=.+$': (0, ArgumentListFilter.compileUnaryCallback),                                #iam: linux kernel stuff
-            r'^-mregparm=.+$': (0, ArgumentListFilter.compileUnaryCallback),                             #iam: linux kernel stuff
             r'^-mcmodel=.+$': (0, ArgumentListFilter.compileUnaryCallback),                              #iam: linux kernel stuff
             r'^-mpreferred-stack-boundary=.+$': (0, ArgumentListFilter.compileUnaryCallback),            #iam: linux kernel stuff
             r'^-mindirect-branch=.+$': (0, ArgumentListFilter.compileUnaryCallback),                     #iam: linux kernel stuff
@@ -338,21 +336,22 @@ def __init__(self, inputList, exactMatches={}, patternMatches={}):
 
 
     def skipBitcodeGeneration(self):
+        retval = (False, "")
         if os.environ.get('WLLVM_CONFIGURE_ONLY', False):
-            return (True, "CFG Only")
-        if not self.inputFiles:
-            return (True, "No input files")
-        if self.isEmitLLVM:
-            return (True, "Emit LLVM")
-        if self.isAssembly or self.isAssembleOnly:
-            return (True, "Assembly")
-        if self.isPreprocessOnly:
-            return (True, "Preprocess Only")
-        if self.isStandardIn:
-            return (True, "Standard In")
-        if (self.isDependencyOnly and not self.isCompileOnly):
-            return (True, "Dependency Only")
-        return (False, "")
+            retval = (True, "CFG Only")
+        elif not self.inputFiles:
+            retval = (True, "No input files")
+        elif self.isEmitLLVM:
+            retval = (True, "Emit LLVM")
+        elif self.isAssembly or self.isAssembleOnly:
+            retval = (True, "Assembly")
+        elif self.isPreprocessOnly:
+            retval = (True, "Preprocess Only")
+        elif self.isStandardIn:
+            retval = (True, "Standard In")
+        elif (self.isDependencyOnly and not self.isCompileOnly):
+            retval = (True, "Dependency Only")
+        return retval
 
     def _shiftArgs(self, nargs):
         ret = []

wllvm/checker.py

@@ -120,7 +120,7 @@ def checkLogging(self):
         (destination, level) = loggingConfiguration()
         print('Logging output to {0}.'.format(destination if destination else 'standard error'))
         if not level:
-            print('Logging level not set, defaulting to WARNING\n'.format(destination if destination else 'standard error'))
+            print('Logging level not set, defaulting to WARNING\n')
         else:
             print('Logging level set to {0}.\n'.format(level))
 

wllvm/compilers.py

@@ -108,7 +108,7 @@ def attachBitcodePathToObject(bcPath, outFileName):
     fileType = FileType.getFileType(outFileName)
     if fileType not in (FileType.MACH_OBJECT, FileType.ELF_OBJECT):
     #if fileType not in (FileType.MACH_OBJECT, FileType.MACH_SHARED, FileType.ELF_OBJECT, FileType.ELF_SHARED):
-        _logger.warning('Cannot attach bitcode path to "%s of type %s"', outFileName, FileType.getReadableFileType(fileType))
+        _logger.warning('Cannot attach bitcode path to "%s of type %s"', outFileName, FileType.getFileTypeString(fileType))
         return
 
     #iam: this also looks very dodgey; we need a more reliable way to do this:

wllvm/extraction.py

@@ -248,10 +248,9 @@ def extract_from_thin_archive(inputFile):
     arOutput = arProc.communicate()[0]
     if arProc.returncode != 0:
         _logger.error('ar failed on %s', inputFile)
-        sys.exit(-1)
-
-    lines = arOutput.splitlines()
-    return lines
+    else:
+        retval = arOutput.splitlines()
+    return retval
 
 
 
@@ -280,17 +279,17 @@ def handleThinArchive(pArgs):
 
     bcFiles = []
     for p in objectPaths:
-        _logger.info('handleThinArchive: processing {0}'.format(p))
+        _logger.info('handleThinArchive: processing %s', p)
         contents = pArgs.extractor(p)
         for c in contents:
-            if len(c) > 0:
-                _logger.info('\t including {0}'.format(c))
+            if c:
+                _logger.info('\t including %s', c)
                 bcFiles.append(str(c))
 
     return  buildArchive(pArgs, bcFiles)
 
 #iam: do we want to preserve the order in the archive? if so we need to return both the list and the dict.
-def fetchTOC(pArgs, inputFile):
+def fetchTOC(inputFile):
     toc = {}
 
     arCmd = ['ar', '-t', inputFile]         #iam: check if this might be os dependent
@@ -333,11 +332,11 @@ def handleArchive(pArgs):
 
     originalDir = os.getcwd() # We want to end up back where we started.
 
-    toc = fetchTOC(pArgs, inputFile)
+    toc = fetchTOC(inputFile)
 
     if not toc:
         _logger.warning('No files found, so nothing to be done.')
-        return
+        return 0
 
     bitCodeFiles = []
 
@@ -353,31 +352,31 @@ def handleArchive(pArgs):
                     arP = Popen(arCmd)
                 except Exception as e:
                     _logger.error(e)
-                    return
+                    return 1
 
                 arPE = arP.wait()
 
                 if arPE != 0:
                     errorMsg = 'Failed to execute archiver with command {0}'.format(arCmd)
                     _logger.error(errorMsg)
-                    return
+                    return 1
 
                 # Extract bitcode locations from object
                 contents = pArgs.extractor(filename)
-                _logger.debug('From instance {0} of {1} in {2} we extracted\n\t{3}\n'.format(i, filename, inputFile, contents))
+                _logger.debug('From instance %s of %s in %s we extracted\n\t%s\n', i, filename, inputFile, contents)
                 if contents:
                     for path in contents:
                         if path:
                             bitCodeFiles.append(path)
                 else:
-                    _logger.debug('From instance {0} of {1} in {2} we extracted NOTHING\n'.format(i, filename, inputFile))
+                    _logger.debug('From instance %s of %s in %s we extracted NOTHING\n', i, filename, inputFile)
 
     finally:
         # Delete the temporary folder
         _logger.debug('Deleting temporary folder "%s"', tempDir)
         shutil.rmtree(tempDir)
 
-    _logger.debug('From instance {0} we extracted\n\t{1}\n'.format(inputFile, bitCodeFiles))
+    _logger.debug('From instance %s we extracted\n\t%s\n', inputFile, bitCodeFiles)
 
     # Build bitcode archive
     os.chdir(originalDir)
@@ -599,7 +598,7 @@ def extract_bc_args():
 
 
 def process_file_unix(pArgs):
-
+    retval = 1
     ft = FileType.getFileType(pArgs.inputFile)
     _logger.debug('Detected file type is %s', FileType.revMap[ft])
 
@@ -609,19 +608,19 @@ def process_file_unix(pArgs):
 
     if ft == FileType.ELF_EXECUTABLE or ft == FileType.ELF_SHARED or ft == FileType.ELF_OBJECT:
         _logger.info('Generating LLVM Bitcode module')
-        return handleExecutable(pArgs)
+        retval = handleExecutable(pArgs)
     elif ft == FileType.ARCHIVE:
-        return handleArchive(pArgs)
+        retval = handleArchive(pArgs)
     elif ft == FileType.THIN_ARCHIVE:
-        return handleThinArchive(pArgs)
+        retval = handleThinArchive(pArgs)
     else:
         _logger.error('File "%s" of type %s cannot be used', pArgs.inputFile, FileType.revMap[ft])
-        return 1
+    return retval
 
 
 
 def process_file_darwin(pArgs):
-
+    retval = 1
     ft = FileType.getFileType(pArgs.inputFile)
     _logger.debug('Detected file type is %s', FileType.revMap[ft])
 
@@ -631,9 +630,9 @@ def process_file_darwin(pArgs):
 
     if ft == FileType.MACH_EXECUTABLE or ft == FileType.MACH_SHARED or ft == FileType.MACH_OBJECT:
         _logger.info('Generating LLVM Bitcode module')
-        return handleExecutable(pArgs)
+        retval = handleExecutable(pArgs)
     elif ft == FileType.ARCHIVE:
-        return handleArchive(pArgs)
+        retval = handleArchive(pArgs)
     else:
         _logger.error('File "%s" of type %s cannot be used', pArgs.inputFile, FileType.revMap[ft])
-        return 1
+    return retval

wllvm/filetype.py

@@ -19,6 +19,7 @@ class FileType(object):
     MACH_OBJECT = None
     MACH_SHARED = None
     ARCHIVE = None
+    THIN_ARCHIVE = None
 
 
     # Provides int -> str map
@@ -66,8 +67,7 @@ def getFileTypeString(cls, fti):
         """
         if fti in cls.revMap:
             return cls.revMap[fti]
-        else:
-            'UNKNOWN'
+        return 'UNKNOWN'
 
     @classmethod
     def init(cls):
@@ -81,8 +81,7 @@ def init(cls):
                                         'MACH_OBJECT',
                                         'MACH_SHARED',
                                         'ARCHIVE',
-                                        'THIN_ARCHIVE',
-        )):
+                                        'THIN_ARCHIVE')):
             setattr(cls, name, index)
             cls.revMap[index] = name