* src/vm/jit/trace.c (trace_java_call_print_argument): Deals with java_object_t.

[cacao.git] / src / vmcore / field.c

diff --git a/src/vmcore/field.c b/src/vmcore/field.c
index 0b41cf43d6ed903815f76308a81b50376b1d4990..f1fb070081c3e85154ad371dc5b8b8a5ec0648eb 100644 (file)
--- a/src/vmcore/field.c
+++ b/src/vmcore/field.c
@@ -22,8 +22,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: field.c 8321 2007-08-16 11:37:25Z michi $
-
 */
 
 
@@ -37,8 +35,7 @@
 
 #include "vm/types.h"
 
-#include "mm/memory.h"
-
+#include "vm/array.h"
 #include "vm/builtin.h"
 #include "vm/exceptions.h"
 #include "vm/global.h"
@@ -386,35 +383,36 @@ void field_free(fieldinfo *f)
 }
 
 
-#if defined(ENABLE_ANNOTATIONS)
 /* field_get_annotations ******************************************************
 
    Gets a fields' annotations (or NULL if none).
 
 *******************************************************************************/
 
-java_bytearray *field_get_annotations(fieldinfo *f)
+java_handle_bytearray_t *field_get_annotations(fieldinfo *f)
 {
-       classinfo              *c           = f->class;
-       int                     slot        = f - c->fields;
-       annotation_bytearray_t *ba          = NULL;
-       java_bytearray         *annotations = NULL;
+#if defined(ENABLE_ANNOTATIONS)
+       classinfo               *c;
+       int                      slot;
+       java_handle_bytearray_t *annotations;
+       java_handle_t           *a;
+
+       c           = f->class;
+       slot        = f - c->fields;
+       annotations = NULL;
+       a           = (java_handle_t*)c->field_annotations;
        
-       if (c->field_annotations != NULL && c->field_annotations->size > slot) {
-               ba = c->field_annotations->data[slot];
-               
-               if (ba != NULL) {
-                       annotations = builtin_newarray_byte(ba->size);
-                       
-                       if (annotations != NULL) {
-                               MCOPY(annotations->data, ba->data, uint8_t, ba->size);
-                       }
-               }
+       if (c->field_annotations != NULL && array_length_get(a) > slot) {
+               annotations = (java_handle_bytearray_t*)
+                       array_objectarray_element_get(
+                               c->field_annotations, slot);
        }
        
        return annotations;
-}
+#else
+       return NULL;
 #endif
+}
 
 
 /* field_printflags ************************************************************