Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: field.c 8249 2007-07-31 12:59:03Z panzi $
-
*/
#include "vm/types.h"
+#include "vm/array.h"
+#include "vm/builtin.h"
#include "vm/exceptions.h"
+#include "vm/global.h"
+#include "vm/primitive.h"
#include "vm/stringlocal.h"
#include "vm/vm.h"
#include "vmcore/field.h"
#include "vmcore/loader.h"
#include "vmcore/options.h"
-#include "vmcore/primitive.h"
#include "vmcore/references.h"
#include "vmcore/suck.h"
#include "vmcore/utf8.h"
{
classinfo *c;
u4 attrnum, i;
- u4 jtype;
u4 pindex = field_load_NOVALUE; /* constantvalue_index */
utf *u;
+ /* Get class. */
+
c = cb->class;
+ f->class = c;
+
+ /* Get access flags. */
+
if (!suck_check_classbuffer_size(cb, 2 + 2 + 2))
return false;
f->flags = suck_u2(cb);
+ /* Get name. */
+
if (!(u = class_getconstant(c, suck_u2(cb), CONSTANT_Utf8)))
return false;
f->name = u;
+ /* Get descriptor. */
+
if (!(u = class_getconstant(c, suck_u2(cb), CONSTANT_Utf8)))
return false;
/* data type */
- jtype = descriptor_to_basic_type(f->descriptor);
+ f->type = descriptor_to_basic_type(f->descriptor);
- f->class = c;
- f->type = jtype;
- f->offset = 0; /* offset from start of object */
+ /* For static-fields allocate memory for the value and set the
+ value to 0. */
- switch (f->type) {
- case TYPE_INT:
- f->value.i = 0;
- break;
+ if (f->flags & ACC_STATIC) {
+ switch (f->type) {
+ case TYPE_INT:
+ case TYPE_LNG:
+ case TYPE_FLT:
+ case TYPE_DBL:
+ f->value = NEW(imm_union);
+ break;
- case TYPE_FLT:
- f->value.f = 0.0;
- break;
+ case TYPE_ADR:
+#if defined(ENABLE_GC_CACAO)
+ f->value = NEW(imm_union);
+#else
+ f->value = GCNEW_UNCOLLECTABLE(imm_union, 1);
+#endif
+ break;
- case TYPE_DBL:
- f->value.d = 0.0;
- break;
+ default:
+ vm_abort("field_load: invalid field type %d", f->type);
+ }
- case TYPE_ADR:
- f->value.a = NULL;
- if (!(f->flags & ACC_STATIC))
- c->flags |= ACC_CLASS_HAS_POINTERS;
- break;
+ /* Set the field to zero, for float and double fields set the
+ correct 0.0 value. */
- case TYPE_LNG:
-#if U8_AVAILABLE
- f->value.l = 0;
-#else
- f->value.l.low = 0;
- f->value.l.high = 0;
-#endif
- break;
+ switch (f->type) {
+ case TYPE_INT:
+ case TYPE_LNG:
+ case TYPE_ADR:
+ f->value->l = 0;
+ break;
+
+ case TYPE_FLT:
+ f->value->f = 0.0;
+ break;
+
+ case TYPE_DBL:
+ f->value->d = 0.0;
+ break;
+ }
+ }
+ else {
+ /* For instance-fields set the offset to 0. */
+
+ f->offset = 0;
+
+ /* For final fields, which are not static, we need a value
+ structure. */
+
+ if (f->flags & ACC_FINAL) {
+ f->value = NEW(imm_union);
+ /* XXX hack */
+ f->value->l = 0;
+ }
+
+ switch (f->type) {
+ case TYPE_ADR:
+ c->flags |= ACC_CLASS_HAS_POINTERS;
+ break;
+ }
}
/* read attributes */
+
if (!suck_check_classbuffer_size(cb, 2))
return false;
attrnum = suck_u2(cb);
+
for (i = 0; i < attrnum; i++) {
if (!suck_check_classbuffer_size(cb, 2))
return false;
/* initialize field with value from constantpool */
- switch (jtype) {
+ switch (f->type) {
case TYPE_INT: {
constant_integer *ci;
if (!(ci = class_getconstant(c, pindex, CONSTANT_Integer)))
return false;
- f->value.i = ci->value;
+ f->value->i = ci->value;
}
break;
if (!(cl = class_getconstant(c, pindex, CONSTANT_Long)))
return false;
- f->value.l = cl->value;
+ f->value->l = cl->value;
}
break;
if (!(cf = class_getconstant(c, pindex, CONSTANT_Float)))
return false;
- f->value.f = cf->value;
+ f->value->f = cf->value;
}
break;
if (!(cd = class_getconstant(c, pindex, CONSTANT_Double)))
return false;
- f->value.d = cd->value;
+ f->value->d = cd->value;
}
break;
if (!(u = class_getconstant(c, pindex, CONSTANT_String)))
return false;
- /* create javastring from compressed utf8-string */
- f->value.a = literalstring_new(u);
+ /* Create Java-string from compressed UTF8-string. */
+
+ f->value->a = literalstring_new(u);
break;
default:
- vm_abort("field_load: invalid field type %d", jtype);
+ vm_abort("field_load: invalid field type %d", f->type);
}
}
#if defined(ENABLE_JAVASE)
}
-#if defined(ENABLE_ANNOTATIONS)
/* field_get_annotations ******************************************************
Gets a fields' annotations (or NULL if none).
*******************************************************************************/
-annotation_bytearray_t *field_get_annotations(fieldinfo *f)
+java_handle_bytearray_t *field_get_annotations(fieldinfo *f)
{
- classinfo *c = f->class;
- int slot = f - c->fields;
-
- if (c->field_annotations != NULL &&
- c->field_annotations->size > slot) {
- return c->field_annotations->data[slot];
+#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 && 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 ************************************************************
projects / cacao.git / blobdiff