Committing tools -- these should not adversely affect ps_analyze.sh

tools/do_concolic.sh

@@ -39,7 +39,7 @@ for i in `ipcs -q|grep $whoami |cut -d" " -f 2`;
 do
 	ipcrm -q $i
 done
-STRATA_GRACE=1 controller $extra_args --start $start_ea --stop $stop_ea --symbols $sym --outputs replay $strata_exe
+STRATA_GRACE=1 controller $extra_args --start $start_ea --stop $stop_ea --symbols $sym --outputs replay,coverage,instruction_addresses $strata_exe
 
 echo cleaning up
 killall -q controller

tools/p1xform.doxform.sh

@@ -29,8 +29,8 @@ do
   cat $ASPRI_DIR/p1.$fn.aspri >> $NEW_ASPRI_FILE
 done < $FNS
 
-echo "p1xform.doxform.sh: issuing cmd: $STRATA_REWRITE/tools/spasm/spasm $NEW_ASPRI_FILE $FINAL_BSPRI_FILE"
-$STRATA_REWRITE/tools/spasm/spasm $NEW_ASPRI_FILE $FINAL_BSPRI_FILE
+echo "p1xform.doxform.sh: issuing cmd: $SECURITY_TRANSFORMS/tools/spasm/spasm $NEW_ASPRI_FILE $FINAL_BSPRI_FILE"
+$SECURITY_TRANSFORMS/tools/spasm/spasm $NEW_ASPRI_FILE $FINAL_BSPRI_FILE
 
 if [ -z $FINAL_BSPRI_FILE ]; then
   echo "p1xform.doxform.sh: Warning: no transforms specified for P1 algorithm"

tools/p1xform.genspri.sh

@@ -11,7 +11,7 @@ ANNOT=$3    # path of annotations for the original binary
 #
 # to do: split the above into distinct commands/options combinations
 
-$STRATA_REWRITE/tools/transforms/p1transform $BINARY $ANNOT 
+$SECURITY_TRANSFORMS/tools/transforms/p1transform $BINARY $ANNOT 
 
 ASPRI_DIR=$P1_DIR/aspri
 BSPRI_DIR=$P1_DIR/bspri
@@ -33,7 +33,7 @@ mv p1.*candid* $P1_DIR
 for i in `ls $ASPRI_DIR/*p1*.aspri`
 do
   base=`basename $i .aspri`
-  $STRATA_REWRITE/tools/spasm/spasm $i $BSPRI_DIR/"$base".bspri  
+  $SECURITY_TRANSFORMS/tools/spasm/spasm $i $BSPRI_DIR/"$base".bspri  
 done
 
 echo "Done generating initial spri files"

tools/p1xform.sh

@@ -38,8 +38,8 @@ FINAL_XFORM_FNS=$P1_DIR/p1.final
 EXECUTED_ADDRESS_FILE=$CONCOLIC/executed_address_list.txt
 
 #grep "^0x" $CONCOLIC/trace_manager.run_*.log | cut -f2 -d":" | sort | uniq > tmp.$$ 
-#$STRATA_REWRITE/tools/cover/cover a.ncexe a.ncexe.annot tmp.$$ $COVERAGE_FNS
-$STRATA_REWRITE/tools/cover/cover a.ncexe a.ncexe.annot $EXECUTED_ADDRESS_FILE $COVERAGE_FNS
+#$SECURITY_TRANSFORMS/tools/cover/cover a.ncexe a.ncexe.annot tmp.$$ $COVERAGE_FNS
+$SECURITY_TRANSFORMS/tools/cover/cover a.ncexe a.ncexe.annot $EXECUTED_ADDRESS_FILE $COVERAGE_FNS
 grep -v "0\.0" $COVERAGE_FNS | cut -f1 -d" " > $CANDIDATE_FNS
 grep  "0\.0" $COVERAGE_FNS | cut -f1 -d" " > $FILTERED_OUT
 #rm tmp.$$