* src/vm/vm.c: Use array_objectarray functions instead of LLNI_objectarray.

* src/native/vm/gnu/gnu_classpath_VMStackWalker.c: Likewise.
* src/native/vm/gnu/java_lang_VMThrowable.c: Likewise.
* src/native/vm/java_lang_Class.c: Likewise.

diff --git a/src/native/vm/gnu/gnu_classpath_VMStackWalker.c b/src/native/vm/gnu/gnu_classpath_VMStackWalker.c
index b840ba558bee53c9cccfebb978e0865aa23c76f3..55187d3df3e357eb737a7eb3a10e6ec56f56d38b 100644 (file)
--- a/src/native/vm/gnu/gnu_classpath_VMStackWalker.c
+++ b/src/native/vm/gnu/gnu_classpath_VMStackWalker.c
@@ -36,6 +36,7 @@
 
 #include "native/include/gnu_classpath_VMStackWalker.h"
 
+#include "vm/array.h"
 #include "vm/builtin.h"
 #include "vm/global.h"
 
@@ -103,7 +104,7 @@ JNIEXPORT java_lang_Class* JNICALL Java_gnu_classpath_VMStackWalker_getCallingCl
        if (LLNI_array_size(oa) < 2)
                return NULL;
 
-       LLNI_objectarray_element_get(oa, 1, o);
+       o = array_objectarray_element_get(oa, 1);
 
        return (java_lang_Class *) o;
 }

diff --git a/src/native/vm/gnu/java_lang_VMThrowable.c b/src/native/vm/gnu/java_lang_VMThrowable.c
index ead575fb2e2e6ec2279b99062f712ad7d84bc9b8..6c612b4c2d93daf7259502aca4a8c9f62dc18418 100644 (file)
--- a/src/native/vm/gnu/java_lang_VMThrowable.c
+++ b/src/native/vm/gnu/java_lang_VMThrowable.c
@@ -44,6 +44,7 @@
 
 #include "native/vm/java_lang_Class.h"
 
+#include "vm/array.h"
 #include "vm/builtin.h"
 #include "vm/exceptions.h"
 #include "vm/stringlocal.h"
@@ -261,7 +262,7 @@ JNIEXPORT java_handle_objectarray_t* JNICALL Java_java_lang_VMThrowable_getStack
                LLNI_field_set_ref(o, methodName    , (java_lang_String *) javastring_new(ste->method->name));
                LLNI_field_set_val(o, isNative      , (ste->method->flags & ACC_NATIVE) ? 1 : 0);
 
-               LLNI_objectarray_element_set(oa, i, o);
+               array_objectarray_element_set(oa, i, (java_handle_t *) o);
        }
 
        return oa;

diff --git a/src/native/vm/java_lang_Class.c b/src/native/vm/java_lang_Class.c
index a877fa2984a4025f41d8e40e5915148a16670c32..a183722142114fe4630a566ad3d1ffbc719020f9 100644 (file)
--- a/src/native/vm/java_lang_Class.c
+++ b/src/native/vm/java_lang_Class.c
@@ -67,6 +67,7 @@
 
 #include "toolbox/logging.h"
 
+#include "vm/array.h"
 #include "vm/builtin.h"
 #include "vm/exceptions.h"
 #include "vm/global.h"
@@ -288,7 +289,7 @@ java_handle_objectarray_t *_Jv_java_lang_Class_getDeclaredFields(java_lang_Class
 
                        /* store object into array */
 
-                       LLNI_objectarray_element_set(oa, pos, rf);
+                       array_objectarray_element_set(oa, pos, (java_handle_t *) rf);
                        pos++;
                }
        }
@@ -352,7 +353,7 @@ java_handle_objectarray_t *_Jv_java_lang_Class_getDeclaredMethods(java_lang_Clas
 
                        /* store object into array */
 
-                       LLNI_objectarray_element_set(oa, pos, rm);
+                       array_objectarray_element_set(oa, pos, (java_handle_t *) rm);
                        pos++;
                }
        }
@@ -404,7 +405,7 @@ java_handle_objectarray_t *_Jv_java_lang_Class_getDeclaredConstructors(java_lang
 
                        /* store object into array */
 
-                       LLNI_objectarray_element_set(oa, pos, rc);
+                       array_objectarray_element_set(oa, pos, (java_handle_t *) rc);
                        pos++;
                }
        }

diff --git a/src/vm/vm.c b/src/vm/vm.c
index 9c42cb5686776391d0f40353dea6c0d2a228dd6e..c289e6798e7df83c9279769955f338d53072001b 100644 (file)
--- a/src/vm/vm.c
+++ b/src/vm/vm.c
@@ -62,6 +62,7 @@
 
 #include "toolbox/logging.h"
 
+#include "vm/array.h"
 #include "vm/builtin.h"
 #include "vm/exceptions.h"
 #include "vm/finalizer.h"
@@ -1763,7 +1764,7 @@ void vm_run(JavaVM *vm, JavaVMInitArgs *vm_args)
                u = utf_new_char(vm_args->options[opt_index + i].optionString);
                s = javastring_new(u);
 
-               LLNI_objectarray_element_set(oa, i, s);
+               array_objectarray_element_set(oa, i, s);
        }
 
 #ifdef TYPEINFO_DEBUG_TEST