Merge from subtype.

[cacao.git] / src / native / llni.c

diff --git a/src/native/llni.c b/src/native/llni.c
index 803dbcb6fe614019cf22bbdc8bd72667f05bc88f..02c171b7bc1ef05ac449846de7a967609a6502b4 100644 (file)
--- a/src/native/llni.c
+++ b/src/native/llni.c
@@ -1,9 +1,7 @@
 /* src/native/llni.c - low level native interfarce (LLNI)
 
-   Copyright (C) 2007 R. Grafl, A. Krall, C. Kruegel,
-   C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
-   E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
-   J. Wenninger, Institut f. Computersprachen - TU Wien
+   Copyright (C) 2007, 2008
+   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
 
@@ -22,8 +20,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id$
-
 */
 
 
@@ -31,7 +27,7 @@
 
 #include <assert.h>
 
-#include "threads/threads-common.h"
+#include "threads/thread.hpp"
 
 
 /* LLNI critical sections ******************************************************
@@ -42,22 +38,30 @@
 *******************************************************************************/
 
 #if defined(ENABLE_THREADS) && defined(ENABLE_GC_CACAO)
-void llni_critical_start(void)
+void llni_critical_start_thread(threadobject *t)
 {
-       threadobject *t = THREADOBJECT;
-
        assert(!t->gc_critical);
        t->gc_critical = true;
 }
 
 
-void llni_critical_end(void)
+void llni_critical_end_thread(threadobject *t)
 {
-       threadobject *t = THREADOBJECT;
-
        assert(t->gc_critical);
        t->gc_critical = false;
 }
+
+
+void llni_critical_start()
+{
+       llni_critical_start_thread(THREADOBJECT);
+}
+
+
+void llni_critical_end()
+{
+       llni_critical_end_thread(THREADOBJECT);
+}
 #endif /* defined(ENABLE_THREADS) && defined(ENABLE_GC_CACAO) */