X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmini%2Ftasklets.c;h=e767f63125a6914d68d7258c3742ce08b2c4bed6;hb=HEAD;hp=9457633bafc1b81e5dcf27980522e6702e214274;hpb=2dc628d36f9ebd44d25126bfba00cffc6c2df8e4;p=mono.git

diff --git a/mono/mini/tasklets.c b/mono/mini/tasklets.c
index 9457633bafc..e767f63125a 100644
--- a/mono/mini/tasklets.c
+++ b/mono/mini/tasklets.c
@@ -1,3 +1,6 @@
+/**
+ * \file
+ */
 
 #include "config.h"
 #include "tasklets.h"
@@ -47,13 +50,14 @@ continuation_mark_frame (MonoContinuation *cont)
 	if (cont->domain)
 		return mono_get_exception_argument ("cont", "Already marked");
 
-	jit_tls = (MonoJitTlsData *)mono_native_tls_get_value (mono_jit_tls_id);
+	jit_tls = (MonoJitTlsData *)mono_tls_get_jit_tls ();
 	lmf = mono_get_lmf();
 	cont->domain = mono_domain_get ();
 	cont->thread_id = mono_native_thread_id_get ();
 
 	/* get to the frame that called Mark () */
 	memset (&rji, 0, sizeof (rji));
+	memset (&ctx, 0, sizeof (ctx));
 	do {
 		ji = mono_find_jit_info (cont->domain, jit_tls, &rji, NULL, &ctx, &new_ctx, NULL, &lmf, NULL, NULL);
 		if (!ji || ji == (gpointer)-1) {
@@ -149,6 +153,57 @@ void
 mono_tasklets_cleanup (void)
 {
 }
+#else
 
+static
+void continuations_not_supported (void)
+{
+	mono_set_pending_exception (mono_get_exception_not_implemented ("Tasklets are not implemented on this platform."));
+}
+
+static void*
+continuation_alloc (void)
+{
+	continuations_not_supported ();
+	return NULL;
+}
+
+static void
+continuation_free (MonoContinuation *cont)
+{
+	continuations_not_supported ();
+}
+
+static MonoException*
+continuation_mark_frame (MonoContinuation *cont)
+{
+	continuations_not_supported ();
+	return NULL;
+}
+
+static int
+continuation_store (MonoContinuation *cont, int state, MonoException **e)
+{
+	continuations_not_supported ();
+	return 0;
+}
+
+static MonoException*
+continuation_restore (MonoContinuation *cont, int state)
+{
+	continuations_not_supported ();
+	return NULL;
+}
+
+void
+mono_tasklets_init(void)
+{
+	mono_add_internal_call ("Mono.Tasklets.Continuation::alloc", continuation_alloc);
+	mono_add_internal_call ("Mono.Tasklets.Continuation::free", continuation_free);
+	mono_add_internal_call ("Mono.Tasklets.Continuation::mark", continuation_mark_frame);
+	mono_add_internal_call ("Mono.Tasklets.Continuation::store", continuation_store);
+	mono_add_internal_call ("Mono.Tasklets.Continuation::restore", continuation_restore);
+
+}
 #endif