* src/vm/jit/i386/darwin/md-os.c (md_replace_executionstate_read):
[cacao.git] / src / native / vm / gnu / java_lang_reflect_Field.c
index b738105eb74b5f8e1ec54503348dc083ac01cb2b..0dcc8c7e351f883c71b81120512327c19a751965 100644 (file)
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: java_lang_reflect_Field.c 7464 2007-03-06 00:26:31Z edwin $
-
 */
 
 
 #include "config.h"
 
 #include <assert.h>
-
-#include "vm/types.h"
+#include <stdint.h>
 
 #include "native/jni.h"
+#include "native/llni.h"
 #include "native/native.h"
+
 #include "native/include/java_lang_Boolean.h"
 #include "native/include/java_lang_Byte.h"
 #include "native/include/java_lang_Character.h"
 #include "native/include/java_lang_Object.h"
 #include "native/include/java_lang_Class.h"
 #include "native/include/java_lang_String.h"
+
 #include "native/include/java_lang_reflect_Field.h"
 
+#if defined(ENABLE_ANNOTATIONS)
+#include "native/include/java_util_Map.h"
+#include "native/include/sun_reflect_ConstantPool.h"
+#include "native/vm/reflect.h"
+#endif
+
 #include "vm/access.h"
 #include "vm/builtin.h"
 #include "vm/exceptions.h"
 #include "vm/global.h"
 #include "vm/initialize.h"
+#include "vm/primitive.h"
+#include "vm/resolve.h"
 #include "vm/stringlocal.h"
 
 #include "vm/jit/stacktrace.h"
 
 #include "vmcore/loader.h"
-#include "vm/resolve.h"
 #include "vmcore/utf8.h"
 
 
-/* cacao_get_field_address *****************************************************
+/* native methods implemented by this file ************************************/
+
+static JNINativeMethod methods[] = {
+       { "getModifiersInternal", "()I",                                     (void *) (intptr_t) &Java_java_lang_reflect_Field_getModifiersInternal },
+       { "getType",              "()Ljava/lang/Class;",                     (void *) (intptr_t) &Java_java_lang_reflect_Field_getType              },
+       { "get",                  "(Ljava/lang/Object;)Ljava/lang/Object;",  (void *) (intptr_t) &Java_java_lang_reflect_Field_get                  },
+       { "getBoolean",           "(Ljava/lang/Object;)Z",                   (void *) (intptr_t) &Java_java_lang_reflect_Field_getBoolean           },
+       { "getByte",              "(Ljava/lang/Object;)B",                   (void *) (intptr_t) &Java_java_lang_reflect_Field_getByte              },
+       { "getChar",              "(Ljava/lang/Object;)C",                   (void *) (intptr_t) &Java_java_lang_reflect_Field_getChar              },
+       { "getShort",             "(Ljava/lang/Object;)S",                   (void *) (intptr_t) &Java_java_lang_reflect_Field_getShort             },
+       { "getInt",               "(Ljava/lang/Object;)I",                   (void *) (intptr_t) &Java_java_lang_reflect_Field_getInt               },
+       { "getLong",              "(Ljava/lang/Object;)J",                   (void *) (intptr_t) &Java_java_lang_reflect_Field_getLong              },
+       { "getFloat",             "(Ljava/lang/Object;)F",                   (void *) (intptr_t) &Java_java_lang_reflect_Field_getFloat             },
+       { "getDouble",            "(Ljava/lang/Object;)D",                   (void *) (intptr_t) &Java_java_lang_reflect_Field_getDouble            },
+       { "set",                  "(Ljava/lang/Object;Ljava/lang/Object;)V", (void *) (intptr_t) &Java_java_lang_reflect_Field_set                  },
+       { "setBoolean",           "(Ljava/lang/Object;Z)V",                  (void *) (intptr_t) &Java_java_lang_reflect_Field_setBoolean           },
+       { "setByte",              "(Ljava/lang/Object;B)V",                  (void *) (intptr_t) &Java_java_lang_reflect_Field_setByte              },
+       { "setChar",              "(Ljava/lang/Object;C)V",                  (void *) (intptr_t) &Java_java_lang_reflect_Field_setChar              },
+       { "setShort",             "(Ljava/lang/Object;S)V",                  (void *) (intptr_t) &Java_java_lang_reflect_Field_setShort             },
+       { "setInt",               "(Ljava/lang/Object;I)V",                  (void *) (intptr_t) &Java_java_lang_reflect_Field_setInt               },
+       { "setLong",              "(Ljava/lang/Object;J)V",                  (void *) (intptr_t) &Java_java_lang_reflect_Field_setLong              },
+       { "setFloat",             "(Ljava/lang/Object;F)V",                  (void *) (intptr_t) &Java_java_lang_reflect_Field_setFloat             },
+       { "setDouble",            "(Ljava/lang/Object;D)V",                  (void *) (intptr_t) &Java_java_lang_reflect_Field_setDouble            },
+       { "getSignature",         "()Ljava/lang/String;",                    (void *) (intptr_t) &Java_java_lang_reflect_Field_getSignature         },
+#if defined(ENABLE_ANNOTATIONS)
+       { "declaredAnnotations",  "()Ljava/util/Map;",                       (void *) (intptr_t) &Java_java_lang_reflect_Field_declaredAnnotations  },
+#endif
+};
+
+
+/* _Jv_java_lang_reflect_Field_init ********************************************
+
+   Register native functions.
+
+*******************************************************************************/
+
+void _Jv_java_lang_reflect_Field_init(void)
+{
+       utf *u;
+
+       u = utf_new_char("java/lang/reflect/Field");
+
+       native_method_register(u, methods, NATIVE_METHODS_COUNT);
+}
 
-   Return the address of a field of an object.
 
-   IN:
-      this.........the field (a java.lang.reflect.Field object)
-         o............the object of which to get the field
+/* _field_access_check *********************************************************
+
+   Checks if the field can be accessed.
 
    RETURN VALUE:
-      a pointer to the field, or
-         NULL if an exception has been thrown
+      true......field can be accessed, or
+      false.....otherwise (maybe an Exception was thrown).
 
 *******************************************************************************/
 
-static void *cacao_get_field_address(java_lang_reflect_Field *this,
-                                                                        java_lang_Object *o)
+static bool _field_access_check(java_lang_reflect_Field *this,
+                                                               fieldinfo *f, classinfo *c, java_handle_t *o)
 {
-       classinfo        *c;
-       fieldinfo        *f;
-
-       c = (classinfo *) this->declaringClass;
-       f = &c->fields[this->slot];
+       int32_t flag;
 
-       /* check field access */
        /* check if we should bypass security checks (AccessibleObject) */
 
-       if (this->flag == false) {
+       LLNI_field_get_val(this, flag, flag);
+       if (flag == false) {
                /* this function is always called like this:
-
                           java.lang.reflect.Field.xxx (Native Method)
                   [0] <caller>
                */
-               if (!access_check_member(c, f->flags, 0))
-                       return NULL;
+               if (!access_check_field(f, 0))
+                       return false;
        }
 
-       /* get the address of the field */
+       /* some general checks */
 
        if (f->flags & ACC_STATIC) {
                /* initialize class if required */
 
                if (!(c->state & CLASS_INITIALIZED))
                        if (!initialize_class(c))
-                               return NULL;
+                               return false;
 
-               /* return value address */
+               /* everything is ok */
 
-               return &(f->value);
+               return true;
 
        } else {
                /* obj is required for not-static fields */
 
                if (o == NULL) {
                        exceptions_throw_nullpointerexception();
-                       return NULL;
+                       return false;
                }
        
-               if (builtin_instanceof((java_objectheader *) o, c))
-                       return (void *) ((ptrint) o + f->offset);
+               if (builtin_instanceof(o, c))
+                       return true;
        }
 
        /* exception path */
 
        exceptions_throw_illegalargumentexception();
+       return false;
+}
+
+
+/* _field_get_type *************************************************************
+
+   Returns the content of the given field.
+
+*******************************************************************************/
+
+#define _FIELD_GET_TYPE(name, type, uniontype) \
+static inline type _field_get_##name(fieldinfo *f, java_lang_Object *o) \
+{ \
+       type ret; \
+       if (f->flags & ACC_STATIC) { \
+               ret = f->value->uniontype; \
+       } else { \
+               LLNI_CRITICAL_START; \
+               ret = *(type *) (((intptr_t) LLNI_DIRECT(o)) + f->offset); \
+               LLNI_CRITICAL_END; \
+       } \
+       return ret; \
+}
+
+static inline java_handle_t *_field_get_handle(fieldinfo *f, java_lang_Object *o)
+{
+       java_object_t *obj;
+       java_handle_t *hdl;
+
+       LLNI_CRITICAL_START;
+
+       if (f->flags & ACC_STATIC) {
+               obj = f->value->a;
+       } else {
+               obj = *(java_object_t **) (((intptr_t) LLNI_DIRECT(o)) + f->offset);
+       }
+
+       hdl = LLNI_WRAP(obj);
+
+       LLNI_CRITICAL_END;
+
+       return hdl;
+}
+
+_FIELD_GET_TYPE(int,    int32_t, i)
+_FIELD_GET_TYPE(long,   int64_t, l)
+_FIELD_GET_TYPE(float,  float,   f)
+_FIELD_GET_TYPE(double, double,  d)
+
+
+/* _field_set_type *************************************************************
 
-       return NULL;
+   Sets the content of the given field to the given value.
+
+*******************************************************************************/
+
+#define _FIELD_SET_TYPE(name, type, uniontype) \
+static inline void _field_set_##name(fieldinfo *f, java_lang_Object *o, type value) \
+{ \
+       if (f->flags & ACC_STATIC) { \
+               f->value->uniontype = value; \
+       } else { \
+               LLNI_CRITICAL_START; \
+               *(type *) (((intptr_t) LLNI_DIRECT(o)) + f->offset) = value; \
+               LLNI_CRITICAL_END; \
+       } \
 }
 
+static inline void _field_set_handle(fieldinfo *f, java_lang_Object *o, java_handle_t *value)
+{
+       LLNI_CRITICAL_START;
+
+       if (f->flags & ACC_STATIC) {
+               f->value->a = LLNI_DIRECT(value);
+       } else {
+               *(java_object_t **) (((intptr_t) LLNI_DIRECT(o)) + f->offset) = LLNI_DIRECT(value);
+       }
+
+       LLNI_CRITICAL_END;
+}
+
+_FIELD_SET_TYPE(int,    int32_t, i)
+_FIELD_SET_TYPE(long,   int64_t, l)
+_FIELD_SET_TYPE(float,  float,   f)
+_FIELD_SET_TYPE(double, double,  d)
+
 
 /*
  * Class:     java/lang/reflect/Field
  * Method:    getModifiersInternal
  * Signature: ()I
  */
-JNIEXPORT s4 JNICALL Java_java_lang_reflect_Field_getModifiersInternal(JNIEnv *env, java_lang_reflect_Field *this)
+JNIEXPORT int32_t JNICALL Java_java_lang_reflect_Field_getModifiersInternal(JNIEnv *env, java_lang_reflect_Field *this)
 {
        classinfo *c;
        fieldinfo *f;
+       int32_t    slot;
 
-       c = (classinfo *) this->declaringClass;
-       f = &(c->fields[this->slot]);
+       LLNI_field_get_cls(this, clazz, c);
+       LLNI_field_get_val(this, slot , slot);
+       f = &(c->fields[slot]);
 
        return f->flags;
 }
@@ -158,9 +286,11 @@ JNIEXPORT java_lang_Class* JNICALL Java_java_lang_reflect_Field_getType(JNIEnv *
        classinfo *c;
        typedesc  *desc;
        classinfo *ret;
+       int32_t    slot;
 
-       c    = (classinfo *) this->declaringClass;
-       desc = c->fields[this->slot].parseddesc;
+       LLNI_field_get_cls(this, clazz, c);
+       LLNI_field_get_val(this, slot , slot);
+       desc = c->fields[slot].parseddesc;
 
        if (desc == NULL)
                return NULL;
@@ -168,7 +298,7 @@ JNIEXPORT java_lang_Class* JNICALL Java_java_lang_reflect_Field_getType(JNIEnv *
        if (!resolve_class_from_typedesc(desc, true, false, &ret))
                return NULL;
        
-       return (java_lang_Class *) ret;
+       return LLNI_classinfo_wrap(ret);
 }
 
 
@@ -181,122 +311,49 @@ JNIEXPORT java_lang_Object* JNICALL Java_java_lang_reflect_Field_get(JNIEnv *env
 {
        classinfo *c;
        fieldinfo *f;
-       void      *addr;
+       int32_t    slot;
+       imm_union  value;
+       java_handle_t *object;
 
-       c = (classinfo *) this->declaringClass;
-       f = &c->fields[this->slot];
+       LLNI_field_get_cls(this, clazz, c);
+       LLNI_field_get_val(this, slot , slot);
+       f = &c->fields[slot];
 
-       /* get address of the source field value */
+       /* check if the field can be accessed */
 
-       if ((addr = cacao_get_field_address(this, o)) == NULL)
+       if (!_field_access_check(this, f, c, (java_handle_t *) o))
                return NULL;
 
        switch (f->parseddesc->decltype) {
-       case PRIMITIVETYPE_BOOLEAN: {
-               java_lang_Boolean *bo;
-
-               /* create wrapping class */
-
-               if (!(bo = (java_lang_Boolean *) builtin_new(class_java_lang_Boolean)))
-                       return NULL;
-
-               /* set the object value */
-
-               bo->value = *((s4 *) addr);
-
-               /* return the wrapped object */
-
-               return (java_lang_Object *) bo;
-       }
-
-       case PRIMITIVETYPE_BYTE: {
-               java_lang_Byte *bo;
-
-               if (!(bo = (java_lang_Byte *) builtin_new(class_java_lang_Byte)))
-                       return NULL;
-
-               bo->value = *((s4 *) addr);
-
-               return (java_lang_Object *) bo;
-       }
-
-       case PRIMITIVETYPE_CHAR: {
-               java_lang_Character *co;
-
-               if (!(co = (java_lang_Character *) builtin_new(class_java_lang_Character)))
-                       return NULL;
-
-               co->value = *((s4 *) addr);
-
-               return (java_lang_Object *) co;
-       }
-
-       case PRIMITIVETYPE_SHORT: {
-               java_lang_Short *so;
-
-               if (!(so = (java_lang_Short *) builtin_new(class_java_lang_Short)))
-                       return NULL;
-
-               so->value = (s4) *((s4 *) addr);
-
-               return (java_lang_Object *) so;
-       }
-
-       case PRIMITIVETYPE_INT: {
-               java_lang_Integer *io;
-
-               if (!(io = (java_lang_Integer *) builtin_new(class_java_lang_Integer)))
-                       return NULL;
-
-               io->value = *((s4 *) addr);
-
-               return (java_lang_Object *) io;
-       }
-
-       case PRIMITIVETYPE_LONG: {
-               java_lang_Long *lo;
-
-               if (!(lo = (java_lang_Long *) builtin_new(class_java_lang_Long)))
-                       return NULL;
-
-               lo->value = *((s8 *) addr);
-
-               return (java_lang_Object *) lo;
-       }
-
-       case PRIMITIVETYPE_FLOAT: {
-               java_lang_Float *fo;
-
-               if (!(fo = (java_lang_Float *) builtin_new(class_java_lang_Float)))
-                       return NULL;
-
-               fo->value = *((float *) addr);
-
-               return (java_lang_Object *) fo;
-       }
-
-       case PRIMITIVETYPE_DOUBLE: {
-               java_lang_Double *_do;
+       case PRIMITIVETYPE_BOOLEAN:
+       case PRIMITIVETYPE_BYTE:
+       case PRIMITIVETYPE_CHAR:
+       case PRIMITIVETYPE_SHORT:
+       case PRIMITIVETYPE_INT:
+               value.i = _field_get_int(f, o);
+               break;
 
-               if (!(_do = (java_lang_Double *) builtin_new(class_java_lang_Double)))
-                       return NULL;
+       case PRIMITIVETYPE_LONG:
+               value.l = _field_get_long(f, o);
+               break;
 
-               _do->value = *((double *) addr);
+       case PRIMITIVETYPE_FLOAT:
+               value.f = _field_get_float(f, o);
+               break;
 
-               return (java_lang_Object *) _do;
-       }
+       case PRIMITIVETYPE_DOUBLE:
+               value.d = _field_get_double(f, o);
+               break;
 
        case TYPE_ADR:
-               return (java_lang_Object *) *((java_objectheader **) addr);
+               return (java_lang_Object *) _field_get_handle(f, o);
        }
 
-       /* this must not happen */
-
-       assert(0);
+       /* Now box the primitive types. */
 
-       /* keep compiler happy */
+       object = primitive_box(f->parseddesc->decltype, value);
 
-       return NULL;
+       return (java_lang_Object *) object;
 }
 
 
@@ -305,27 +362,28 @@ JNIEXPORT java_lang_Object* JNICALL Java_java_lang_reflect_Field_get(JNIEnv *env
  * Method:    getBoolean
  * Signature: (Ljava/lang/Object;)Z
  */
-JNIEXPORT s4 JNICALL Java_java_lang_reflect_Field_getBoolean(JNIEnv *env, java_lang_reflect_Field *this, java_lang_Object *o)
+JNIEXPORT int32_t JNICALL Java_java_lang_reflect_Field_getBoolean(JNIEnv *env, java_lang_reflect_Field *this, java_lang_Object *o)
 {
        classinfo *c;
        fieldinfo *f;
-       void      *addr;
+       int32_t    slot;
 
        /* get the class and the field */
 
-       c = (classinfo *) this->declaringClass;
-       f = &c->fields[this->slot];
+       LLNI_field_get_cls(this, clazz, c);
+       LLNI_field_get_val(this, slot , slot);
+       f = &c->fields[slot];
 
-       /* get the address of the field with an internal helper */
+       /* check if the field can be accessed */
 
-       if ((addr = cacao_get_field_address(this, o)) == NULL)
+       if (!_field_access_check(this, f, c, (java_handle_t *) o))
                return 0;
 
        /* check the field type and return the value */
 
        switch (f->parseddesc->decltype) {
        case PRIMITIVETYPE_BOOLEAN:
-               return (s4) *((s4 *) addr);
+               return (int32_t) _field_get_int(f, o);
        default:
                exceptions_throw_illegalargumentexception();
                return 0;
@@ -338,27 +396,28 @@ JNIEXPORT s4 JNICALL Java_java_lang_reflect_Field_getBoolean(JNIEnv *env, java_l
  * Method:    getByte
  * Signature: (Ljava/lang/Object;)B
  */
-JNIEXPORT s4 JNICALL Java_java_lang_reflect_Field_getByte(JNIEnv *env, java_lang_reflect_Field *this, java_lang_Object *o)
+JNIEXPORT int32_t JNICALL Java_java_lang_reflect_Field_getByte(JNIEnv *env, java_lang_reflect_Field *this, java_lang_Object *o)
 {
        classinfo *c;
        fieldinfo *f;
-       void      *addr;
+       int32_t    slot;
 
        /* get the class and the field */
 
-       c = (classinfo *) this->declaringClass;
-       f = &c->fields[this->slot];
+       LLNI_field_get_cls(this, clazz, c);
+       LLNI_field_get_val(this, slot , slot);
+       f = &c->fields[slot];
 
-       /* get the address of the field with an internal helper */
+       /* check if the field can be accessed */
 
-       if ((addr = cacao_get_field_address(this, o)) == NULL)
+       if (!_field_access_check(this, f, c, (java_handle_t *) o))
                return 0;
 
        /* check the field type and return the value */
 
        switch (f->parseddesc->decltype) {
        case PRIMITIVETYPE_BYTE:
-               return (s4) *((s4 *) addr);
+               return (int32_t) _field_get_int(f, o);
        default:
                exceptions_throw_illegalargumentexception();
                return 0;
@@ -371,27 +430,28 @@ JNIEXPORT s4 JNICALL Java_java_lang_reflect_Field_getByte(JNIEnv *env, java_lang
  * Method:    getChar
  * Signature: (Ljava/lang/Object;)C
  */
-JNIEXPORT s4 JNICALL Java_java_lang_reflect_Field_getChar(JNIEnv *env, java_lang_reflect_Field *this, java_lang_Object *o)
+JNIEXPORT int32_t JNICALL Java_java_lang_reflect_Field_getChar(JNIEnv *env, java_lang_reflect_Field *this, java_lang_Object *o)
 {
        classinfo *c;
        fieldinfo *f;
-       void      *addr;
+       int32_t    slot;
 
        /* get the class and the field */
 
-       c = (classinfo *) this->declaringClass;
-       f = &c->fields[this->slot];
+       LLNI_field_get_cls(this, clazz, c);
+       LLNI_field_get_val(this, slot , slot);
+       f = &c->fields[slot];
 
-       /* get the address of the field with an internal helper */
+       /* check if the field can be accessed */
 
-       if ((addr = cacao_get_field_address(this, o)) == NULL)
+       if (!_field_access_check(this, f, c, (java_handle_t *) o))
                return 0;
 
        /* check the field type and return the value */
 
        switch (f->parseddesc->decltype) {
        case PRIMITIVETYPE_CHAR:
-               return (s4) *((s4 *) addr);
+               return (int32_t) _field_get_int(f, o);
        default:
                exceptions_throw_illegalargumentexception();
                return 0;
@@ -404,20 +464,21 @@ JNIEXPORT s4 JNICALL Java_java_lang_reflect_Field_getChar(JNIEnv *env, java_lang
  * Method:    getShort
  * Signature: (Ljava/lang/Object;)S
  */
-JNIEXPORT s4 JNICALL Java_java_lang_reflect_Field_getShort(JNIEnv *env, java_lang_reflect_Field *this, java_lang_Object *o)
+JNIEXPORT int32_t JNICALL Java_java_lang_reflect_Field_getShort(JNIEnv *env, java_lang_reflect_Field *this, java_lang_Object *o)
 {
        classinfo *c;
        fieldinfo *f;
-       void      *addr;
+       int32_t    slot;
 
        /* get the class and the field */
 
-       c = (classinfo *) this->declaringClass;
-       f = &c->fields[this->slot];
+       LLNI_field_get_cls(this, clazz, c);
+       LLNI_field_get_val(this, slot , slot);
+       f = &c->fields[slot];
 
-       /* get the address of the field with an internal helper */
+       /* check if the field can be accessed */
 
-       if ((addr = cacao_get_field_address(this, o)) == NULL)
+       if (!_field_access_check(this, f, c, (java_handle_t *) o))
                return 0;
 
        /* check the field type and return the value */
@@ -425,7 +486,7 @@ JNIEXPORT s4 JNICALL Java_java_lang_reflect_Field_getShort(JNIEnv *env, java_lan
        switch (f->parseddesc->decltype) {
        case PRIMITIVETYPE_BYTE:
        case PRIMITIVETYPE_SHORT:
-               return (s4) *((s4 *) addr);
+               return (int32_t) _field_get_int(f, o);
        default:
                exceptions_throw_illegalargumentexception();
                return 0;
@@ -438,20 +499,21 @@ JNIEXPORT s4 JNICALL Java_java_lang_reflect_Field_getShort(JNIEnv *env, java_lan
  * Method:    getInt
  * Signature: (Ljava/lang/Object;)I
  */
-JNIEXPORT s4 JNICALL Java_java_lang_reflect_Field_getInt(JNIEnv *env , java_lang_reflect_Field *this, java_lang_Object *o)
+JNIEXPORT int32_t JNICALL Java_java_lang_reflect_Field_getInt(JNIEnv *env , java_lang_reflect_Field *this, java_lang_Object *o)
 {
        classinfo *c;
        fieldinfo *f;
-       void      *addr;
+       int32_t    slot;
 
        /* get the class and the field */
 
-       c = (classinfo *) this->declaringClass;
-       f = &c->fields[this->slot];
+       LLNI_field_get_cls(this, clazz, c);
+       LLNI_field_get_val(this, slot , slot);
+       f = &c->fields[slot];
 
-       /* get the address of the field with an internal helper */
+       /* check if the field can be accessed */
 
-       if ((addr = cacao_get_field_address(this, o)) == NULL)
+       if (!_field_access_check(this, f, c, (java_handle_t *) o))
                return 0;
 
        /* check the field type and return the value */
@@ -461,7 +523,7 @@ JNIEXPORT s4 JNICALL Java_java_lang_reflect_Field_getInt(JNIEnv *env , java_lang
        case PRIMITIVETYPE_CHAR:
        case PRIMITIVETYPE_SHORT:
        case PRIMITIVETYPE_INT:
-               return (s4) *((s4 *) addr);
+               return (int32_t) _field_get_int(f, o);
        default:
                exceptions_throw_illegalargumentexception();
                return 0;
@@ -474,20 +536,21 @@ JNIEXPORT s4 JNICALL Java_java_lang_reflect_Field_getInt(JNIEnv *env , java_lang
  * Method:    getLong
  * Signature: (Ljava/lang/Object;)J
  */
-JNIEXPORT s8 JNICALL Java_java_lang_reflect_Field_getLong(JNIEnv *env, java_lang_reflect_Field *this, java_lang_Object *o)
+JNIEXPORT int64_t JNICALL Java_java_lang_reflect_Field_getLong(JNIEnv *env, java_lang_reflect_Field *this, java_lang_Object *o)
 {
        classinfo *c;
        fieldinfo *f;
-       void      *addr;
+       int32_t    slot;
 
        /* get the class and the field */
 
-       c = (classinfo *) this->declaringClass;
-       f = &c->fields[this->slot];
+       LLNI_field_get_cls(this, clazz, c);
+       LLNI_field_get_val(this, slot , slot);
+       f = &c->fields[slot];
 
-       /* get the address of the field with an internal helper */
+       /* check if the field can be accessed */
 
-       if ((addr = cacao_get_field_address(this, o)) == NULL)
+       if (!_field_access_check(this, f, c, (java_handle_t *) o))
                return 0;
 
        /* check the field type and return the value */
@@ -497,9 +560,9 @@ JNIEXPORT s8 JNICALL Java_java_lang_reflect_Field_getLong(JNIEnv *env, java_lang
        case PRIMITIVETYPE_CHAR:
        case PRIMITIVETYPE_SHORT:
        case PRIMITIVETYPE_INT:
-               return (s8) *((s4 *) addr);
+               return (int64_t) _field_get_int(f, o);
        case PRIMITIVETYPE_LONG:
-               return (s8) *((s8 *) addr);
+               return (int64_t) _field_get_long(f, o);
        default:
                exceptions_throw_illegalargumentexception();
                return 0;
@@ -516,16 +579,17 @@ JNIEXPORT float JNICALL Java_java_lang_reflect_Field_getFloat(JNIEnv *env, java_
 {
        classinfo *c;
        fieldinfo *f;
-       void      *addr;
+       int32_t    slot;
 
        /* get the class and the field */
 
-       c = (classinfo *) this->declaringClass;
-       f = &c->fields[this->slot];
+       LLNI_field_get_cls(this, clazz, c);
+       LLNI_field_get_val(this, slot , slot);
+       f = &c->fields[slot];
 
-       /* get the address of the field with an internal helper */
+       /* check if the field can be accessed */
 
-       if ((addr = cacao_get_field_address(this, o)) == NULL)
+       if (!_field_access_check(this, f, c, (java_handle_t *) o))
                return 0;
 
        /* check the field type and return the value */
@@ -535,11 +599,11 @@ JNIEXPORT float JNICALL Java_java_lang_reflect_Field_getFloat(JNIEnv *env, java_
        case PRIMITIVETYPE_CHAR:
        case PRIMITIVETYPE_SHORT:
        case PRIMITIVETYPE_INT:
-               return (float) *((s4 *) addr);
+               return (float) _field_get_int(f, o);
        case PRIMITIVETYPE_LONG:
-               return (float) *((s8 *) addr);
+               return (float) _field_get_long(f, o);
        case PRIMITIVETYPE_FLOAT:
-               return (float) *((float *) addr);
+               return (float) _field_get_float(f, o);
        default:
                exceptions_throw_illegalargumentexception();
                return 0;
@@ -556,16 +620,17 @@ JNIEXPORT double JNICALL Java_java_lang_reflect_Field_getDouble(JNIEnv *env , ja
 {
        classinfo *c;
        fieldinfo *f;
-       void      *addr;
+       int32_t    slot;
 
        /* get the class and the field */
 
-       c = (classinfo *) this->declaringClass;
-       f = &c->fields[this->slot];
+       LLNI_field_get_cls(this, clazz, c);
+       LLNI_field_get_val(this, slot , slot);
+       f = &c->fields[slot];
 
-       /* get the address of the field with an internal helper */
+       /* check if the field can be accessed */
 
-       if ((addr = cacao_get_field_address(this, o)) == NULL)
+       if (!_field_access_check(this, f, c, (java_handle_t *) o))
                return 0;
 
        /* check the field type and return the value */
@@ -575,13 +640,13 @@ JNIEXPORT double JNICALL Java_java_lang_reflect_Field_getDouble(JNIEnv *env , ja
        case PRIMITIVETYPE_CHAR:
        case PRIMITIVETYPE_SHORT:
        case PRIMITIVETYPE_INT:
-               return (double) *((s4 *) addr);
+               return (double) _field_get_int(f, o);
        case PRIMITIVETYPE_LONG:
-               return (double) *((s8 *) addr);
+               return (double) _field_get_long(f, o);
        case PRIMITIVETYPE_FLOAT:
-               return (double) *((float *) addr);
+               return (double) _field_get_float(f, o);
        case PRIMITIVETYPE_DOUBLE:
-               return (double) *((double *) addr);
+               return (double) _field_get_double(f, o);
        default:
                exceptions_throw_illegalargumentexception();
                return 0;
@@ -600,16 +665,17 @@ JNIEXPORT void JNICALL Java_java_lang_reflect_Field_set(JNIEnv *env, java_lang_r
        classinfo *dc;
        fieldinfo *sf;
        fieldinfo *df;
-       void      *faddr;
+       int32_t    slot;
 
        /* get the class and the field */
 
-       dc = (classinfo *) this->declaringClass;
-       df = &dc->fields[this->slot];
+       LLNI_field_get_cls(this, clazz, dc);
+       LLNI_field_get_val(this, slot , slot);
+       df = &dc->fields[slot];
 
-       /* get the address of the destination field */
+       /* check if the field can be accessed */
 
-       if ((faddr = cacao_get_field_address(this, o)) == NULL)
+       if (!_field_access_check(this, df, dc, (java_handle_t *) o))
                return;
 
        /* get the source classinfo from the object */
@@ -617,7 +683,7 @@ JNIEXPORT void JNICALL Java_java_lang_reflect_Field_set(JNIEnv *env, java_lang_r
        if (value == NULL)
                sc = NULL;
        else
-               sc = value->header.vftbl->class;
+               LLNI_class_get(value, sc);
 
        /* The fieldid is used to set the new value, for primitive
           types the value has to be retrieved from the wrapping
@@ -625,7 +691,7 @@ JNIEXPORT void JNICALL Java_java_lang_reflect_Field_set(JNIEnv *env, java_lang_r
 
        switch (df->parseddesc->decltype) {
        case PRIMITIVETYPE_BOOLEAN: {
-               s4 val;
+               int32_t val;
 
                /* determine the field to read the value */
 
@@ -634,57 +700,57 @@ JNIEXPORT void JNICALL Java_java_lang_reflect_Field_set(JNIEnv *env, java_lang_r
 
                switch (sf->parseddesc->decltype) {
                case PRIMITIVETYPE_BOOLEAN:
-                       val = ((java_lang_Boolean *) value)->value;
+                       LLNI_field_get_val((java_lang_Boolean *) value, value, val);
                        break;
                default:
                        exceptions_throw_illegalargumentexception();
                        return;
                }
 
-               *((s4 *) faddr) = val;
+               _field_set_int(df, o, val);
                return;
        }
 
        case PRIMITIVETYPE_BYTE: {
-               s4 val;
+               int32_t val;
 
                if ((sc == NULL) || !(sf = class_findfield(sc, utf_value, utf_B)))
                        break;
 
                switch (sf->parseddesc->decltype) {
                case PRIMITIVETYPE_BYTE:
-                       val = ((java_lang_Byte *) value)->value;
+                       LLNI_field_get_val((java_lang_Byte *) value, value, val);
                        break;
                default:        
                        exceptions_throw_illegalargumentexception();
                        return;
                }
 
-               *((s4 *) faddr) = val;
+               _field_set_int(df, o, val);
                return;
        }
 
        case PRIMITIVETYPE_CHAR: {
-               s4 val;
+               int32_t val;
 
                if ((sc == NULL) || !(sf = class_findfield(sc, utf_value, utf_C)))
                        break;
                                   
                switch (sf->parseddesc->decltype) {
                case PRIMITIVETYPE_CHAR:
-                       val = ((java_lang_Character *) value)->value;
+                       LLNI_field_get_val((java_lang_Character *) value, value, val);
                        break;
                default:
                        exceptions_throw_illegalargumentexception();
                        return;
                }
 
-               *((s4 *) faddr) = val;
+               _field_set_int(df, o, val);
                return;
        }
 
        case PRIMITIVETYPE_SHORT: {
-               s4 val;
+               int32_t val;
 
                /* get field only by name, it can be one of B, S */
 
@@ -693,22 +759,22 @@ JNIEXPORT void JNICALL Java_java_lang_reflect_Field_set(JNIEnv *env, java_lang_r
                                   
                switch (sf->parseddesc->decltype) {
                case PRIMITIVETYPE_BYTE:
-                       val = ((java_lang_Byte *) value)->value;
+                       LLNI_field_get_val((java_lang_Byte *) value, value, val);
                        break;
                case PRIMITIVETYPE_SHORT:
-                       val = ((java_lang_Short *) value)->value;
+                       LLNI_field_get_val((java_lang_Short *) value, value, val);
                        break;
                default:
                        exceptions_throw_illegalargumentexception();
                        return;
                }
 
-               *((s4 *) faddr) = val;
+               _field_set_int(df, o, val);
                return;
        }
 
        case PRIMITIVETYPE_INT: {
-               s4 val;
+               int32_t val;
 
                /* get field only by name, it can be one of B, S, C, I */
 
@@ -717,28 +783,28 @@ JNIEXPORT void JNICALL Java_java_lang_reflect_Field_set(JNIEnv *env, java_lang_r
 
                switch (sf->parseddesc->decltype) {
                case PRIMITIVETYPE_BYTE:
-                       val = ((java_lang_Byte *) value)->value;
+                       LLNI_field_get_val((java_lang_Byte *) value, value, val);
                        break;
                case PRIMITIVETYPE_CHAR:
-                       val = ((java_lang_Character *) value)->value;
+                       LLNI_field_get_val((java_lang_Character *) value, value, val);
                        break;
                case PRIMITIVETYPE_SHORT:
-                       val = ((java_lang_Short *) value)->value;
+                       LLNI_field_get_val((java_lang_Short *) value, value, val);
                        break;
                case PRIMITIVETYPE_INT:
-                       val = ((java_lang_Integer *) value)->value;
+                       LLNI_field_get_val((java_lang_Integer *) value, value, val);
                        break;
                default:
                        exceptions_throw_illegalargumentexception();
                        return;
                }
 
-               *((s4 *) faddr) = val;
+               _field_set_int(df, o, val);
                return;
        }
 
        case PRIMITIVETYPE_LONG: {
-               s8 val;
+               int64_t val;
 
                /* get field only by name, it can be one of B, S, C, I, J */
 
@@ -747,26 +813,26 @@ JNIEXPORT void JNICALL Java_java_lang_reflect_Field_set(JNIEnv *env, java_lang_r
 
                switch (sf->parseddesc->decltype) {
                case PRIMITIVETYPE_BYTE:
-                       val = ((java_lang_Byte *) value)->value;
+                       LLNI_field_get_val((java_lang_Byte *) value, value, val);
                        break;
                case PRIMITIVETYPE_CHAR:
-                       val = ((java_lang_Character *) value)->value;
+                       LLNI_field_get_val((java_lang_Character *) value, value, val);
                        break;
                case PRIMITIVETYPE_SHORT:
-                       val = ((java_lang_Short *) value)->value;
+                       LLNI_field_get_val((java_lang_Short *) value, value, val);
                        break;
                case PRIMITIVETYPE_INT:
-                       val = ((java_lang_Integer *) value)->value;
+                       LLNI_field_get_val((java_lang_Integer *) value, value, val);
                        break;
                case PRIMITIVETYPE_LONG:
-                       val = ((java_lang_Long *) value)->value;
+                       LLNI_field_get_val((java_lang_Long *) value, value, val);
                        break;
                default:
                        exceptions_throw_illegalargumentexception();
                        return;
                }
 
-               *((s8 *) faddr) = val;
+               _field_set_long(df, o, val);
                return;
        }
 
@@ -780,29 +846,29 @@ JNIEXPORT void JNICALL Java_java_lang_reflect_Field_set(JNIEnv *env, java_lang_r
 
                switch (sf->parseddesc->decltype) {
                case PRIMITIVETYPE_BYTE:
-                       val = ((java_lang_Byte *) value)->value;
+                       LLNI_field_get_val((java_lang_Byte *) value, value, val);
                        break;
                case PRIMITIVETYPE_CHAR:
-                       val = ((java_lang_Character *) value)->value;
+                       LLNI_field_get_val((java_lang_Character *) value, value, val);
                        break;
                case PRIMITIVETYPE_SHORT:
-                       val = ((java_lang_Short *) value)->value;
+                       LLNI_field_get_val((java_lang_Short *) value, value, val);
                        break;
                case PRIMITIVETYPE_INT:
-                       val = ((java_lang_Integer *) value)->value;
+                       LLNI_field_get_val((java_lang_Integer *) value, value, val);
                        break;
                case PRIMITIVETYPE_LONG:
-                       val = ((java_lang_Long *) value)->value;
+                       LLNI_field_get_val((java_lang_Long *) value, value, val);
                        break;
                case PRIMITIVETYPE_FLOAT:
-                       val = ((java_lang_Float *) value)->value;
+                       LLNI_field_get_val((java_lang_Float *) value, value, val);
                        break;
                default:
                        exceptions_throw_illegalargumentexception();
                        return;
                }
 
-               *((float *) faddr) = val;
+               _field_set_float(df, o, val);
                return;
        }
 
@@ -816,32 +882,32 @@ JNIEXPORT void JNICALL Java_java_lang_reflect_Field_set(JNIEnv *env, java_lang_r
 
                switch (sf->parseddesc->decltype) {
                case PRIMITIVETYPE_BYTE:
-                       val = ((java_lang_Byte *) value)->value;
+                       LLNI_field_get_val((java_lang_Byte *) value, value, val);
                        break;
                case PRIMITIVETYPE_CHAR:
-                       val = ((java_lang_Character *) value)->value;
+                       LLNI_field_get_val((java_lang_Character *) value, value, val);
                        break;
                case PRIMITIVETYPE_SHORT:
-                       val = ((java_lang_Short *) value)->value;
+                       LLNI_field_get_val((java_lang_Short *) value, value, val);
                        break;
                case PRIMITIVETYPE_INT:
-                       val = ((java_lang_Integer *) value)->value;
+                       LLNI_field_get_val((java_lang_Integer *) value, value, val);
                        break;
                case PRIMITIVETYPE_LONG:
-                       val = ((java_lang_Long *) value)->value;
+                       LLNI_field_get_val((java_lang_Long *) value, value, val);
                        break;
                case PRIMITIVETYPE_FLOAT:
-                       val = ((java_lang_Float *) value)->value;
+                       LLNI_field_get_val((java_lang_Float *) value, value, val);
                        break;
                case PRIMITIVETYPE_DOUBLE:
-                       val = ((java_lang_Double *) value)->value;
+                       LLNI_field_get_val((java_lang_Double *) value, value, val);
                        break;
                default:
                        exceptions_throw_illegalargumentexception();
                        return;
                }
 
-               *((double *) faddr) = val;
+               _field_set_double(df, o, val);
                return;
        }
 
@@ -849,10 +915,10 @@ JNIEXPORT void JNICALL Java_java_lang_reflect_Field_set(JNIEnv *env, java_lang_r
                /* check if value is an instance of the destination class */
 
                /* XXX TODO */
-               /*                      if (!builtin_instanceof((java_objectheader *) value, df->class)) */
+               /*                      if (!builtin_instanceof((java_handle_t *) value, df->class)) */
                /*                              break; */
 
-               *((java_lang_Object **) faddr) = value;
+               _field_set_handle(df, o, (java_handle_t *) value);
                return;
        }
 
@@ -867,27 +933,28 @@ JNIEXPORT void JNICALL Java_java_lang_reflect_Field_set(JNIEnv *env, java_lang_r
  * Method:    setBoolean
  * Signature: (Ljava/lang/Object;Z)V
  */
-JNIEXPORT void JNICALL Java_java_lang_reflect_Field_setBoolean(JNIEnv *env, java_lang_reflect_Field *this, java_lang_Object *o, s4 value)
+JNIEXPORT void JNICALL Java_java_lang_reflect_Field_setBoolean(JNIEnv *env, java_lang_reflect_Field *this, java_lang_Object *o, int32_t value)
 {
        classinfo *c;
        fieldinfo *f;
-       void      *addr;
+       int32_t    slot;
 
        /* get the class and the field */
 
-       c = (classinfo *) this->declaringClass;
-       f = &c->fields[this->slot];
+       LLNI_field_get_cls(this, clazz, c);
+       LLNI_field_get_val(this, slot , slot);
+       f = &c->fields[slot];
 
-       /* get the address of the field with an internal helper */
+       /* check if the field can be accessed */
 
-       if ((addr = cacao_get_field_address(this, o)) == NULL)
+       if (!_field_access_check(this, f, c, (java_handle_t *) o))
                return;
 
        /* check the field type and set the value */
 
        switch (f->parseddesc->decltype) {
        case PRIMITIVETYPE_BOOLEAN:
-               *((s4 *) addr) = value;
+               _field_set_int(f, o, value);
                break;
        default:
                exceptions_throw_illegalargumentexception();
@@ -902,20 +969,21 @@ JNIEXPORT void JNICALL Java_java_lang_reflect_Field_setBoolean(JNIEnv *env, java
  * Method:    setByte
  * Signature: (Ljava/lang/Object;B)V
  */
-JNIEXPORT void JNICALL Java_java_lang_reflect_Field_setByte(JNIEnv *env, java_lang_reflect_Field *this, java_lang_Object *o, s4 value)
+JNIEXPORT void JNICALL Java_java_lang_reflect_Field_setByte(JNIEnv *env, java_lang_reflect_Field *this, java_lang_Object *o, int32_t value)
 {
        classinfo *c;
        fieldinfo *f;
-       void      *addr;
+       int32_t    slot;
 
        /* get the class and the field */
 
-       c = (classinfo *) this->declaringClass;
-       f = &c->fields[this->slot];
+       LLNI_field_get_cls(this, clazz, c);
+       LLNI_field_get_val(this, slot , slot);
+       f = &c->fields[slot];
 
-       /* get the address of the field with an internal helper */
+       /* check if the field can be accessed */
 
-       if ((addr = cacao_get_field_address(this, o)) == NULL)
+       if (!_field_access_check(this, f, c, (java_handle_t *) o))
                return;
 
        /* check the field type and set the value */
@@ -924,16 +992,16 @@ JNIEXPORT void JNICALL Java_java_lang_reflect_Field_setByte(JNIEnv *env, java_la
        case PRIMITIVETYPE_BYTE:
        case PRIMITIVETYPE_SHORT:
        case PRIMITIVETYPE_INT:
-               *((s4 *) addr) = value;
+               _field_set_int(f, o, value);
                break;
        case PRIMITIVETYPE_LONG:
-               *((s8 *) addr) = value;
+               _field_set_long(f, o, value);
                break;
        case PRIMITIVETYPE_FLOAT:
-               *((float *) addr) = value;
+               _field_set_float(f, o, value);
                break;
        case PRIMITIVETYPE_DOUBLE:
-               *((double *) addr) = value;
+               _field_set_double(f, o, value);
                break;
        default:
                exceptions_throw_illegalargumentexception();
@@ -948,20 +1016,21 @@ JNIEXPORT void JNICALL Java_java_lang_reflect_Field_setByte(JNIEnv *env, java_la
  * Method:    setChar
  * Signature: (Ljava/lang/Object;C)V
  */
-JNIEXPORT void JNICALL Java_java_lang_reflect_Field_setChar(JNIEnv *env, java_lang_reflect_Field *this, java_lang_Object *o, s4 value)
+JNIEXPORT void JNICALL Java_java_lang_reflect_Field_setChar(JNIEnv *env, java_lang_reflect_Field *this, java_lang_Object *o, int32_t value)
 {
        classinfo *c;
        fieldinfo *f;
-       void      *addr;
+       int32_t    slot;
 
        /* get the class and the field */
 
-       c = (classinfo *) this->declaringClass;
-       f = &c->fields[this->slot];
+       LLNI_field_get_cls(this, clazz, c);
+       LLNI_field_get_val(this, slot , slot);
+       f = &c->fields[slot];
 
-       /* get the address of the field with an internal helper */
+       /* check if the field can be accessed */
 
-       if ((addr = cacao_get_field_address(this, o)) == NULL)
+       if (!_field_access_check(this, f, c, (java_handle_t *) o))
                return;
 
        /* check the field type and set the value */
@@ -969,16 +1038,16 @@ JNIEXPORT void JNICALL Java_java_lang_reflect_Field_setChar(JNIEnv *env, java_la
        switch (f->parseddesc->decltype) {
        case PRIMITIVETYPE_CHAR:
        case PRIMITIVETYPE_INT:
-               *((s4 *) addr) = value;
+               _field_set_int(f, o, value);
                break;
        case PRIMITIVETYPE_LONG:
-               *((s8 *) addr) = value;
+               _field_set_long(f, o, value);
                break;
        case PRIMITIVETYPE_FLOAT:
-               *((float *) addr) = value;
+               _field_set_float(f, o, value);
                break;
        case PRIMITIVETYPE_DOUBLE:
-               *((double *) addr) = value;
+               _field_set_double(f, o, value);
                break;
        default:
                exceptions_throw_illegalargumentexception();
@@ -993,20 +1062,21 @@ JNIEXPORT void JNICALL Java_java_lang_reflect_Field_setChar(JNIEnv *env, java_la
  * Method:    setShort
  * Signature: (Ljava/lang/Object;S)V
  */
-JNIEXPORT void JNICALL Java_java_lang_reflect_Field_setShort(JNIEnv *env, java_lang_reflect_Field *this, java_lang_Object *o, s4 value)
+JNIEXPORT void JNICALL Java_java_lang_reflect_Field_setShort(JNIEnv *env, java_lang_reflect_Field *this, java_lang_Object *o, int32_t value)
 {
        classinfo *c;
        fieldinfo *f;
-       void      *addr;
+       int32_t    slot;
 
        /* get the class and the field */
 
-       c = (classinfo *) this->declaringClass;
-       f = &c->fields[this->slot];
+       LLNI_field_get_cls(this, clazz, c);
+       LLNI_field_get_val(this, slot , slot);
+       f = &c->fields[slot];
 
-       /* get the address of the field with an internal helper */
+       /* check if the field can be accessed */
 
-       if ((addr = cacao_get_field_address(this, o)) == NULL)
+       if (!_field_access_check(this, f, c, (java_handle_t *) o))
                return;
 
        /* check the field type and set the value */
@@ -1014,16 +1084,16 @@ JNIEXPORT void JNICALL Java_java_lang_reflect_Field_setShort(JNIEnv *env, java_l
        switch (f->parseddesc->decltype) {
        case PRIMITIVETYPE_SHORT:
        case PRIMITIVETYPE_INT:
-               *((s4 *) addr) = value;
+               _field_set_int(f, o, value);
                break;
        case PRIMITIVETYPE_LONG:
-               *((s8 *) addr) = value;
+               _field_set_long(f, o, value);
                break;
        case PRIMITIVETYPE_FLOAT:
-               *((float *) addr) = value;
+               _field_set_float(f, o, value);
                break;
        case PRIMITIVETYPE_DOUBLE:
-               *((double *) addr) = value;
+               _field_set_double(f, o, value);
                break;
        default:
                exceptions_throw_illegalargumentexception();
@@ -1038,36 +1108,37 @@ JNIEXPORT void JNICALL Java_java_lang_reflect_Field_setShort(JNIEnv *env, java_l
  * Method:    setInt
  * Signature: (Ljava/lang/Object;I)V
  */
-JNIEXPORT void JNICALL Java_java_lang_reflect_Field_setInt(JNIEnv *env, java_lang_reflect_Field *this, java_lang_Object *o, s4 value)
+JNIEXPORT void JNICALL Java_java_lang_reflect_Field_setInt(JNIEnv *env, java_lang_reflect_Field *this, java_lang_Object *o, int32_t value)
 {
        classinfo *c;
        fieldinfo *f;
-       void      *addr;
+       int32_t    slot;
 
        /* get the class and the field */
 
-       c = (classinfo *) this->declaringClass;
-       f = &c->fields[this->slot];
+       LLNI_field_get_cls(this, clazz, c);
+       LLNI_field_get_val(this, slot , slot);
+       f = &c->fields[slot];
 
-       /* get the address of the field with an internal helper */
+       /* check if the field can be accessed */
 
-       if ((addr = cacao_get_field_address(this, o)) == NULL)
+       if (!_field_access_check(this, f, c, (java_handle_t *) o))
                return;
 
        /* check the field type and set the value */
 
        switch (f->parseddesc->decltype) {
        case PRIMITIVETYPE_INT:
-               *((s4 *) addr) = value;
+               _field_set_int(f, o, value);
                break;
        case PRIMITIVETYPE_LONG:
-               *((s8 *) addr) = value;
+               _field_set_long(f, o, value);
                break;
        case PRIMITIVETYPE_FLOAT:
-               *((float *) addr) = value;
+               _field_set_float(f, o, value);
                break;
        case PRIMITIVETYPE_DOUBLE:
-               *((double *) addr) = value;
+               _field_set_double(f, o, value);
                break;
        default:
                exceptions_throw_illegalargumentexception();
@@ -1082,33 +1153,34 @@ JNIEXPORT void JNICALL Java_java_lang_reflect_Field_setInt(JNIEnv *env, java_lan
  * Method:    setLong
  * Signature: (Ljava/lang/Object;J)V
  */
-JNIEXPORT void JNICALL Java_java_lang_reflect_Field_setLong(JNIEnv *env, java_lang_reflect_Field *this, java_lang_Object *o, s8 value)
+JNIEXPORT void JNICALL Java_java_lang_reflect_Field_setLong(JNIEnv *env, java_lang_reflect_Field *this, java_lang_Object *o, int64_t value)
 {
        classinfo *c;
        fieldinfo *f;
-       void      *addr;
+       int32_t    slot;
 
        /* get the class and the field */
 
-       c = (classinfo *) this->declaringClass;
-       f = &c->fields[this->slot];
+       LLNI_field_get_cls(this, clazz, c);
+       LLNI_field_get_val(this, slot , slot);
+       f = &c->fields[slot];
 
-       /* get the address of the field with an internal helper */
+       /* check if the field can be accessed */
 
-       if ((addr = cacao_get_field_address(this, o)) == NULL)
+       if (!_field_access_check(this, f, c, (java_handle_t *) o))
                return;
 
        /* check the field type and set the value */
 
        switch (f->parseddesc->decltype) {
        case PRIMITIVETYPE_LONG:
-               *((s8 *) addr) = value;
+               _field_set_long(f, o, value);
                break;
        case PRIMITIVETYPE_FLOAT:
-               *((float *) addr) = value;
+               _field_set_float(f, o, value);
                break;
        case PRIMITIVETYPE_DOUBLE:
-               *((double *) addr) = value;
+               _field_set_double(f, o, value);
                break;
        default:
                exceptions_throw_illegalargumentexception();
@@ -1127,26 +1199,27 @@ JNIEXPORT void JNICALL Java_java_lang_reflect_Field_setFloat(JNIEnv *env, java_l
 {
        classinfo *c;
        fieldinfo *f;
-       void      *addr;
+       int32_t    slot;
 
        /* get the class and the field */
 
-       c = (classinfo *) this->declaringClass;
-       f = &c->fields[this->slot];
+       LLNI_field_get_cls(this, clazz, c);
+       LLNI_field_get_val(this, slot , slot);
+       f = &c->fields[slot];
 
-       /* get the address of the field with an internal helper */
+       /* check if the field can be accessed */
 
-       if ((addr = cacao_get_field_address(this, o)) == NULL)
+       if (!_field_access_check(this, f, c, (java_handle_t *) o))
                return;
 
        /* check the field type and set the value */
 
        switch (f->parseddesc->decltype) {
        case PRIMITIVETYPE_FLOAT:
-               *((float *) addr) = value;
+               _field_set_float(f, o, value);
                break;
        case PRIMITIVETYPE_DOUBLE:
-               *((double *) addr) = value;
+               _field_set_double(f, o, value);
                break;
        default:
                exceptions_throw_illegalargumentexception();
@@ -1165,23 +1238,24 @@ JNIEXPORT void JNICALL Java_java_lang_reflect_Field_setDouble(JNIEnv *env, java_
 {
        classinfo *c;
        fieldinfo *f;
-       void      *addr;
+       int32_t    slot;
 
        /* get the class and the field */
 
-       c = (classinfo *) this->declaringClass;
-       f = &c->fields[this->slot];
+       LLNI_field_get_cls(this, clazz, c);
+       LLNI_field_get_val(this, slot , slot);
+       f = &c->fields[slot];
 
-       /* get the address of the field with an internal helper */
+       /* check if the field can be accessed */
 
-       if ((addr = cacao_get_field_address(this, o)) == NULL)
+       if (!_field_access_check(this, f, c, (java_handle_t *) o))
                return;
 
        /* check the field type and set the value */
 
        switch (f->parseddesc->decltype) {
        case PRIMITIVETYPE_DOUBLE:
-               *((double *) addr) = value;
+               _field_set_double(f, o, value);
                break;
        default:
                exceptions_throw_illegalargumentexception();
@@ -1198,24 +1272,58 @@ JNIEXPORT void JNICALL Java_java_lang_reflect_Field_setDouble(JNIEnv *env, java_
  */
 JNIEXPORT java_lang_String* JNICALL Java_java_lang_reflect_Field_getSignature(JNIEnv *env, java_lang_reflect_Field* this)
 {
-       classinfo        *c;
-       fieldinfo        *f;
-       java_lang_String *s;
+       classinfo     *c;
+       fieldinfo     *f;
+       java_handle_t *o;
+       int32_t        slot;
 
        /* get the class and the field */
 
-       c = (classinfo *) this->declaringClass;
-       f = &c->fields[this->slot];
+       LLNI_field_get_cls(this, clazz, c);
+       LLNI_field_get_val(this, slot , slot);
+       f = &c->fields[slot];
 
        if (f->signature == NULL)
                return NULL;
 
-       s = javastring_new(f->signature);
+       o = javastring_new(f->signature);
+
+       /* in error case o is NULL */
+
+       return (java_lang_String *) o;
+}
+
 
-       /* in error case, s == NULL */
+#if defined(ENABLE_ANNOTATIONS)
+/*
+ * Class:     java/lang/reflect/Field
+ * Method:    declaredAnnotations
+ * Signature: ()Ljava/util/Map;
+ */
+JNIEXPORT struct java_util_Map* JNICALL Java_java_lang_reflect_Field_declaredAnnotations(JNIEnv *env, java_lang_reflect_Field *this)
+{
+       java_util_Map           *declaredAnnotations = NULL; /* parsed annotations                                */
+       java_handle_bytearray_t *annotations         = NULL; /* unparsed annotations                              */
+       java_lang_Class         *declaringClass      = NULL; /* the constant pool of this class is used           */
+       classinfo               *referer             = NULL; /* class, which calles the annotation parser         */
+                                                            /* (for the parameter 'referer' of vm_call_method()) */
+
+       LLNI_field_get_ref(this, declaredAnnotations, declaredAnnotations);
+
+       /* are the annotations parsed yet? */
+       if (declaredAnnotations == NULL) {
+               LLNI_field_get_ref(this, annotations, annotations);
+               LLNI_field_get_ref(this, clazz, declaringClass);
+               LLNI_class_get(this, referer);
+
+               declaredAnnotations = reflect_get_declaredannotatios(annotations, declaringClass, referer);
+
+               LLNI_field_set_ref(this, declaredAnnotations, declaredAnnotations);
+       }
 
-       return s;
+       return declaredAnnotations;
 }
+#endif
 
 
 /*
@@ -1229,4 +1337,5 @@ JNIEXPORT java_lang_String* JNICALL Java_java_lang_reflect_Field_getSignature(JN
  * c-basic-offset: 4
  * tab-width: 4
  * End:
+ * vim:noexpandtab:sw=4:ts=4:
  */