fix code to be 64 bit clean

[c11tester.git] / threads.cc

diff --git a/threads.cc b/threads.cc
index 47a211c20fe37ea25bf2536dc26cbbc520437291..0ed7bdcabc084eabf0755c8df098b724d3c023c4 100644 (file)
--- a/threads.cc
+++ b/threads.cc
@@ -1,7 +1,6 @@
-#include <stdlib.h>
+/* -*- Mode: C; indent-tabs-mode: t -*- */
 
 #include "libthreads.h"
-#include "schedule.h"
 #include "common.h"
 #include "threads.h"
 
@@ -25,6 +24,13 @@ Thread * thread_current(void)
        return model->scheduler->get_current_thread();
 }
 
+/* This method just gets around makecontext not being 64-bit clean */
+
+void thread_startup() {
+       Thread * curr_thread=thread_current();
+       curr_thread->start_routine(curr_thread->arg);
+}
+
 int Thread::create_context()
 {
        int ret;
@@ -33,24 +39,25 @@ int Thread::create_context()
        if (ret)
                return ret;
 
-       /* start_routine == NULL means this is our initial context */
-       if (!start_routine)
-               return 0;
-
        /* Initialize new managed context */
        stack = stack_allocate(STACK_SIZE);
        context.uc_stack.ss_sp = stack;
        context.uc_stack.ss_size = STACK_SIZE;
        context.uc_stack.ss_flags = 0;
-       context.uc_link = &model->system_thread->context;
-       makecontext(&context, start_routine, 1, arg);
+       context.uc_link = model->get_system_context();
+       makecontext(&context, start_routine, 1);
 
        return 0;
 }
 
-int Thread::swap(Thread *t)
+int Thread::swap(Thread *t, ucontext_t *ctxt)
+{
+       return swapcontext(&t->context, ctxt);
+}
+
+int Thread::swap(ucontext_t *ctxt, Thread *t)
 {
-       return swapcontext(&this->context, &t->context);
+       return swapcontext(ctxt, &t->context);
 }
 
 void Thread::complete()
@@ -63,14 +70,6 @@ void Thread::complete()
        }
 }
 
-void * Thread::operator new(size_t size) {
-       return userMalloc(size);
-}
-
-void Thread::operator delete(void *ptr) {
-       userFree(ptr);
-}
-
 Thread::Thread(thrd_t *t, void (*func)(), void *a) {
        int ret;
 
@@ -86,20 +85,7 @@ Thread::Thread(thrd_t *t, void (*func)(), void *a) {
        state = THREAD_CREATED;
        id = model->get_next_id();
        *user_thread = id;
-}
-
-Thread::Thread(thrd_t *t) {
-       /* system thread */
-       user_thread = t;
-       start_routine = NULL;
-       arg = NULL;
-
-       create_context();
-       stack = NULL;
-       state = THREAD_CREATED;
-       id = model->get_next_id();
-       *user_thread = id;
-       model->add_system_thread(this);
+       parent = thread_current();
 }
 
 Thread::~Thread()
@@ -112,65 +98,3 @@ thread_id_t Thread::get_id()
 {
        return id;
 }
-
-/*
- * Return 1 if found next thread, 0 otherwise
- */
-static int thread_system_next(void)
-{
-       Thread *curr, *next;
-
-       curr = thread_current();
-       model->check_current_action();
-       if (curr) {
-               if (curr->get_state() == THREAD_READY)
-                       model->scheduler->add_thread(curr);
-               else if (curr->get_state() == THREAD_RUNNING)
-                       /* Stopped while running; i.e., completed */
-                       curr->complete();
-               else
-                       DEBUG("ERROR: current thread in unexpected state??\n");
-       }
-       next = model->scheduler->next_thread();
-       if (next)
-               next->set_state(THREAD_RUNNING);
-       DEBUG("(%d, %d)\n", curr ? curr->get_id() : -1, next ? next->get_id() : -1);
-       if (!next)
-               return 1;
-       return model->system_thread->swap(next);
-}
-
-static void thread_wait_finish(void)
-{
-
-       DBG();
-
-       while (!thread_system_next());
-}
-
-/*
- * Main system function
- */
-int main()
-{
-       thrd_t user_thread, main_thread;
-       Thread *th;
-
-       model = new ModelChecker();
-
-       th = new Thread(&main_thread);
-
-       do {
-               /* Start user program */
-               thrd_create(&user_thread, &user_main, NULL);
-
-               /* Wait for all threads to complete */
-               thread_wait_finish();
-       } while (model->next_execution());
-
-       delete th;
-       delete model;
-
-       DEBUG("Exiting\n");
-       return 0;
-}