* src/native/llni.h (LLNI_objectarray_element_set) Removed.

(LLNI_objectarray_element_get) Removed.

* src/native/jni.c: Use array_objectarray functions throughout the code.
* src/vm/builtin.c: Likewise.

diff --git a/src/native/jni.c b/src/native/jni.c
index 5f3379ecbb80668e82438a8780ca003efa820e35..0e5f6907ddfec97ca56c51c1aa76fedc44a9bc74 100644 (file)
--- a/src/native/jni.c
+++ b/src/native/jni.c
@@ -91,6 +91,7 @@
 
 #include "toolbox/logging.h"
 
+#include "vm/array.h"
 #include "vm/builtin.h"
 #include "vm/exceptions.h"
 #include "vm/global.h"
@@ -2875,7 +2876,7 @@ jobjectArray _Jv_JNI_NewObjectArray(JNIEnv *env, jsize length,
        /* set all elements to initialElement */
 
        for (i = 0; i < length; i++)
-               LLNI_objectarray_element_set(oa, i, o);
+               array_objectarray_element_set(oa, i, o);
 
        return (jobjectArray) _Jv_JNI_NewLocalRef(env, (jobject) oa);
 }
@@ -2896,7 +2897,7 @@ jobject _Jv_JNI_GetObjectArrayElement(JNIEnv *env, jobjectArray array,
                return NULL;
        }
 
-       LLNI_objectarray_element_get(oa, index, o);
+       o = array_objectarray_element_get(oa, index);
 
        return _Jv_JNI_NewLocalRef(env, (jobject) o);
 }
@@ -2924,7 +2925,7 @@ void _Jv_JNI_SetObjectArrayElement(JNIEnv *env, jobjectArray array,
        if (!builtin_canstore(LLNI_DIRECT(oa), LLNI_DIRECT(o)))
                return;
 
-       LLNI_objectarray_element_set(oa, index, o);
+       array_objectarray_element_set(oa, index, o);
 }
 
 

diff --git a/src/native/llni.h b/src/native/llni.h
index c5dfe0751a0fe69f64f6e30959e6e82d64a05c2d..dfb8275e8d15ae9388d55ad2194d45cd7276bafb 100644 (file)
--- a/src/native/llni.h
+++ b/src/native/llni.h
@@ -135,15 +135,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!

diff --git a/src/vm/builtin.c b/src/vm/builtin.c
index 4a435205cf9bb84238db5ded869e6c3ba18af5a9..14fc12700499cb2ee0e90965e620c9ff61bab1b9 100644 (file)
--- a/src/vm/builtin.c
+++ b/src/vm/builtin.c
@@ -1158,7 +1158,7 @@ static java_handle_t *builtin_multianewarray_intern(int n,
                if (!ea)
                        return NULL;
 
-               LLNI_objectarray_element_set((java_handle_objectarray_t *) a, i, ea);
+               array_objectarray_element_set((java_handle_objectarray_t *) a, i, ea);
        }
 
        return a;
@@ -2520,12 +2520,12 @@ void builtin_arraycopy(java_handle_t *src, s4 srcStart,
                        for (i = 0; i < len; i++) {
                                java_handle_t *o;
 
-                               LLNI_objectarray_element_get(oas, srcStart + i, o);
+                               o = array_objectarray_element_get(oas, srcStart + i);
 
                                if (!builtin_canstore(oad, o))
                                        return;
 
-                               LLNI_objectarray_element_set(oad, destStart + i, o);
+                               array_objectarray_element_set(oad, destStart + i, o);
                        }
                }
                else {
@@ -2538,12 +2538,12 @@ void builtin_arraycopy(java_handle_t *src, s4 srcStart,
                        for (i = len - 1; i >= 0; i--) {
                                java_handle_t *o;
 
-                               LLNI_objectarray_element_get(oas, srcStart + i, o);
+                               o = array_objectarray_element_get(oas, srcStart + i);
 
                                if (!builtin_canstore(oad, o))
                                        return;
 
-                               LLNI_objectarray_element_set(oad, destStart + i, o);
+                               array_objectarray_element_set(oad, destStart + i, o);
                        }
                }
        }