Merged?

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

diff --git a/src/native/llni.h b/src/native/llni.h
index 8d4a8ca4b2c12baf96e64e2d0d2f1b26eb0a7181..a84f472131f371718b3e30d7c111789c5c95b451 100644 (file)
--- a/src/native/llni.h
+++ b/src/native/llni.h
@@ -32,6 +32,12 @@
 
 #include "native/localref.h"
 
+#if defined(ENABLE_THREADS)
+# include "threads/native/threads.h"
+#else
+# include "threads/none/threads.h"
+#endif
+
 
 /* LLNI macros *****************************************************************
 
@@ -55,7 +61,7 @@
        LLNI_field_direct(obj, field) = (value)
 
 #define LLNI_field_set_ref(obj, field, reference) \
-       LLNI_field_direct(obj, field) = LLNI_DIRECT(reference)
+       LLNI_field_direct(obj, field) = LLNI_UNWRAP(reference)
 
 #define LLNI_field_set_cls(obj, field, value) \
        LLNI_field_direct(obj, field) = (java_lang_Class *) (value)
@@ -73,6 +79,18 @@
        (variable) = LLNI_field_direct((java_handle_t *) obj, vftbl->class)
 
 
+/* LLNI_equals ****************************************************************
+ 
+   Test if two java_handle_t* point to the same java_object_t*.
+
+******************************************************************************/
+
+#define LLNI_equals(obj1, obj2, result) \
+       LLNI_CRITICAL_START; \
+       (result) = LLNI_UNWRAP(obj1) == LLNI_UNWRAP(obj2); \
+       LLNI_CRITICAL_END
+       
+
 /* LLNI_classinfo_field_get ***************************************************
  
    Get a field from classinfo that is a java object.
@@ -123,15 +141,6 @@
 #define LLNI_array_size(arr)          (LLNI_DIRECT((java_handle_objectarray_t *) (arr))->header.size)
 
 
-/* XXX document me */
-
-#define LLNI_objectarray_element_set(arr, index, reference) \
-       LLNI_array_direct(arr, index) = (java_object_t *) LLNI_DIRECT(reference)
-
-#define LLNI_objectarray_element_get(arr, index, variable) \
-       (variable) = LLNI_WRAP(LLNI_array_direct(arr, index))
-
-
 /* LLNI wrapping / unwrapping macros *******************************************
 
    ATTENTION: Only use these macros inside a LLNI critical section!
@@ -141,13 +150,15 @@
 *******************************************************************************/
 
 #if defined(ENABLE_HANDLES)
-# define LLNI_WRAP(obj)   ((obj) == NULL ? NULL : localref_add(obj))
-# define LLNI_UNWRAP(hdl) ((hdl) == NULL ? NULL : (hdl)->heap_object)
-# define LLNI_DIRECT(obj) ((obj)->heap_object)
+# define LLNI_WRAP(obj)      ((obj) == NULL ? NULL : localref_add(obj))
+# define LLNI_UNWRAP(hdl)    ((hdl) == NULL ? NULL : (hdl)->heap_object)
+# define LLNI_QUICKWRAP(obj) ((obj) == NULL ? NULL : &(obj))
+# define LLNI_DIRECT(hdl)    ((hdl)->heap_object)
 #else
-# define LLNI_WRAP(obj)   (obj)
-# define LLNI_UNWRAP(hdl) (hdl)
-# define LLNI_DIRECT(obj) (obj)
+# define LLNI_WRAP(obj)      (obj)
+# define LLNI_UNWRAP(hdl)    (hdl)
+# define LLNI_QUICKWRAP(obj) (obj)
+# define LLNI_DIRECT(hdl)    (hdl)
 #endif
 
 
@@ -163,15 +174,22 @@
 *******************************************************************************/
 
 #if defined(ENABLE_THREADS) && defined(ENABLE_GC_CACAO)
-void llni_critical_start(void);
-void llni_critical_end(void);
-# define LLNI_CRITICAL_START llni_critical_start()
-# define LLNI_CRITICAL_END   llni_critical_end()
+# define LLNI_CRITICAL_START           llni_critical_start()
+# define LLNI_CRITICAL_END             llni_critical_end()
+# define LLNI_CRITICAL_START_THREAD(t) llni_critical_start_thread(t)
+# define LLNI_CRITICAL_END_THREAD(t)   llni_critical_end_thread(t)
 #else
 # define LLNI_CRITICAL_START
 # define LLNI_CRITICAL_END
+# define LLNI_CRITICAL_START_THREAD(t)
+# define LLNI_CRITICAL_END_THREAD(t)
 #endif
 
+void llni_critical_start();
+void llni_critical_end();
+void llni_critical_start_thread(threadobject *t);
+void llni_critical_end_thread(threadobject *t);
+
 
 #endif /* _LLNI_H */