Updates to ps_analye.sh to merge in changes from -r 15158:15159 from trunk,...

Updates to ps_analye.sh to merge in changes from -r 15158:15159 from trunk, also cleaned up do_makepeasoupbinary.sh for solaris.

Former-commit-id: 870cceb8a773927b5e2e0014282f0f5c184eb910

tools/do_makepeasoupbinary.sh

@@ -22,34 +22,7 @@ if [ -f $datapath/diagnostics.out ]; then
 	len=`cat $datapath/diagnostics.out | wc -l` 
 	if [ $len -gt 0 ]; then 
 
-        # make output more concise
-#		wc -l $datapath/diagnostics.out
-#	    sort $datapath/diagnostics.out | uniq > tmp.$$
-	    cat $datapath/diagnostics.out | uniq > tmp.$$
-		mv tmp.$$ $datapath/diagnostics.out
-
-		#echo "--------------------------------------------------------"
-		#echo "-        PEASOUP DETECTED AND CONFINED ERRORS          -"
-		#echo "- (and possibly detected that some errors were benign) -"
-		#echo "-               (Summarized below)                     -"
-		#echo "--------------------------------------------------------"
-		#cat $datapath/diagnostics.out
-
-		# report detector warnings to test manager
-		while read line
-		do
-			case $line in
-			POLICY:\ controlled\ exit*)
-				$GRACE_HOME/concolic/src/util/linux/controlled_exit.py -m "$line"
-				;;
-			POLICY:\ continue\ execution*)
-				$GRACE_HOME/concolic/src/util/linux/continue_execution.py -m "$line"
-				;;
-			*)
-				$GRACE_HOME/concolic/src/util/linux/general_message.py -m "$line"
-				;;
-			esac
-		done < $datapath/diagnostics.out
+	    head $datapath/diagnostics.out 
 	fi
 fi
 

tools/ps_analyze.sh

@@ -20,6 +20,11 @@ TWITCHER_TRANSFORM_TIMEOUT_VALUE=1800
 # Setting PN timeout to 6 hours for TNE. 
 PN_TIMEOUT_VALUE=21600
 
+# 
+# set default values for 
+#
+initial_off_phases="isr ret_shadow_stack determine_program add_confinement_section"
+
 #non-zero to use canaries in PN/P1, 0 to turn off canaries
 #DO_CANARIES=1
 #on for on and off for off
@@ -232,23 +237,24 @@ check_options()
 		exit -3;	
 	fi
 
-	# --step determine_program=(on|off) not specified on the command line
-	# default policy is off
-	# to make the default policy on, get rid of this block of code
-	echo $phases_off|egrep "determine_program" > /dev/null
-	if [ ! $? -eq 0 ];
-	then
-		# by default it's off
-		phases_off="$phases_off determine_program=off add_confinement_section=off"
-	fi
+	for phase in $initial_off_phases
+	do
 
-	# turn off isr
-	phases_off="$phases_off isr=off"
+		# --step $phase=(on|off) not specified on the command line
+		# default policy is off
+		# to make the default policy on, get rid of this block of code
+		echo $phases_off|egrep "$phase=" > /dev/null
+		if [ ! $? -eq 0 ];
+		then
+			# by default it's off
+			phases_off="$phases_off $phase=off"
+		fi
+	done
 
 	# turn off heaprand and double_free if twitcher is on for now
 	is_step_on twitchertransform
 	if [[ $? = 1 && "$TWITCHER_HOME" != "" ]]; then
-		phases_off="$phases_off heaprand=off double_free=off"
+		phases_off=" $phases_off heaprand=off double_free=off"
 	fi
 }
 
@@ -260,8 +266,10 @@ is_step_on()
 {
 	step=$1
 
-	echo $phases_off|egrep "$step=off" > /dev/null
-	if [ $? -eq 0 ] ; then
+
+	echo "$phases_off"|egrep " $step=off" > /dev/null
+	grep_res=$?
+	if [ $grep_res -eq 0 ] ; then
 		return 0
 	fi
 
@@ -759,7 +767,7 @@ perform_step fast_annot preLoaded_ILR2 $PEASOUP_HOME/tools/fast_annot.sh
 #
 # Do P1/Pn transform.
 #
-perform_step p1transform none $PEASOUP_HOME/tools/do_p1transform.sh $cloneid $newname.ncexe $newname.ncexe.annot $PEASOUP_HOME/tools/bed.sh $PN_TIMEOUT_VALUE $DO_CANARIES
+perform_step p1transform meds_static,clone $PEASOUP_HOME/tools/do_p1transform.sh $cloneid $newname.ncexe $newname.ncexe.annot $PEASOUP_HOME/tools/bed.sh $PN_TIMEOUT_VALUE $DO_CANARIES
 
 		
 #
@@ -768,8 +776,14 @@ perform_step p1transform none $PEASOUP_HOME/tools/do_p1transform.sh $cloneid $ne
 if [ -z "$program" ]; then
    program="unknown"
 fi
-perform_step integertransform none $PEASOUP_HOME/tools/do_integertransform.sh $cloneid $program $CONCOLIC_DIR $INTEGER_TRANSFORM_TIMEOUT_VALUE $intxform_warnings_only $intxform_detect_fp
-#perform_step calc_conflicts none $SECURITY_TRANSFORMS_HOME/libIRDB/test/calc_conflicts.exe $cloneid a.ncexe
+
+perform_step integertransform meds_static,clone $PEASOUP_HOME/tools/do_integertransform.sh $cloneid $program $CONCOLIC_DIR $INTEGER_TRANSFORM_TIMEOUT_VALUE $intxform_warnings_only $intxform_detect_fp $intxform_instrument_idioms
+
+
+#
+# perform step to instrument pgm with return shadow stack
+#
+perform_step ret_shadow_stack meds_static,clone $PEASOUP_HOME/tools/do_rss.sh $cloneid 
 
 #
 # Do Twitcher transform step if twitcher is present