X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=main.cc;h=8416a79c88db8b35b5d706413d36da8160b3afc0;hb=f0b1d5cb87fd3ae41c325045b6bbf9554e7116f9;hp=d2d8d4ab835a5d44d35789f1075f8f7d55a09063;hpb=f3359dd1b9ba12e5092504e8e53e3615bdb2956a;p=model-checker.git

diff --git a/main.cc b/main.cc
index d2d8d4a..8416a79 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"
@@ -74,12 +75,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 +95,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);
 }