From c441974826572b713174c571104bdf9bd37c018b Mon Sep 17 00:00:00 2001 From: Brian Demsky Date: Sun, 20 May 2012 23:20:43 -0700 Subject: [PATCH] fix code to be 64 bit clean --- threads.cc | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/threads.cc b/threads.cc index 9929774..0ed7bdc 100644 --- a/threads.cc +++ b/threads.cc @@ -1,3 +1,5 @@ +/* -*- Mode: C; indent-tabs-mode: t -*- */ + #include "libthreads.h" #include "common.h" #include "threads.h" @@ -22,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; @@ -36,7 +45,7 @@ int Thread::create_context() context.uc_stack.ss_size = STACK_SIZE; context.uc_stack.ss_flags = 0; context.uc_link = model->get_system_context(); - makecontext(&context, start_routine, 1, arg); + makecontext(&context, start_routine, 1); return 0; } @@ -61,7 +70,6 @@ void Thread::complete() } } - Thread::Thread(thrd_t *t, void (*func)(), void *a) { int ret; -- 2.34.1