X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=threads.cc;h=37b0f1a87ee6fb9ac975a84c8df9adf018d808c5;hp=0ed7bdcabc084eabf0755c8df098b724d3c023c4;hb=18fb657b0c6f8abfe4048e5252a9ffab960acabc;hpb=c441974826572b713174c571104bdf9bd37c018b

diff --git a/threads.cc b/threads.cc
index 0ed7bdca..37b0f1a8 100644
--- a/threads.cc
+++ b/threads.cc
@@ -1,5 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t -*- */
-
 #include "libthreads.h"
 #include "common.h"
 #include "threads.h"
@@ -11,12 +9,12 @@
 
 static void * stack_allocate(size_t size)
 {
-	return userMalloc(size);
+	return malloc(size);
 }
 
 static void stack_free(void *stack)
 {
-	userFree(stack);
+	free(stack);
 }
 
 Thread * thread_current(void)
@@ -27,7 +25,7 @@ Thread * thread_current(void)
 /* This method just gets around makecontext not being 64-bit clean */
 
 void thread_startup() {
-	Thread * curr_thread=thread_current();
+	Thread * curr_thread = thread_current();
 	curr_thread->start_routine(curr_thread->arg);
 }
 
@@ -45,7 +43,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);
+	makecontext(&context, thread_startup, 0);
 
 	return 0;
 }
@@ -70,7 +68,7 @@ void Thread::complete()
 	}
 }
 
-Thread::Thread(thrd_t *t, void (*func)(), void *a) {
+Thread::Thread(thrd_t *t, void (*func)(void *), void *a) {
 	int ret;
 
 	user_thread = t;