add new option for uninitialized writes...

diff --git a/main.cc b/main.cc
index d69e9e06e219b994a10f7ed398520ad5bd32a818..ab37af4cc02fa3368906ff8537ce56dd637d9d98 100644 (file)
--- a/main.cc
+++ b/main.cc
@@ -24,6 +24,7 @@ static void param_defaults(struct model_params *params)
        params->maxfuturevalues = 0;
        params->expireslop = 10;
        params->verbose = !!DBG_ENABLED();
        params->maxfuturevalues = 0;
        params->expireslop = 10;
        params->verbose = !!DBG_ENABLED();

+       params->uninitvalue = 0;

 }
 
 static void print_usage(struct model_params *params)
 }
 
 static void print_usage(struct model_params *params)


@@ -52,14 +53,15 @@ static void print_usage(struct model_params *params)
 "-e                    Enabled count. Default: %d\n"
 "-b                    Upper length bound. Default: %d\n"
 "-v                    Print verbose execution information.\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",
 "--                    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)
 {
        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) {
        int opt;
        bool error = false;
        while (!error && (opt = getopt(argc, argv, shortopts)) != -1) {


@@ -91,6 +93,9 @@ static void parse_options(struct model_params *params, int argc, char **argv)
                case 'v':
                        params->verbose = 1;
                        break;
                case 'v':
                        params->verbose = 1;
                        break;

+               case 'u':
+                       params->uninitvalue = atoi(optarg);
+                       break;

                case 'y':
                        params->yieldon = true;
                        break;
                case 'y':
                        params->yieldon = true;
                        break;

diff --git a/model.cc b/model.cc
index d2a2c744bea23c0462db61861a6be583f2d50cef..0122922d376ca03a742f03729585f3c48db7b09a 100644 (file)
--- a/model.cc
+++ b/model.cc
@@ -2827,7 +2827,7 @@ ModelAction * ModelChecker::get_uninitialized_action(const ModelAction *curr) co
        Node *node = curr->get_node();
        ModelAction *act = node->get_uninit_action();
        if (!act) {
        Node *node = curr->get_node();
        ModelAction *act = node->get_uninit_action();
        if (!act) {

-               act = new ModelAction(ATOMIC_UNINIT, std::memory_order_relaxed, curr->get_location(), 0, model_thread);
+               act = new ModelAction(ATOMIC_UNINIT, std::memory_order_relaxed, curr->get_location(), model->params.uninitvalue, model_thread);

                node->set_uninit_action(act);
        }
        act->create_cv(NULL);
                node->set_uninit_action(act);
        }
        act->create_cv(NULL);

diff --git a/model.h b/model.h
index ae9706b124067e18e5098e0fbd7e7859fce05d73..96c1ec78a60ca343400c309b2e756ae53fb39967 100644 (file)
--- a/model.h
+++ b/model.h
@@ -42,6 +42,7 @@ struct model_params {
        unsigned int fairwindow;
        unsigned int enabledcount;
        unsigned int bound;
        unsigned int fairwindow;
        unsigned int enabledcount;
        unsigned int bound;

+       unsigned int uninitvalue;

 
        /** @brief Maximum number of future values that can be sent to the same
         *  read */
 
        /** @brief Maximum number of future values that can be sent to the same
         *  read */