X-Git-Url: http://plrg.eecs.uci.edu/git/?p=cdsspec-compiler.git;a=blobdiff_plain;f=main.cc;h=d489d96eb459b5263d6d8a4032e31f39c28127c9;hp=d2d8d4ab835a5d44d35789f1075f8f7d55a09063;hb=698f6194f9e5cc5905727c1798c36fede8c7ce8a;hpb=f3359dd1b9ba12e5092504e8e53e3615bdb2956a

diff --git a/main.cc b/main.cc
index d2d8d4a..d489d96 100644
--- a/main.cc
+++ b/main.cc
@@ -35,6 +35,7 @@ static void param_defaults(struct model_params *params)
 
 static void print_usage(const char *program_name, struct model_params *params)
 {
+	ModelVector<TraceAnalysis *> * registeredanalysis=getRegisteredTraceAnalysis();
 	/* Reset defaults before printing */
 	param_defaults(params);
 
@@ -45,7 +46,7 @@ static void print_usage(const char *program_name, struct model_params *params)
 "\n"
 "Usage: %s [MODEL-CHECKER OPTIONS] -- [PROGRAM ARGS]\n"
 "\n"
-"MODLE-CHECKER OPTIONS can be any of the model-checker options listed below. Arguments\n"
+"MODEL-CHECKER OPTIONS can be any of the model-checker options listed below. Arguments\n"
 "provided after the `--' (the PROGRAM ARGS) are passed to the user program.\n"
 "\n"
 "Model-checker options:\n"
@@ -62,7 +63,8 @@ static void print_usage(const char *program_name, struct model_params *params)
 "                              Default: %d\n"
 "-S, --fvslop=NUM            Future value expiration sloppiness.\n"
 "                              Default: %u\n"
-"-y, --yield                 Enable CHESS-like yield-based fairness support.\n"
+"-y, --yield                 Enable CHESS-like yield-based fairness support\n"
+"                              (requires thrd_yield() in test program).\n"
 "                              Default: %s\n"
 "-Y, --yieldblock            Prohibit an execution from running a yield.\n"
 "                              Default: %s\n"
@@ -74,12 +76,15 @@ static void print_usage(const char *program_name, struct model_params *params)
 "                              Default: %d\n"
 "-b, --bound=MAX             Upper length bound.\n"
 "                              Default: %d\n"
-"-v, --verbose               Print verbose execution information.\n"
+"-v[NUM], --verbose[=NUM]    Print verbose execution information. NUM is optional:\n"
+"                              0 is quiet; 1 is noisy; 2 is noisier.\n"
+"                              Default: %d\n"
 "-u, --uninitialized=VALUE   Return VALUE any load which may read from an\n"
 "                              uninitialized atomic.\n"
 "                              Default: %u\n"
-"-t, --analysis=NAME         Use Trace Analysis.\n"
-"-o, --options=NAME          Options.\n"
+"-t, --analysis=NAME         Use Analysis Plugin.\n"
+"-o, --options=NAME          Option for previous analysis plugin.  \n"
+"                            -o help for a list of options\n"
 " --                         Program arguments follow.\n\n",
 		program_name,
 		params->maxreads,
@@ -91,7 +96,13 @@ static void print_usage(const char *program_name, struct model_params *params)
 		params->fairwindow,
 		params->enabledcount,
 		params->bound,
+		params->verbose,
 		params->uninitvalue);
+	model_print("Analysis plugins:\n");
+	for(unsigned int i=0;i<registeredanalysis->size();i++) {
+		TraceAnalysis * analysis=(*registeredanalysis)[i];
+		model_print("%s\n", analysis->name());
+	}
 	exit(EXIT_SUCCESS);
 }