More code towards freeing old actions

[c11tester.git] / main.cc

diff --git a/main.cc b/main.cc
index 9ed1bc6cd35de7bef9ecfadc538ec1854f825822..17bc71c86a87783614ffe5200e68d54ff0fc12c1 100644 (file)
--- a/main.cc
+++ b/main.cc
@@ -20,8 +20,8 @@
 void param_defaults(struct model_params *params)
 {
        params->verbose = !!DBG_ENABLED();
-       params->uninitvalue = 0;
        params->maxexecutions = 10;
+       params->tracebound = 0;
        params->nofork = false;
 }
 
@@ -47,9 +47,6 @@ static void print_usage(struct model_params *params)
                "                              0 is quiet; 1 shows valid executions; 2 is noisy;\n"
                "                              3 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 Analysis Plugin.\n"
                "-o, --options=NAME          Option for previous analysis plugin.  \n"
                "-x, --maxexec=NUM           Maximum number of executions.\n"
@@ -57,7 +54,6 @@ static void print_usage(struct model_params *params)
                "                            -o help for a list of options\n"
                "-n                          No fork\n\n",
                params->verbose,
-               params->uninitvalue,
                params->maxexecutions);
        model_print("Analysis plugins:\n");
        for(unsigned int i=0;i<registeredanalysis->size();i++) {
@@ -83,11 +79,10 @@ bool install_plugin(char * name) {
 }
 
 void parse_options(struct model_params *params) {
-       const char *shortopts = "hnt:o:u:x:v::";
+       const char *shortopts = "hnt:o:x:v::";
        const struct option longopts[] = {
                {"help", no_argument, NULL, 'h'},
                {"verbose", optional_argument, NULL, 'v'},
-               {"uninitialized", required_argument, NULL, 'u'},
                {"analysis", required_argument, NULL, 't'},
                {"options", required_argument, NULL, 'o'},
                {"maxexecutions", required_argument, NULL, 'x'},
@@ -101,17 +96,23 @@ void parse_options(struct model_params *params) {
        if (options == NULL)
                return;
        int argc = 1;
-       for(int index = 0;options[index]!=0;index++) {
+       int index;
+       for(index = 0;options[index]!=0;index++) {
                if (options[index] == ' ')
                        argc++;
        }
        argc++; //first parameter is executable name
+       char optcpy[index + 1];
+       memcpy(optcpy, options, index+1);
        char * argv[argc + 1];
        argv[0] = NULL;
-       argv[1] = options;
-       for(int index = 0, count = 2;options[index]!=0;index++) {
-               if (options[index]==' ')
-                       argv[count++] = &options[index];
+       argv[1] = optcpy;
+       int count = 2;
+       for(index = 0;optcpy[index]!=0;index++) {
+               if (optcpy[index] == ' ') {
+                       argv[count++] = &optcpy[index+1];
+                       optcpy[index] = 0;
+               }
        }
 
        while (!error && (opt = getopt_long(argc, argv, shortopts, longopts, &longindex)) != -1) {
@@ -128,9 +129,6 @@ void parse_options(struct model_params *params) {
                case 'v':
                        params->verbose = optarg ? atoi(optarg) : 1;
                        break;
-               case 'u':
-                       params->uninitvalue = atoi(optarg);
-                       break;
                case 't':
                        if (install_plugin(optarg))
                                error = true;