/* src/vm/class.cpp - class related functions
- Copyright (C) 1996-2005, 2006, 2007, 2008
+ Copyright (C) 1996-2005, 2006, 2007, 2008, 2010
CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
This file is part of CACAO.
if (classname != utf_not_named_yet)
class_set_packagename(c);
- c->object.header.lockword.init();
+ Lockword(c->object.header.lockword).init();
return c;
}
static void class_freecpool(classinfo *c)
{
- u4 idx;
+ int idx;
u4 tag;
void* info;
/* check index and type of constantpool entry */
/* (pos == 0 is caught by type comparison) */
- if ((pos >= c->cpcount) || (c->cptags[pos] != ctype)) {
+ if (((int) pos >= c->cpcount) || (c->cptags[pos] != ctype)) {
exceptions_throw_classformaterror(c, "Illegal constant pool index");
return NULL;
}
{
/* invalid position in constantpool */
- if (pos >= c->cpcount) {
+ if ((int) pos >= c->cpcount) {
exceptions_throw_classformaterror(c, "Illegal constant pool index");
return NULL;
}
bool class_is_arraycompatible(arraydescriptor *desc, arraydescriptor *target)
{
if (desc == target)
- return 1;
+ return true;
if (desc->arraytype != target->arraytype)
- return 0;
+ return false;
if (desc->arraytype != ARRAYTYPE_OBJECT)
- return 1;
+ return true;
/* {both arrays are arrays of references} */
if (desc->dimension == target->dimension) {
if (!desc->elementvftbl)
- return 0;
+ return false;
+
/* an array which contains elements of interface types is
- allowed to be casted to Object (JOWENN)*/
+ allowed to be casted to array of Object (JOWENN) */
if ((desc->elementvftbl->baseval < 0) &&
(target->elementvftbl->baseval == 1))
- return 1;
+ return true;
return class_isanysubclass(desc->elementvftbl->clazz,
target->elementvftbl->clazz);
}
if (desc->dimension < target->dimension)
- return 0;
+ return false;
/* {desc has higher dimension than target} */
/* Decide whether we are dealing with array types or object types. */
- if (class_is_array(to))
+ if (class_is_array(to) && class_is_array(from))
return class_is_arraycompatible(from->vftbl->arraydesc, to->vftbl->arraydesc);
else
return class_isanysubclass(from, to);
utf *outername;
int declaredclasscount; /* number of declared classes */
int pos; /* current declared class */
- java_handle_objectarray_t *oa; /* array of declared classes */
int i;
classinfo *ic;
/* Allocate Class[] and check for OOM. */
- oa = builtin_anewarray(declaredclasscount, class_java_lang_Class);
+ ClassArray declaredclasses(declaredclasscount);
- if (oa == NULL)
+ if (declaredclasses.is_null())
return NULL;
for (i = 0, pos = 0; i < c->innerclasscount; i++) {
if (!link_class(ic))
return NULL;
- LLNI_array_direct(oa, pos++) = (java_object_t *) ic;
+ declaredclasses.set_element(pos++, ic);
}
}
- return oa;
+ return declaredclasses.get_handle();
}
#if defined(ENABLE_JAVASE)
java_handle_objectarray_t *class_get_declaredconstructors(classinfo *c, bool publicOnly)
{
- methodinfo* m;
- java_handle_objectarray_t* oa;
- int count;
- int index;
- int i;
+ methodinfo* m;
+ int count;
+ int index;
+ int i;
/* Determine number of constructors. */
/* Create array of constructors. */
- oa = builtin_anewarray(count, class_java_lang_reflect_Constructor);
+ ObjectArray oa(count, class_java_lang_reflect_Constructor);
- if (oa == NULL)
+ if (oa.is_null())
return NULL;
/* Get the constructors and store them in the array. */
/* Store object into array. */
- array_objectarray_element_set(oa, index, rc.get_handle());
+ oa.set_element(index, rc.get_handle());
index++;
}
}
- return oa;
+ return oa.get_handle();
}
#endif
#if defined(ENABLE_JAVASE)
java_handle_objectarray_t *class_get_declaredfields(classinfo *c, bool publicOnly)
{
- java_handle_objectarray_t *oa;
- fieldinfo *f;
- int count;
- int index;
- int i;
+ fieldinfo* f;
+ int count;
+ int index;
+ int i;
/* Determine number of fields. */
/* Create array of fields. */
- oa = builtin_anewarray(count, class_java_lang_reflect_Field);
+ ObjectArray oa(count, class_java_lang_reflect_Field);
- if (oa == NULL)
+ if (oa.is_null())
return NULL;
/* Get the fields and store them in the array. */
/* Store object into array. */
- array_objectarray_element_set(oa, index, rf.get_handle());
+ oa.set_element(index, rf.get_handle());
index++;
}
}
- return oa;
+ return oa.get_handle();
}
#endif
#if defined(ENABLE_JAVASE)
java_handle_objectarray_t *class_get_declaredmethods(classinfo *c, bool publicOnly)
{
- java_handle_objectarray_t *oa; /* result: array of Method-objects */
- methodinfo *m; /* the current method to be represented */
- int count;
- int index;
- int i;
+ methodinfo* m; /* the current method to be represented */
+ int count;
+ int index;
+ int i;
/* JOWENN: array classes do not declare methods according to mauve
test. It should be considered, if we should return to my old
clone method overriding instead of declaring it as a member
function. */
- if (class_is_array(c))
- return builtin_anewarray(0, class_java_lang_reflect_Method);
+ if (class_is_array(c)) {
+ ObjectArray oa(0, class_java_lang_reflect_Method);
+ return oa.get_handle();
+ }
/* Determine number of methods. */
/* Create array of methods. */
- oa = builtin_anewarray(count, class_java_lang_reflect_Method);
+ ObjectArray oa(count, class_java_lang_reflect_Method);
- if (oa == NULL)
+ if (oa.is_null())
return NULL;
/* Get the methods and store them in the array. */
/* Store object into array. */
- array_objectarray_element_set(oa, index, rm.get_handle());
+ oa.set_element(index, rm.get_handle());
index++;
}
}
- return oa;
+ return oa.get_handle();
}
#endif
*******************************************************************************/
-java_handle_objectarray_t *class_get_interfaces(classinfo *c)
+java_handle_objectarray_t* class_get_interfaces(classinfo *c)
{
- classinfo *ic;
- java_handle_objectarray_t *oa;
- u4 i;
+ classinfo* ic;
+ int i;
if (!(c->state & CLASS_LINKED))
if (!link_class(c))
return NULL;
- oa = builtin_anewarray(c->interfacescount, class_java_lang_Class);
+ ClassArray interfaces(c->interfacescount);
- if (oa == NULL)
+ if (interfaces.is_null())
return NULL;
for (i = 0; i < c->interfacescount; i++) {
ic = c->interfaces[i];
- LLNI_array_direct(oa, i) = (java_object_t *) ic;
+ interfaces.set_element(i, ic);
}
- return oa;
+ return interfaces.get_handle();
}
LLNI_classinfo_field_get(c, annotations, annotations);
- return (java_handle_bytearray_t*)annotations;
+ return (java_handle_bytearray_t*) annotations;
#else
return NULL;
#endif
#if !defined(NDEBUG)
void class_showconstantpool (classinfo *c)
{
- u4 i;
+ int i;
void* e;
printf ("---- dump of constant pool ----\n");
for (i=0; i<c->cpcount; i++) {
- printf ("#%d: ", (int) i);
+ printf ("#%d: ", i);
e = c -> cpinfos [i];
if (e) {
projects / cacao.git / blobdiff