* src/native/llni.h (LLNI_equals): Added macro.

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

diff --git a/src/native/llni.h b/src/native/llni.h
index af6a2b16f42c9e54908a1aa0cb4b4808826ce024..c5dfe0751a0fe69f64f6e30959e6e82d64a05c2d 100644 (file)
--- a/src/native/llni.h
+++ b/src/native/llni.h
@@ -73,6 +73,42 @@
        (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.
+
+******************************************************************************/
+
+#define LLNI_classinfo_field_get(cls, field, variable) \
+       LLNI_CRITICAL_START; \
+       (variable) = LLNI_WRAP((cls)->field); \
+       LLNI_CRITICAL_END
+
+
+/* LLNI_classinfo_field_set ***************************************************
+ 
+   Set a field from classinfo that is a java object.
+
+******************************************************************************/
+
+#define LLNI_classinfo_field_set(cls, field, variable) \
+       LLNI_CRITICAL_START; \
+       (cls)->field = LLNI_UNWRAP(variable); \
+       LLNI_CRITICAL_END
+
+
 /* LLNI classinfo wrapping / unwrapping macros *********************************
 
    The following macros are used to wrap or unwrap a classinfo from
@@ -102,7 +138,7 @@
 /* XXX document me */
 
 #define LLNI_objectarray_element_set(arr, index, reference) \
-       LLNI_array_direct(arr, index) = LLNI_DIRECT(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))
@@ -121,8 +157,8 @@
 # define LLNI_UNWRAP(hdl) ((hdl) == NULL ? NULL : (hdl)->heap_object)
 # define LLNI_DIRECT(obj) ((obj)->heap_object)
 #else
-# define LLNI_WRAP(obj)   ((java_handle_t *) obj)
-# define LLNI_UNWRAP(hdl) ((java_object_t *) hdl)
+# define LLNI_WRAP(obj)   (obj)
+# define LLNI_UNWRAP(hdl) (hdl)
 # define LLNI_DIRECT(obj) (obj)
 #endif