move tracers into the tracers directory

install.sh

@@ -22,11 +22,13 @@ if [[ "$unamestr" == 'Linux' ]]; then
     sudo yum install python-pip python-devel gcc gcc-c++ python-virtualenv glib2-devel
   fi
 
-  if [ $(qemu/qira-i386 > /dev/null; echo $?) == 1 ]; then
+  if [ $(tracers/qemu/qira-i386 > /dev/null; echo $?) == 1 ]; then
     echo "QIRA QEMU appears to run okay"
   else
     echo "building QEMU"
+    cd tracers
     ./qemu_build.sh
+    cd ../
   fi
 fi
 

middleware/qira_program.py

@@ -82,7 +82,7 @@ class Program:
     self.identify_program()
 
   def identify_program(self):
-    qemu_dir = os.path.dirname(os.path.realpath(__file__))+"/../qemu/"
+    qemu_dir = os.path.dirname(os.path.realpath(__file__))+"/../tracers/qemu/"
     pin_dir = os.path.dirname(os.path.realpath(__file__))+"/../pin/"
     self.pinbinary = pin_dir+"pin-latest/pin"
 

static2/builtin/loader.py

@@ -70,7 +70,7 @@ def load_binary(static):
                            section['sh_addr'] + PLT_ENTRY_SIZE + PLT_ENTRY_SIZE*len(plt_symbols),
                            PLT_ENTRY_SIZE)):
               static[addr]['name'] = name
-            print plt_symbols, section['sh_addr']
+            #print plt_symbols, section['sh_addr']
 
 
     if isinstance(section, SymbolTableSection):