fix various problems with my 64-bit clean hack

[model-checker.git] / main.cc

diff --git a/main.cc b/main.cc
index c7c348fd7de1216bcdf7e775346b80f1ec0e11fc..d24602bea33fa2139975d5b148c4bfc509129345 100644 (file)
--- a/main.cc
+++ b/main.cc
@@ -1,20 +1,20 @@
-#include <stdlib.h>
+/* -*- Mode: C; indent-tabs-mode: t -*- */
 
 #include "libthreads.h"
-#include "schedule.h"
 #include "common.h"
 #include "threads.h"
 
 /* global "model" object */
 #include "model.h"
+#include "snapshot.h"
+#include "snapshot-interface.h"
 
 /*
  * Return 1 if found next thread, 0 otherwise
  */
-static int thread_system_next(void)
-{
+static int thread_system_next(void) {
        Thread *curr, *next;
-
+  
        curr = thread_current();
        if (curr) {
                if (curr->get_state() == THREAD_READY) {
@@ -35,39 +35,50 @@ static int thread_system_next(void)
        return Thread::swap(model->get_system_context(), next);
 }
 
-static void thread_wait_finish(void)
-{
-
+static void thread_wait_finish(void) {
        DBG();
 
        while (!thread_system_next());
 }
 
-/*
- * Main system function
- */
-int main()
-{
+void real_main() {
        thrd_t user_thread;
        ucontext_t main_context;
 
+       //Create the singleton snapshotStack object
+       snapshotObject = new snapshotStack();
+  
        model = new ModelChecker();
-
+  
        if (getcontext(&main_context))
-               return 1;
-
+               return;
+  
        model->set_system_context(&main_context);
 
        do {
                /* Start user program */
-               model->add_thread(new Thread(&user_thread, &user_main, NULL));
-
+               model->add_thread(new Thread(&user_thread, (void (*)(void *)) &user_main, NULL));
+    
                /* Wait for all threads to complete */
                thread_wait_finish();
        } while (model->next_execution());
-
+  
        delete model;
-
+  
        DEBUG("Exiting\n");
-       return 0;
+}
+
+int main_numargs;
+char ** main_args;
+
+/*
+ * Main system function
+ */
+int main(int numargs, char ** args) {
+       /* Stash this stuff in case someone wants it eventually */
+       main_numargs=numargs;
+       main_args=args;
+
+       /* Let's jump in quickly and start running stuff */
+       initSnapShotLibrary(10000 /*int numbackingpages*/, 1024 /*unsigned int numsnapshots*/, 1024 /*unsigned int nummemoryregions*/ , 1000 /*int numheappages*/, &real_main /*MyFuncPtr entryPoint*/);
 }