X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=main.cc;h=6459f139d7b01e78ad8b7c3fcfb4ca6cfd26a451;hb=d775a7d6624fa14284c4a273d039bedd21a1f55c;hp=693e93c979244ed9061693be03df9f6029cda6d8;hpb=90471233ff4dcca9a196152574dca4e7cf183698;p=model-checker.git

diff --git a/main.cc b/main.cc
index 693e93c..6459f13 100644
--- a/main.cc
+++ b/main.cc
@@ -16,14 +16,15 @@
 static void param_defaults(struct model_params *params)
 {
 	params->maxreads = 0;
-	params->maxfuturedelay = 100;
+	params->maxfuturedelay = 6;
 	params->fairwindow = 0;
 	params->yieldon = false;
 	params->enabledcount = 1;
 	params->bound = 0;
 	params->maxfuturevalues = 0;
-	params->expireslop = 10;
+	params->expireslop = 4;
 	params->verbose = !!DBG_ENABLED();
+	params->uninitvalue = 0;
 }
 
 static void print_usage(struct model_params *params)
@@ -32,6 +33,10 @@ static void print_usage(struct model_params *params)
 	param_defaults(params);
 
 	model_print(
+"Copyright (c) 2013 Regents of the University of California. All rights reserved.\n"
+"Distributed under the GPLv2\n"
+"Written by Brian Norris and Brian Demsky\n"
+"\n"
 "Usage: <program name> [MC_OPTIONS] -- [PROGRAM ARGUMENTS]\n"
 "\n"
 "Options:\n"
@@ -47,18 +52,20 @@ static void print_usage(struct model_params *params)
 "-f                    Specify a fairness window in which actions that are\n"
 "                      enabled sufficiently many times should receive\n"
 "                      priority for execution. Default: %d\n"
-"-y                    Turn on yield support. Default: %d\n"
+"-y                    Turn on CHESS yield-based fairness support.\n"
+"                      Default: %d\n"
 "-e                    Enabled count. Default: %d\n"
 "-b                    Upper length bound. Default: %d\n"
 "-v                    Print verbose execution information.\n"
+"-u                    Value for uninitialized reads. Default: %u\n"
 "--                    Program arguments follow.\n\n",
-params->maxreads, params->maxfuturevalues, params->maxfuturedelay, params->expireslop, params->fairwindow, params->yieldon, params->enabledcount, params->bound);
+params->maxreads, params->maxfuturevalues, params->maxfuturedelay, params->expireslop, params->fairwindow, params->yieldon, params->enabledcount, params->bound, params->uninitvalue);
 	exit(EXIT_SUCCESS);
 }
 
 static void parse_options(struct model_params *params, int argc, char **argv)
 {
-	const char *shortopts = "hym:M:s:S:f:e:b:v";
+	const char *shortopts = "hym:M:s:S:f:e:b:u:v";
 	int opt;
 	bool error = false;
 	while (!error && (opt = getopt(argc, argv, shortopts)) != -1) {
@@ -90,6 +97,9 @@ static void parse_options(struct model_params *params, int argc, char **argv)
 		case 'v':
 			params->verbose = 1;
 			break;
+		case 'u':
+			params->uninitvalue = atoi(optarg);
+			break;
 		case 'y':
 			params->yieldon = true;
 			break;