updated usage.

tools/ps_analyze.sh

@@ -249,30 +249,31 @@ 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 "   --step <stepname>=(on|off) 		Turn the <stepname> step on or off"
-	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>"
-	echo "   -o <stepname>:<option>			Same as --step-option"
+	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 "   --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 "                                          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 "   -t					Same as --timeout"
-	echo "   --watchdog				Specify a watchdog timer for the protected program."
-	echo "   -w					Same as --watchdog"
 	echo "   --help					Print this page."
 	echo "   --usage				Same as --help"
-	echo "   --id <jobid>				Unsupported.  Ask an7s."
-	echo "   --name <dbname>			Unsupported.  Ask an7s."
-	echo "   --manual_test_script <scriptname>	Specify how to test to the program.  API documentation incomplete."
-	echo "   --manual_test_coverage_file <file>	Specify a profile for the program.  API documentation incomplete."
-	echo "   --tempdir <dir>			Specify where the temporary analysis files are stored, default is peasoup_executable_directory.<exe>.<pid>"
-	echo "   --backend <zipr|strata>		Specify the backend rewriting technology to use.  Default: Strata"
-	echo "   -b <zipr|strata>			same as --backend "
-	echo "   --stop-after <step>			Stop ps_analyze after completeling the specified step."
+	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 completeling 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."
 
 }