From: Christian Thalinger Date: Mon, 4 Aug 2008 18:17:10 +0000 (-0400) Subject: * src/vmcore/descriptor.h (typedesc): Renamed decltype to X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=c786c5ff949f70e4e4ae2b14096f93cb66d3953d;p=cacao.git * src/vmcore/descriptor.h (typedesc): Renamed decltype to primitvetype, as identifier decltype will become a keyword in C++0x. * src/native/vm/gnuclasspath/java_lang_reflect_VMField.cpp, src/vm/jit/argument.c, src/vm/jit/i386/codegen.c, src/vm/jit/x86_64/codegen.c, src/vm/resolve.c, src/vm/vm.cpp, src/vmcore/descriptor.c, src/vmcore/field.c: Likewise. --- diff --git a/src/native/vm/gnuclasspath/java_lang_reflect_VMField.cpp b/src/native/vm/gnuclasspath/java_lang_reflect_VMField.cpp index c30ad41cc..5284036ca 100644 --- a/src/native/vm/gnuclasspath/java_lang_reflect_VMField.cpp +++ b/src/native/vm/gnuclasspath/java_lang_reflect_VMField.cpp @@ -336,7 +336,7 @@ JNIEXPORT java_lang_Object* JNICALL Java_java_lang_reflect_VMField_get(JNIEnv *e if (!_field_access_check(_this, f, (java_handle_t *) o)) return NULL; - switch (f->parseddesc->decltype) { + switch (f->parseddesc->primitivetype) { case PRIMITIVETYPE_BOOLEAN: case PRIMITIVETYPE_BYTE: case PRIMITIVETYPE_CHAR: @@ -363,7 +363,7 @@ JNIEXPORT java_lang_Object* JNICALL Java_java_lang_reflect_VMField_get(JNIEnv *e /* Now box the primitive types. */ - object = Primitive::box(f->parseddesc->decltype, value); + object = Primitive::box(f->parseddesc->primitivetype, value); return (java_lang_Object *) object; } @@ -393,7 +393,7 @@ JNIEXPORT int32_t JNICALL Java_java_lang_reflect_VMField_getBoolean(JNIEnv *env, /* check the field type and return the value */ - switch (f->parseddesc->decltype) { + switch (f->parseddesc->primitivetype) { case PRIMITIVETYPE_BOOLEAN: return (int32_t) _field_get_int(f, o); default: @@ -427,7 +427,7 @@ JNIEXPORT int32_t JNICALL Java_java_lang_reflect_VMField_getByte(JNIEnv *env, ja /* check the field type and return the value */ - switch (f->parseddesc->decltype) { + switch (f->parseddesc->primitivetype) { case PRIMITIVETYPE_BYTE: return (int32_t) _field_get_int(f, o); default: @@ -461,7 +461,7 @@ JNIEXPORT int32_t JNICALL Java_java_lang_reflect_VMField_getChar(JNIEnv *env, ja /* check the field type and return the value */ - switch (f->parseddesc->decltype) { + switch (f->parseddesc->primitivetype) { case PRIMITIVETYPE_CHAR: return (int32_t) _field_get_int(f, o); default: @@ -495,7 +495,7 @@ JNIEXPORT int32_t JNICALL Java_java_lang_reflect_VMField_getShort(JNIEnv *env, j /* check the field type and return the value */ - switch (f->parseddesc->decltype) { + switch (f->parseddesc->primitivetype) { case PRIMITIVETYPE_BYTE: case PRIMITIVETYPE_SHORT: return (int32_t) _field_get_int(f, o); @@ -530,7 +530,7 @@ JNIEXPORT int32_t JNICALL Java_java_lang_reflect_VMField_getInt(JNIEnv *env , ja /* check the field type and return the value */ - switch (f->parseddesc->decltype) { + switch (f->parseddesc->primitivetype) { case PRIMITIVETYPE_BYTE: case PRIMITIVETYPE_CHAR: case PRIMITIVETYPE_SHORT: @@ -567,7 +567,7 @@ JNIEXPORT int64_t JNICALL Java_java_lang_reflect_VMField_getLong(JNIEnv *env, ja /* check the field type and return the value */ - switch (f->parseddesc->decltype) { + switch (f->parseddesc->primitivetype) { case PRIMITIVETYPE_BYTE: case PRIMITIVETYPE_CHAR: case PRIMITIVETYPE_SHORT: @@ -606,7 +606,7 @@ JNIEXPORT float JNICALL Java_java_lang_reflect_VMField_getFloat(JNIEnv *env, jav /* check the field type and return the value */ - switch (f->parseddesc->decltype) { + switch (f->parseddesc->primitivetype) { case PRIMITIVETYPE_BYTE: case PRIMITIVETYPE_CHAR: case PRIMITIVETYPE_SHORT: @@ -647,7 +647,7 @@ JNIEXPORT double JNICALL Java_java_lang_reflect_VMField_getDouble(JNIEnv *env , /* check the field type and return the value */ - switch (f->parseddesc->decltype) { + switch (f->parseddesc->primitivetype) { case PRIMITIVETYPE_BYTE: case PRIMITIVETYPE_CHAR: case PRIMITIVETYPE_SHORT: @@ -701,7 +701,7 @@ JNIEXPORT void JNICALL Java_java_lang_reflect_VMField_set(JNIEnv *env, java_lang types the value has to be retrieved from the wrapping object */ - switch (df->parseddesc->decltype) { + switch (df->parseddesc->primitivetype) { case PRIMITIVETYPE_BOOLEAN: { int32_t val; @@ -710,7 +710,7 @@ JNIEXPORT void JNICALL Java_java_lang_reflect_VMField_set(JNIEnv *env, java_lang if ((sc == NULL) || !(sf = class_findfield(sc, utf_value, utf_Z))) break; - switch (sf->parseddesc->decltype) { + switch (sf->parseddesc->primitivetype) { case PRIMITIVETYPE_BOOLEAN: LLNI_field_get_val((java_lang_Boolean *) value, value, val); break; @@ -729,7 +729,7 @@ JNIEXPORT void JNICALL Java_java_lang_reflect_VMField_set(JNIEnv *env, java_lang if ((sc == NULL) || !(sf = class_findfield(sc, utf_value, utf_B))) break; - switch (sf->parseddesc->decltype) { + switch (sf->parseddesc->primitivetype) { case PRIMITIVETYPE_BYTE: LLNI_field_get_val((java_lang_Byte *) value, value, val); break; @@ -748,7 +748,7 @@ JNIEXPORT void JNICALL Java_java_lang_reflect_VMField_set(JNIEnv *env, java_lang if ((sc == NULL) || !(sf = class_findfield(sc, utf_value, utf_C))) break; - switch (sf->parseddesc->decltype) { + switch (sf->parseddesc->primitivetype) { case PRIMITIVETYPE_CHAR: LLNI_field_get_val((java_lang_Character *) value, value, val); break; @@ -769,7 +769,7 @@ JNIEXPORT void JNICALL Java_java_lang_reflect_VMField_set(JNIEnv *env, java_lang if ((sc == NULL) || !(sf = class_findfield_by_name(sc, utf_value))) break; - switch (sf->parseddesc->decltype) { + switch (sf->parseddesc->primitivetype) { case PRIMITIVETYPE_BYTE: LLNI_field_get_val((java_lang_Byte *) value, value, val); break; @@ -793,7 +793,7 @@ JNIEXPORT void JNICALL Java_java_lang_reflect_VMField_set(JNIEnv *env, java_lang if ((sc == NULL) || !(sf = class_findfield_by_name(sc, utf_value))) break; - switch (sf->parseddesc->decltype) { + switch (sf->parseddesc->primitivetype) { case PRIMITIVETYPE_BYTE: LLNI_field_get_val((java_lang_Byte *) value, value, val); break; @@ -823,7 +823,7 @@ JNIEXPORT void JNICALL Java_java_lang_reflect_VMField_set(JNIEnv *env, java_lang if ((sc == NULL) || !(sf = class_findfield_by_name(sc, utf_value))) break; - switch (sf->parseddesc->decltype) { + switch (sf->parseddesc->primitivetype) { case PRIMITIVETYPE_BYTE: LLNI_field_get_val((java_lang_Byte *) value, value, val); break; @@ -856,7 +856,7 @@ JNIEXPORT void JNICALL Java_java_lang_reflect_VMField_set(JNIEnv *env, java_lang if ((sc == NULL) || !(sf = class_findfield_by_name(sc, utf_value))) break; - switch (sf->parseddesc->decltype) { + switch (sf->parseddesc->primitivetype) { case PRIMITIVETYPE_BYTE: LLNI_field_get_val((java_lang_Byte *) value, value, val); break; @@ -892,7 +892,7 @@ JNIEXPORT void JNICALL Java_java_lang_reflect_VMField_set(JNIEnv *env, java_lang if ((sc == NULL) || !(sf = class_findfield_by_name(sc, utf_value))) break; - switch (sf->parseddesc->decltype) { + switch (sf->parseddesc->primitivetype) { case PRIMITIVETYPE_BYTE: LLNI_field_get_val((java_lang_Byte *) value, value, val); break; @@ -964,7 +964,7 @@ JNIEXPORT void JNICALL Java_java_lang_reflect_VMField_setBoolean(JNIEnv *env, ja /* check the field type and set the value */ - switch (f->parseddesc->decltype) { + switch (f->parseddesc->primitivetype) { case PRIMITIVETYPE_BOOLEAN: _field_set_int(f, o, value); break; @@ -1000,7 +1000,7 @@ JNIEXPORT void JNICALL Java_java_lang_reflect_VMField_setByte(JNIEnv *env, java_ /* check the field type and set the value */ - switch (f->parseddesc->decltype) { + switch (f->parseddesc->primitivetype) { case PRIMITIVETYPE_BYTE: case PRIMITIVETYPE_SHORT: case PRIMITIVETYPE_INT: @@ -1047,7 +1047,7 @@ JNIEXPORT void JNICALL Java_java_lang_reflect_VMField_setChar(JNIEnv *env, java_ /* check the field type and set the value */ - switch (f->parseddesc->decltype) { + switch (f->parseddesc->primitivetype) { case PRIMITIVETYPE_CHAR: case PRIMITIVETYPE_INT: _field_set_int(f, o, value); @@ -1093,7 +1093,7 @@ JNIEXPORT void JNICALL Java_java_lang_reflect_VMField_setShort(JNIEnv *env, java /* check the field type and set the value */ - switch (f->parseddesc->decltype) { + switch (f->parseddesc->primitivetype) { case PRIMITIVETYPE_SHORT: case PRIMITIVETYPE_INT: _field_set_int(f, o, value); @@ -1139,7 +1139,7 @@ JNIEXPORT void JNICALL Java_java_lang_reflect_VMField_setInt(JNIEnv *env, java_l /* check the field type and set the value */ - switch (f->parseddesc->decltype) { + switch (f->parseddesc->primitivetype) { case PRIMITIVETYPE_INT: _field_set_int(f, o, value); break; @@ -1184,7 +1184,7 @@ JNIEXPORT void JNICALL Java_java_lang_reflect_VMField_setLong(JNIEnv *env, java_ /* check the field type and set the value */ - switch (f->parseddesc->decltype) { + switch (f->parseddesc->primitivetype) { case PRIMITIVETYPE_LONG: _field_set_long(f, o, value); break; @@ -1226,7 +1226,7 @@ JNIEXPORT void JNICALL Java_java_lang_reflect_VMField_setFloat(JNIEnv *env, java /* check the field type and set the value */ - switch (f->parseddesc->decltype) { + switch (f->parseddesc->primitivetype) { case PRIMITIVETYPE_FLOAT: _field_set_float(f, o, value); break; @@ -1265,7 +1265,7 @@ JNIEXPORT void JNICALL Java_java_lang_reflect_VMField_setDouble(JNIEnv *env, jav /* check the field type and set the value */ - switch (f->parseddesc->decltype) { + switch (f->parseddesc->primitivetype) { case PRIMITIVETYPE_DOUBLE: _field_set_double(f, o, value); break; diff --git a/src/vm/jit/argument.c b/src/vm/jit/argument.c index 986dcb60e..7e43b93cc 100644 --- a/src/vm/jit/argument.c +++ b/src/vm/jit/argument.c @@ -498,7 +498,7 @@ uint64_t *argument_vmarray_from_jvalue(methodinfo *m, java_handle_t *o, } for (j = 0; i < md->paramcount; i++, j++, pd++, td++) { - switch (td->decltype) { + switch (td->primitivetype) { case TYPE_INT: argument_vmarray_store_int(array, pd, args[j].i); break; @@ -599,7 +599,7 @@ uint64_t *argument_vmarray_from_objectarray(methodinfo *m, java_handle_t *o, LLNI_class_get(param, c); type = Primitive_get_type_by_wrapperclass(c); - switch (td->decltype) { + switch (td->primitivetype) { case PRIMITIVETYPE_BOOLEAN: switch (type) { case PRIMITIVETYPE_BOOLEAN: @@ -655,7 +655,7 @@ uint64_t *argument_vmarray_from_objectarray(methodinfo *m, java_handle_t *o, default: vm_abort("argument_vmarray_from_objectarray: invalid type %d", - td->decltype); + td->primitivetype); } value = Primitive_unbox(param); @@ -669,7 +669,7 @@ uint64_t *argument_vmarray_from_objectarray(methodinfo *m, java_handle_t *o, LLNI_class_get(param, c); type = Primitive_get_type_by_wrapperclass(c); - assert(td->decltype == PRIMITIVETYPE_LONG); + assert(td->primitivetype == PRIMITIVETYPE_LONG); switch (type) { case PRIMITIVETYPE_BYTE: @@ -693,7 +693,7 @@ uint64_t *argument_vmarray_from_objectarray(methodinfo *m, java_handle_t *o, LLNI_class_get(param, c); type = Primitive_get_type_by_wrapperclass(c); - assert(td->decltype == PRIMITIVETYPE_FLOAT); + assert(td->primitivetype == PRIMITIVETYPE_FLOAT); switch (type) { case PRIMITIVETYPE_FLOAT: @@ -714,7 +714,7 @@ uint64_t *argument_vmarray_from_objectarray(methodinfo *m, java_handle_t *o, LLNI_class_get(param, c); type = Primitive_get_type_by_wrapperclass(c); - assert(td->decltype == PRIMITIVETYPE_DOUBLE); + assert(td->primitivetype == PRIMITIVETYPE_DOUBLE); switch (type) { case PRIMITIVETYPE_FLOAT: diff --git a/src/vm/jit/i386/codegen.c b/src/vm/jit/i386/codegen.c index 8118714e9..3dd260d9c 100644 --- a/src/vm/jit/i386/codegen.c +++ b/src/vm/jit/i386/codegen.c @@ -3636,7 +3636,7 @@ void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f, int s switch (md->returntype.type) { case TYPE_INT: case TYPE_ADR: - switch (md->returntype.decltype) { + switch (md->returntype.primitivetype) { case PRIMITIVETYPE_BOOLEAN: M_BZEXT(REG_RESULT, REG_RESULT); break; diff --git a/src/vm/jit/x86_64/codegen.c b/src/vm/jit/x86_64/codegen.c index b66112e9f..c771748b4 100644 --- a/src/vm/jit/x86_64/codegen.c +++ b/src/vm/jit/x86_64/codegen.c @@ -3042,7 +3042,7 @@ void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f, int s case TYPE_INT: case TYPE_LNG: case TYPE_ADR: - switch (md->returntype.decltype) { + switch (md->returntype.primitivetype) { case PRIMITIVETYPE_BOOLEAN: M_BZEXT(REG_RESULT, REG_RESULT); break; diff --git a/src/vm/resolve.c b/src/vm/resolve.c index 1f2fad52a..d7f4d43e4 100644 --- a/src/vm/resolve.c +++ b/src/vm/resolve.c @@ -501,7 +501,7 @@ bool resolve_class_from_typedesc(typedesc *d, bool checkaccess, bool link, class else { /* a primitive type */ - cls = Primitive_get_class_by_type(d->decltype); + cls = Primitive_get_class_by_type(d->primitivetype); assert(cls->state & CLASS_LOADED); diff --git a/src/vm/vm.cpp b/src/vm/vm.cpp index 2000a5480..a68854230 100644 --- a/src/vm/vm.cpp +++ b/src/vm/vm.cpp @@ -2599,7 +2599,7 @@ java_handle_t *vm_call_method_objectarray(methodinfo *m, java_handle_t *o, return NULL; } - switch (m->parseddesc->returntype.decltype) { + switch (m->parseddesc->returntype.primitivetype) { case PRIMITIVETYPE_VOID: value.a = vm_call_array(m, array); break; @@ -2629,7 +2629,7 @@ java_handle_t *vm_call_method_objectarray(methodinfo *m, java_handle_t *o, break; default: - vm_abort("vm_call_method_objectarray: invalid return type %d", m->parseddesc->returntype.decltype); + vm_abort("vm_call_method_objectarray: invalid return type %d", m->parseddesc->returntype.primitivetype); } /* release dump area */ @@ -2642,8 +2642,8 @@ java_handle_t *vm_call_method_objectarray(methodinfo *m, java_handle_t *o, /* box the return value if necesarry */ - if (m->parseddesc->returntype.decltype != TYPE_ADR) - ro = Primitive::box(m->parseddesc->returntype.decltype, value); + if (m->parseddesc->returntype.primitivetype != TYPE_ADR) + ro = Primitive::box(m->parseddesc->returntype.primitivetype, value); /* check for an exception */ diff --git a/src/vmcore/descriptor.c b/src/vmcore/descriptor.c index 1f8c63853..c0886e0db 100644 --- a/src/vmcore/descriptor.c +++ b/src/vmcore/descriptor.c @@ -339,7 +339,7 @@ descriptor_to_typedesc(descriptor_pool *pool, char *utf_ptr, char *end_pos, if (name) { /* a reference type */ td->type = TYPE_ADR; - td->decltype = TYPE_ADR; + td->primitivetype = TYPE_ADR; td->arraydim = 0; for (utf_ptr = name->text; *utf_ptr == '['; ++utf_ptr) td->arraydim++; @@ -349,39 +349,39 @@ descriptor_to_typedesc(descriptor_pool *pool, char *utf_ptr, char *end_pos, /* a primitive type */ switch (*utf_ptr) { case 'B': - td->decltype = PRIMITIVETYPE_BYTE; + td->primitivetype = PRIMITIVETYPE_BYTE; td->type = TYPE_INT; break; case 'C': - td->decltype = PRIMITIVETYPE_CHAR; + td->primitivetype = PRIMITIVETYPE_CHAR; td->type = TYPE_INT; break; case 'S': - td->decltype = PRIMITIVETYPE_SHORT; + td->primitivetype = PRIMITIVETYPE_SHORT; td->type = TYPE_INT; break; case 'Z': - td->decltype = PRIMITIVETYPE_BOOLEAN; + td->primitivetype = PRIMITIVETYPE_BOOLEAN; td->type = TYPE_INT; break; case 'I': - td->decltype = PRIMITIVETYPE_INT; + td->primitivetype = PRIMITIVETYPE_INT; td->type = TYPE_INT; break; case 'D': - td->decltype = PRIMITIVETYPE_DOUBLE; + td->primitivetype = PRIMITIVETYPE_DOUBLE; td->type = TYPE_DBL; break; case 'F': - td->decltype = PRIMITIVETYPE_FLOAT; + td->primitivetype = PRIMITIVETYPE_FLOAT; td->type = TYPE_FLT; break; case 'J': - td->decltype = PRIMITIVETYPE_LONG; + td->primitivetype = PRIMITIVETYPE_LONG; td->type = TYPE_LNG; break; case 'V': - td->decltype = PRIMITIVETYPE_VOID; + td->primitivetype = PRIMITIVETYPE_VOID; td->type = TYPE_VOID; break; default: @@ -928,7 +928,7 @@ descriptor_pool_parse_method_descriptor(descriptor_pool *pool, utf *desc, if ((mflags != ACC_UNDEF) && !(mflags & ACC_STATIC)) { td->type = TYPE_ADR; - td->decltype = TYPE_ADR; + td->primitivetype = TYPE_ADR; td->arraydim = 0; td->classref = thisclass; @@ -1070,7 +1070,7 @@ bool descriptor_params_from_paramtypes(methoddesc *md, s4 mflags) /* fill in first argument `this' */ td->type = TYPE_ADR; - td->decltype = TYPE_ADR; + td->primitivetype = TYPE_ADR; td->arraydim = 0; td->classref = thisclass; @@ -1211,7 +1211,7 @@ descriptor_debug_print_typedesc(FILE *file,typedesc *d) fprintf(file,""); } else { - switch (d->decltype) { + switch (d->primitivetype) { case PRIMITIVETYPE_INT : ch='I'; break; case PRIMITIVETYPE_CHAR : ch='C'; break; case PRIMITIVETYPE_BYTE : ch='B'; break; diff --git a/src/vmcore/descriptor.h b/src/vmcore/descriptor.h index dae43e721..1e3027ed8 100644 --- a/src/vmcore/descriptor.h +++ b/src/vmcore/descriptor.h @@ -1,9 +1,7 @@ /* src/vmcore/descriptor.h - checking and parsing of field / method descriptors - Copyright (C) 1996-2005, 2006, 2007 R. Grafl, A. Krall, C. Kruegel, - C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring, - E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, - J. Wenninger, Institut f. Computersprachen - TU Wien + Copyright (C) 1996-2005, 2006, 2007, 2008 + CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO This file is part of CACAO. @@ -100,17 +98,17 @@ struct descriptor_pool { /* data structures for parsed field/method descriptors ************************/ struct typedesc { - constant_classref *classref; /* class reference for TYPE_ADR types */ - u1 type; /* TYPE_??? constant [1] */ - u1 decltype; /* (PRIMITIVE)TYPE_??? constant [2] */ - u1 arraydim; /* array dimension (0 if no array) */ + constant_classref *classref; /* class reference for TYPE_ADR types */ + u1 type; /* TYPE_??? constant [1] */ + u1 primitivetype; /* (PRIMITIVE)TYPE_??? constant [2] */ + u1 arraydim; /* array dimension (0 if no array) */ }; /* [1]...the type field contains the basic type used within the VM. So ints, */ /* shorts, chars, bytes, booleans all have TYPE_INT. */ -/* [2]...the decltype field contains the declared type. */ +/* [2]...the primitivetype field contains the declared type. */ /* So short is PRIMITIVETYPE_SHORT, char is PRIMITIVETYPE_CHAR. */ -/* For non-primitive types decltype is TYPE_ADR. */ +/* For non-primitive types primitivetype is TYPE_ADR. */ struct paramdesc { #if defined(__MIPS__) diff --git a/src/vmcore/field.c b/src/vmcore/field.c index 59fe3bdf5..4adcc03bb 100644 --- a/src/vmcore/field.c +++ b/src/vmcore/field.c @@ -364,7 +364,7 @@ classinfo *field_get_type(fieldinfo *f) c = load_class_from_classloader(u, f->clazz->classloader); } else { - c = Primitive_get_class_by_type(td->decltype); + c = Primitive_get_class_by_type(td->primitivetype); } return c;