tests/test_cmds.sh

@@ -135,6 +135,9 @@ do_tests()
 				zafl_context_sensitive_laf_domgraph)
 					zafl.sh $progpath $protected --rida --enable-laf --enable-context-sensitivity function -d --tempdir $temp_dir > test_${prog}.ps.log 2>&1
 				;;
+				zafl_context_sensitive_laf_domgraph_optgraph)
+					zafl.sh $progpath $protected --rida --enable-laf --enable-context-sensitivity function -d -g --tempdir $temp_dir > test_${prog}.ps.log 2>&1
+				;;
 				laf)
 					$PSZ $progpath $protected -s rida -c laf --tempdir $temp_dir > test_${prog}.ps.log 2>&1
 				;;

tools/ps_analyze.sh

@@ -247,30 +247,30 @@ set_step_option()
 usage()
 {
 	echo "Protect an input program, generating a new executable."
-	echo "ps_analyze.sh <input> <output> <options>  "
-	echo 
-	echo "Where options can be any of:"
+	echo "Program Parameters are: <infile> <outfile> <options>  "
+	echo ""
+	echo "Where <options> can be any of:"
 	echo
 	echo "   --step <stepname>[=(on|off)]           Turn the <stepname> step on or off."
-	echo "   -s <stepname>[=(on|off)]		Same as --step."
+	echo "   -s <stepname>[=(on|off)]               Same as --step."
 	echo "   --critical-step <stepname>[=(on|off)]  Same as --step, but exits with error code if step fails."
-	echo "   -c <stepname>[=(on|off)]    		Same as --critical-step."
-	echo "   --step-option [<stepname>:]<option>	Pass additional option to step <stepname>.  If stepname "
+	echo "   -c <stepname>[=(on|off)]               Same as --critical-step."
+	echo "   --step-option [<stepname>:]<option>    Pass additional option to step <stepname>.  If stepname "
 	echo "                                          is omitted, the last named step (in a -s, -c or -o command"
 	echo "                                          is used."
-	echo
-	echo "   -o <stepname>:<option>			Same as --step-option."
-	echo "   --timeout				Specify a timeout for ps_analyze.sh."
-	echo "   --help					Print this page."
-	echo "   --usage				Same as --help"
-	echo "   --tempdir <dir>			Specify where the temporary analysis files are stored, "
+	echo ""
+	echo "   -o <stepname>:<option>                 Same as --step-option."
+	echo "   --timeout                              Specify a timeout for ps_analyze.sh."
+	echo "   --help                                 Print this page."
+	echo "   --usage                                Same as --help"
+	echo "   --tempdir <dir>                        Specify where the temporary analysis files are stored, "
 	echo "                                          default is peasoup_executable_directory.<exe>.<pid>"
 	echo
-	echo "   --stop-after <step>			Stop ps_analyze after completing the specified step."
-	echo "   --stop-before <step>			Stop ps_analyze before starting the specified step."
-	echo "   --dump-after <step>			Dump IR after completing the specified step."
-	echo "   --dump-before <step>			Dump IR before starting the specified step."
-	echo
+	echo "   --stop-after <step>                    Stop ps_analyze after completing the specified step."
+	echo "   --stop-before <step>                   Stop ps_analyze before starting the specified step."
+	echo "   --dump-after <step>                    Dump IR after completing the specified step."
+	echo "   --dump-before <step>                   Dump IR before starting the specified step."
+	echo ""
 	echo "Notes:"
 	echo "      1) Steps are applied in the order specified on the command line."
 	echo "      2) Options to steps are applied in the order given."