Clean up. Ready for some stress testing on Monday.

Author: ianamason

extract-bc

@@ -102,17 +102,24 @@ def getSectionContent(size, offset, filename):
 #    otool -X -s __LLVM __llvm_bc inputFile | xxd -r
 # to work this can be simplified.
 def extract_section_darwin(inputFile):
+
     otoolCmd  = ['otool', '-X', '-s', darwinSegmentName, darwinSectionName, inputFile]
-    output = sp.check_output(otoolCmd)
-    lines = output.splitlines()
+    otoolProc = Popen(otoolCmd, stdout=sp.PIPE)
+
+    otoolOutput = otoolProc.communicate()[0]
+    if otoolProc.returncode != 0:
+        logging.error('otool failed on %s' % inputFile)
+        sys.exit(-1)
+
+    lines = otoolOutput.splitlines()
     octets = []
     for line in lines:
         (_, octetline) = line.split('\t')
         octets.extend(octetline.split())
     octets = ''.join(octets)
     contents = octets.decode('hex').splitlines()
     if not contents:
-        logging.error('{0} contained no {1} section is empty'.format(inputFile, darwinSegmentName))
+        logging.error('{0} contained no {1} segment'.format(inputFile, darwinSegmentName))
     return contents
 
 #analagous procedure for linux (relying on objcopy)
@@ -325,7 +332,7 @@ def main(args):
         process_file_darwin(inputFile, outputFile, llvmLinker, llvmArchiver)
 
     else:
-        #iam: do we work on anything else?
+        #iam: do we work on anything else? 
         logging.error('Unsupported or unrecognized platform: {0}'.format(sys.platform))
         return 1
 
@@ -335,15 +342,15 @@ def process_file_unix(inputFile, outputFile, llvmLinker, llvmArchiver):
     logging.debug('Detected file type is {0}'.format(FileType.revMap[ft]))
 
     extractor = extract_section_linux
+    arCmd     = ['ar','x']
+    ofileType = FileType.ELF_OBJECT
 
     if ft == FileType.ELF_EXECUTABLE or ft == FileType.ELF_SHARED:
         logging.info('Generating LLVM Bitcode module')
         return handleExecutable(inputFile, outputFile, extractor, llvmLinker)
     elif ft == FileType.ARCHIVE:
-        arCmd = ['ar','x']
-        fileType = FileType.ELF_OBJECT
         logging.info('Generating LLVM Bitcode archive')
-        return handleArchive(inputFile, outputFile, arCmd, fileType, extractor, llvmArchiver)
+        return handleArchive(inputFile, outputFile, arCmd, ofileType, extractor, llvmArchiver)
     else:
         logging.error('File "{0}" of type {1} cannot be used'.format(inputFile,FileType.revMap[ft]))
         return 1
@@ -355,15 +362,15 @@ def process_file_darwin(inputFile, outputFile, llvmLinker, llvmArchiver):
     logging.debug('Detected file type is {0}'.format(FileType.revMap[ft]))
 
     extractor = extract_section_darwin
+    arCmd     = ['ar','-x']
+    ofileType = FileType.MACH_OBJECT
 
     if ft == FileType.MACH_EXECUTABLE or ft == FileType.MACH_SHARED:
         logging.info('Generating LLVM Bitcode module')
         return handleExecutable(inputFile, outputFile, extractor, llvmLinker)
     elif ft == FileType.ARCHIVE:
-        arCmd = ['ar','-x']
-        fileType = FileType.MACH_OBJECT
         logging.info('Generating LLVM Bitcode archive')
-        return handleArchive(inputFile, outputFile, arCmd, fileType, extractor, llvmArchiver)
+        return handleArchive(inputFile, outputFile, arCmd, ofileType, extractor, llvmArchiver)
     else:
         logging.error('File "{0}" of type {1} cannot be used'.format(inputFile,FileType.revMap[ft]))
         return 1