Use the logger rather than a DEBUG flag, and fix the recognition of isAssembly.

Author: ianamason

driver/utils.py

@@ -32,8 +32,8 @@
 # Internal logger
 _logger = logging.getLogger(__name__)
 
-# Flag for debugging
-DEBUG = False
+# Flag for dumping
+DUMPING = False
 
 
 # This class applies filters to GCC argument lists.  It has a few
@@ -282,7 +282,7 @@ def __init__(self, inputList, exactMatches={}, patternMatches={}):
                     _logger.warning('Did not recognize the compiler flag "{0}"'.format(currentItem))
                     self.compileUnaryCallback(currentItem)
 
-        if DEBUG:
+        if DUMPING:
             self.dump()
 
     def _shiftArgs(self, nargs):
@@ -300,7 +300,7 @@ def abortUnaryCallback(self, flag):
     def inputFileCallback(self, infile):
         _logger.debug('Input file: ' + infile)
         self.inputFiles.append(infile)
-        if re.search('\\.(s|S)', infile):
+        if re.search('\\.(s|S)$', infile):
             self.isAssembly = True
 
     def outputFileCallback(self, flag, filename):
@@ -368,7 +368,7 @@ def getOutputFilename(self):
 
     # iam: returns a pair [objectFilename, bitcodeFilename] i.e .o and .bc.
     # the hidden flag determines whether the objectFile is hidden like the
-    # bitcodeFile is (starts with a '.'), use the DEBUG flag to get a sense
+    # bitcodeFile is (starts with a '.'), use the logging level & DUMPING flag to get a sense
     # of what is being written out.
     def getArtifactNames(self, srcFile, hidden=False):
         (srcpath, srcbase) = os.path.split(srcFile)
@@ -385,15 +385,15 @@ def getArtifactNames(self, srcFile, hidden=False):
 
     #iam: for printing our partitioning of the args
     def dump(self):
-        print("compileArgs: ", self.compileArgs)
-        print("inputFiles: ", self.inputFiles)
-        print("linkArgs: ", self.linkArgs)
-        print("objectFiles: ", self.objectFiles)
-        print("outputFilename: ", self.outputFilename)
+        _logger.debug('compileArgs: {0}'.format(self.compileArgs))
+        _logger.debug('inputFiles: {0}'.format(self.inputFiles))
+        _logger.debug('linkArgs: {0}'.format(self.linkArgs))
+        _logger.debug('objectFiles: {0}'.format(self.objectFiles))
+        _logger.debug('outputFilename: {0}'.format(self.outputFilename))
         for srcFile in self.inputFiles:
-            print("srcFile: ", srcFile)
+            _logger.debug('srcFile: {0}'.format(srcFile))
             (objFile, bcFile) = self.getArtifactNames(srcFile)
-            print("{0} ===> ({1}, {2})".format(srcFile, objFile, bcFile))
+            _logger.debug('{0} ===> ({1}, {2})'.format(srcFile, objFile, bcFile))
 
 
 
@@ -459,8 +459,7 @@ def attachBitcodePathToObject(bcPath, outFileName):
     # Don't try to attach a bitcode path to a binary.  Unfortunately
     # that won't work.
     (root, ext) = os.path.splitext(outFileName)
-    if DEBUG:
-        print('attachBitcodePathToObject: {0}  ===> {1} [ext = {2}]\n'.format(bcPath, outFileName, ext))
+    _logger.debug('attachBitcodePathToObject: {0}  ===> {1} [ext = {2}]\n'.format(bcPath, outFileName, ext))
     #iam: this also looks very dodgey; we need a more reliable way to do this:
     if ext not in ('.o', '.lo', '.os', '.So', '.po'):
         _logger.warning('Cannot attach bitcode path to "{0} of type {1}"'.format(outFileName, FileType.getFileType(outFileName)))
@@ -570,8 +569,7 @@ def getBitcodeCompiler(self):
         # When we build LLVM bitcode we do not want to use the GNU assembler,
         # instead we want gcc to use our own assembler (see driver/as).
         cmd = cc + ['-B', driverDir, '-fplugin={0}'.format(pth), '-fplugin-arg-dragonegg-emit-ir']
-        if DEBUG:
-            print(cmd)
+        _logger.debug(cmd)
         return cmd
 
     def getCompiler(self):
@@ -696,8 +694,7 @@ def buildBitcodeFile(builder, srcFile, bcFile):
     bcc.extend(af.compileArgs)
     bcc.extend(['-c', srcFile])
     bcc.extend(['-o', bcFile])
-    if DEBUG:
-        print('buildBitcodeFile: {0}\n'.format(bcc))
+    _logger.debug('buildBitcodeFile: {0}\n'.format(bcc))
     proc = Popen(bcc)
     rc = proc.wait()
     if rc != 0:
@@ -710,8 +707,7 @@ def buildObjectFile(builder, srcFile, objFile):
     cc.extend(af.compileArgs)
     cc.append(srcFile)
     cc.extend(['-c', '-o',  objFile])
-    if DEBUG:
-        print('buildObjectFile: {0}\n'.format(cc))
+    _logger.debug('buildObjectFile: {0}\n'.format(cc))
     proc = Popen(cc)
     rc = proc.wait()
     if rc != 0: