#include <mono/metadata/object.h>
#include <mono/metadata/appdomain.h>
#include <mono/metadata/mono-endian.h>
+#if HAVE_BOEHM_GC
+#include <gc/gc.h>
+#endif
#define CSIZE(x) (sizeof (x) / 4)
static MonoClass * mono_class_create_from_typedef (MonoImage *image, guint32 type_token);
-static gpointer
-default_trampoline (MonoMethod *method)
-{
- return method;
-}
-
-static void
-default_runtime_class_init (MonoClass *klass)
-{
- return;
-}
-
-static MonoTrampoline arch_create_jit_trampoline = default_trampoline;
-static MonoRuntimeClassInit mono_runtime_class_init = default_runtime_class_init;
-
-void
-mono_install_trampoline (MonoTrampoline func)
-{
- arch_create_jit_trampoline = func? func: default_trampoline;
-}
-
-void
-mono_install_runtime_class_init (MonoRuntimeClassInit func)
-{
- mono_runtime_class_init = func? func: default_runtime_class_init;
-}
-
-static MonoClass *
-mono_class_create_from_typeref (MonoImage *image, guint32 type_token)
+MonoClass *
+mono_class_from_typeref (MonoImage *image, guint32 type_token)
{
guint32 cols [MONO_TYPEREF_SIZE];
MonoTableInfo *t = &image->tables [MONO_TABLE_TYPEREF];
MonoClass *res;
mono_metadata_decode_row (t, (type_token&0xffffff)-1, cols, MONO_TYPEREF_SIZE);
- g_assert ((cols [MONO_TYPEREF_SCOPE] & 0x3) == 2);
- idx = cols [MONO_TYPEREF_SCOPE] >> 2;
+
+ name = mono_metadata_string_heap (image, cols [MONO_TYPEREF_NAME]);
+ nspace = mono_metadata_string_heap (image, cols [MONO_TYPEREF_NAMESPACE]);
+
+ idx = cols [MONO_TYPEREF_SCOPE] >> RESOLTION_SCOPE_BITS;
+ switch (cols [MONO_TYPEREF_SCOPE] & RESOLTION_SCOPE_MASK) {
+ case RESOLTION_SCOPE_MODULE:
+ if (!idx)
+ g_error ("null ResolutionScope not yet handled");
+ /* a typedef in disguise */
+ return mono_class_from_name (image, nspace, name);
+ case RESOLTION_SCOPE_MODULEREF:
+ g_error ("ModuleRef ResolutionScope not yet handled");
+ case RESOLTION_SCOPE_TYPEREF:
+ g_error ("TypeRef ResolutionScope not yet handled");
+ case RESOLTION_SCOPE_ASSEMBLYREF:
+ break;
+ }
if (!image->references || !image->references [idx-1]) {
/*
return res;
}
- name = mono_metadata_string_heap (image, cols [MONO_TYPEREF_NAME]);
- nspace = mono_metadata_string_heap (image, cols [MONO_TYPEREF_NAMESPACE]);
-
/* load referenced assembly */
image = image->references [idx-1]->image;
G_BREAKPOINT ();
}
/*
- * Compute field layout and total size.
+ * Compute field layout and total size (not considering static fields)
*/
- switch (layout){
+ switch (layout) {
case TYPE_ATTRIBUTE_AUTO_LAYOUT:
case TYPE_ATTRIBUTE_SEQUENTIAL_LAYOUT:
for (i = 0; i < top; i++){
int size, align;
+ if (class->fields [i].type->attrs & FIELD_ATTRIBUTE_STATIC)
+ continue;
+
size = mono_type_size (class->fields [i].type, &align);
- if (class->fields [i].type->attrs & FIELD_ATTRIBUTE_STATIC) {
- class->fields [i].offset = class->class_size;
- class->fields [i].offset += align - 1;
- class->fields [i].offset &= ~(align - 1);
- class->class_size = class->fields [i].offset + size;
- } else {
- class->min_align = MAX (align, class->min_align);
- class->fields [i].offset = class->instance_size;
- class->fields [i].offset += align - 1;
- class->fields [i].offset &= ~(align - 1);
- class->instance_size = class->fields [i].offset + size;
- }
+
+ class->min_align = MAX (align, class->min_align);
+ class->fields [i].offset = class->instance_size;
+ class->fields [i].offset += align - 1;
+ class->fields [i].offset &= ~(align - 1);
+ class->instance_size = class->fields [i].offset + size;
}
+
if (class->instance_size & (class->min_align - 1)) {
class->instance_size += class->min_align - 1;
class->instance_size &= ~(class->min_align - 1);
}
break;
case TYPE_ATTRIBUTE_EXPLICIT_LAYOUT:
- for (i = 0; i < top; i++){
+ for (i = 0; i < top; i++) {
int size, align;
int idx = class->field.first + i;
* uses explicit layout.
*/
+ if (class->fields [i].type->attrs & FIELD_ATTRIBUTE_STATIC)
+ continue;
+
size = mono_type_size (class->fields [i].type, &align);
- if (class->fields [i].type->attrs & FIELD_ATTRIBUTE_STATIC) {
- class->fields [i].offset = class->class_size;
- class->fields [i].offset += align - 1;
- class->fields [i].offset &= ~(align - 1);
- class->class_size = class->fields [i].offset + size;
- } else {
- mono_metadata_field_info (m, idx, &class->fields [i].offset, NULL, NULL);
- if (class->fields [i].offset == (guint32)-1)
- g_warning ("%s not initialized correctly (missing field layout info for %s)", class->name, class->fields [i].name);
- /*
- * The offset is from the start of the object: this works for both
- * classes and valuetypes.
- */
- class->fields [i].offset += sizeof (MonoObject);
- /*
- * Calc max size.
- */
- size += class->fields [i].offset;
- class->instance_size = MAX (class->instance_size, size);
- }
+
+ mono_metadata_field_info (m, idx, &class->fields [i].offset, NULL, NULL);
+ if (class->fields [i].offset == (guint32)-1)
+ g_warning ("%s not initialized correctly (missing field layout info for %s)", class->name, class->fields [i].name);
+ /*
+ * The offset is from the start of the object: this works for both
+ * classes and valuetypes.
+ */
+ class->fields [i].offset += sizeof (MonoObject);
+ /*
+ * Calc max size.
+ */
+ size += class->fields [i].offset;
+ class->instance_size = MAX (class->instance_size, size);
+ }
+ break;
+ }
+
+ class->size_inited = 1;
+
+ /*
+ * Compute static field layout and size
+ */
+ switch (layout) {
+ case TYPE_ATTRIBUTE_AUTO_LAYOUT:
+ case TYPE_ATTRIBUTE_SEQUENTIAL_LAYOUT:
+ for (i = 0; i < top; i++){
+ int size, align;
+
+ if (!(class->fields [i].type->attrs & FIELD_ATTRIBUTE_STATIC))
+ continue;
+
+ size = mono_type_size (class->fields [i].type, &align);
+ class->fields [i].offset = class->class_size;
+ class->fields [i].offset += align - 1;
+ class->fields [i].offset &= ~(align - 1);
+ class->class_size = class->fields [i].offset + size;
+ }
+ break;
+ case TYPE_ATTRIBUTE_EXPLICIT_LAYOUT:
+ for (i = 0; i < top; i++){
+ int size, align;
+
+ /*
+ * There must be info about all the fields in a type if it
+ * uses explicit layout.
+ */
+
+
+ if (!(class->fields [i].type->attrs & FIELD_ATTRIBUTE_STATIC))
+ continue;
+
+ size = mono_type_size (class->fields [i].type, &align);
+ class->fields [i].offset = class->class_size;
+ class->fields [i].offset += align - 1;
+ class->fields [i].offset &= ~(align - 1);
+ class->class_size = class->fields [i].offset + size;
}
break;
}
for (j = startm; j < endm; ++j) {
mono_metadata_decode_row (msemt, j, cols, MONO_METHOD_SEMA_SIZE);
switch (cols [MONO_METHOD_SEMA_SEMANTICS]) {
- case 1: /* set */
+ case METHOD_SEMANTIC_SETTER:
class->properties [i - class->property.first].set = class->methods [cols [MONO_METHOD_SEMA_METHOD] - 1 - class->method.first];
break;
- case 2: /* get */
+ case METHOD_SEMANTIC_GETTER:
class->properties [i - class->property.first].get = class->methods [cols [MONO_METHOD_SEMA_METHOD] - 1 - class->method.first];
break;
default:
}
}
+static void
+init_events (MonoClass *class)
+{
+ guint startm, endm, i, j;
+ guint32 cols [MONO_EVENT_SIZE];
+ MonoTableInfo *pt = &class->image->tables [MONO_TABLE_EVENT];
+ MonoTableInfo *msemt = &class->image->tables [MONO_TABLE_METHODSEMANTICS];
+
+ class->event.first = mono_metadata_events_from_typedef (class->image, mono_metadata_token_index (class->type_token) - 1, &class->event.last);
+ class->event.count = class->event.last - class->event.first;
+
+ class->events = g_new0 (MonoEvent, class->event.count);
+ for (i = class->event.first; i < class->event.last; ++i) {
+ mono_metadata_decode_row (pt, i, cols, MONO_EVENT_SIZE);
+ class->events [i - class->event.first].attrs = cols [MONO_EVENT_FLAGS];
+ class->events [i - class->event.first].name = mono_metadata_string_heap (class->image, cols [MONO_EVENT_NAME]);
+
+ startm = mono_metadata_methods_from_event (class->image, i, &endm);
+ for (j = startm; j < endm; ++j) {
+ mono_metadata_decode_row (msemt, j, cols, MONO_METHOD_SEMA_SIZE);
+ switch (cols [MONO_METHOD_SEMA_SEMANTICS]) {
+ case METHOD_SEMANTIC_ADD_ON:
+ class->events [i - class->event.first].add = class->methods [cols [MONO_METHOD_SEMA_METHOD] - 1 - class->method.first];
+ break;
+ case METHOD_SEMANTIC_REMOVE_ON:
+ class->events [i - class->event.first].remove = class->methods [cols [MONO_METHOD_SEMA_METHOD] - 1 - class->method.first];
+ break;
+ case METHOD_SEMANTIC_FIRE:
+ class->events [i - class->event.first].raise = class->methods [cols [MONO_METHOD_SEMA_METHOD] - 1 - class->method.first];
+ break;
+ case METHOD_SEMANTIC_OTHER: /* don't care for now */
+ default:
+ break;
+ }
+ }
+ }
+}
+
static guint
mono_get_unique_iid (MonoClass *class)
{
mono_class_init (MonoClass *class)
{
MonoClass *k, *ic;
- MonoMethod **vtable = class->vtable;
- int i, max_iid, cur_slot = 0;
+ MonoMethod **vtable;
+ int i, max_vtsize = 0, max_iid, cur_slot = 0;
+ static MonoMethod *default_ghc = NULL;
+ static MonoMethod *default_finalize = NULL;
+ static int finalize_slot = -1;
+ static int ghc_slot = -1;
g_assert (class);
if (class->inited)
return;
- class->inited = 1;
+
+ if (class->init_pending) {
+ /* this indicates a cyclic dependency */
+ g_error ("pending init %s.%s\n", class->name_space, class->name);
+ }
+
+ class->init_pending = 1;
+
+// mono_stats.initialized_class_count++;
if (class->parent) {
if (!class->parent->inited)
/*
* Computes the size used by the fields, and their locations
*/
- if (class->field.count > 0){
+ if (!class->size_inited && class->field.count > 0){
class->fields = g_new0 (MonoClassField, class->field.count);
class_compute_field_layout (class);
}
+ if (!(class->flags & TYPE_ATTRIBUTE_INTERFACE)) {
+ for (i = 0; i < class->interface_count; i++)
+ max_vtsize += class->interfaces [i]->method.count;
+
+ if (class->parent)
+ max_vtsize += class->parent->vtable_size;
+
+ max_vtsize += class->method.count;
+ }
+
+ vtable = alloca (sizeof (gpointer) * max_vtsize);
+ memset (vtable, 0, sizeof (gpointer) * max_vtsize);
+
/* initialize method pointers */
class->methods = g_new (MonoMethod*, class->method.count);
for (i = 0; i < class->method.count; ++i)
class->methods [i] = mono_get_method (class->image,
MONO_TOKEN_METHOD_DEF | (i + class->method.first + 1), class);
+ init_properties (class);
+ init_events (class);
+
+ i = mono_metadata_nesting_typedef (class->image, class->type_token);
+ while (i) {
+ MonoClass* nclass;
+ guint32 cols [MONO_NESTED_CLASS_SIZE];
+ mono_metadata_decode_row (&class->image->tables [MONO_TABLE_NESTEDCLASS], i - 1, cols, MONO_NESTED_CLASS_SIZE);
+ if (cols [MONO_NESTED_CLASS_ENCLOSING] != mono_metadata_token_index (class->type_token))
+ break;
+ nclass = mono_class_create_from_typedef (class->image, MONO_TOKEN_TYPE_DEF | cols [MONO_NESTED_CLASS_NESTED]);
+ class->nested_classes = g_list_prepend (class->nested_classes, nclass);
+ ++i;
+ }
+
if (class->flags & TYPE_ATTRIBUTE_INTERFACE) {
for (i = 0; i < class->method.count; ++i)
class->methods [i]->slot = i;
+ class->init_pending = 0;
+ class->inited = 1;
return;
}
int io = k->interface_offsets [ic->interface_id];
g_assert (io >= 0);
- g_assert (io <= class->vtable_size);
+ g_assert (io <= max_vtsize);
class->interface_offsets [ic->interface_id] = io;
}
}
if (class->parent && class->parent->vtable_size)
- memcpy (class->vtable, class->parent->vtable, sizeof (gpointer) * class->parent->vtable_size);
+ memcpy (vtable, class->parent->vtable, sizeof (gpointer) * class->parent->vtable_size);
for (k = class; k ; k = k->parent) {
for (i = 0; i < k->interface_count; i++) {
io = k->interface_offsets [ic->interface_id];
g_assert (io >= 0);
- g_assert (io <= class->vtable_size);
+ g_assert (io <= max_vtsize);
if (k == class) {
for (l = 0; l < ic->method.count; l++) {
continue;
if (!strcmp(cm->name, im->name) &&
mono_metadata_signature_equal (cm->signature, im->signature)) {
- g_assert (io + l <= class->vtable_size);
+ g_assert (io + l <= max_vtsize);
vtable [io + l] = cm;
}
}
MonoMethod *im = ic->methods [l];
MonoClass *k1;
- g_assert (io + l <= class->vtable_size);
+ g_assert (io + l <= max_vtsize);
if (vtable [io + l])
continue;
if (!strcmp(cm->name, im->name) &&
mono_metadata_signature_equal (cm->signature, im->signature)) {
- g_assert (io + l <= class->vtable_size);
+ g_assert (io + l <= max_vtsize);
vtable [io + l] = cm;
break;
}
}
- g_assert (io + l <= class->vtable_size);
+ g_assert (io + l <= max_vtsize);
if (vtable [io + l])
break;
}
for (l = 0; l < ic->method.count; l++) {
MonoMethod *im = ic->methods [l];
- char *qname;
+ char *qname, *fqname;
+
+ qname = g_strconcat (ic->name, ".", im->name, NULL);
if (ic->name_space && ic->name_space [0])
- qname = g_strconcat (ic->name_space, ".", ic->name, ".", im->name, NULL);
+ fqname = g_strconcat (ic->name_space, ".", ic->name, ".", im->name, NULL);
else
- qname = g_strconcat (ic->name, ".", im->name, NULL);
+ fqname = NULL;
for (j = 0; j < class->method.count; ++j) {
MonoMethod *cm = class->methods [j];
if (!(cm->flags & METHOD_ATTRIBUTE_VIRTUAL))
continue;
- if (!strcmp (cm->name, qname) &&
+ if (((fqname && !strcmp (cm->name, fqname)) || !strcmp (cm->name, qname)) &&
mono_metadata_signature_equal (cm->signature, im->signature)) {
- g_assert (io + l <= class->vtable_size);
+ g_assert (io + l <= max_vtsize);
vtable [io + l] = cm;
break;
}
}
g_free (qname);
+ g_free (fqname);
}
if (!(class->flags & TYPE_ATTRIBUTE_ABSTRACT)) {
for (l = 0; l < ic->method.count; l++) {
MonoMethod *im = ic->methods [l];
- g_assert (io + l <= class->vtable_size);
+ g_assert (io + l <= max_vtsize);
if (!(vtable [io + l])) {
printf ("no implementation for interface method %s.%s::%s in class %s.%s\n",
ic->name_space, ic->name, im->name, class->name_space, class->name);
MonoMethod *im = vtable [io + l];
if (im) {
- g_assert (io + l <= class->vtable_size);
+ g_assert (io + l <= max_vtsize);
if (im->slot < 0) {
// fixme: why do we need this ?
im->slot = io + l;
cm = class->methods [i];
+
+#if 0
if (!(cm->flags & METHOD_ATTRIBUTE_VIRTUAL) ||
(cm->slot >= 0))
continue;
-
- if (!(cm->flags & METHOD_ATTRIBUTE_NEW_SLOT)) {
+#else /* EXT_VTABLE_HACK */
+ if (cm->slot >= 0)
+ continue;
+#endif
+
+ if (!(cm->flags & METHOD_ATTRIBUTE_NEW_SLOT) && (cm->flags & METHOD_ATTRIBUTE_VIRTUAL)) {
for (k = class->parent; k ; k = k->parent) {
int j;
for (j = 0; j < k->method.count; ++j) {
if (!strcmp(cm->name, m1->name) &&
mono_metadata_signature_equal (cm->signature, m1->signature)) {
cm->slot = k->methods [j]->slot;
- g_assert (cm->slot < class->vtable_size);
+ g_assert (cm->slot < max_vtsize);
break;
}
}
vtable [cm->slot] = cm;
}
- init_properties (class);
- i = mono_metadata_nesting_typedef (class->image, class->type_token);
- while (i) {
- MonoClass* nclass;
- guint32 cols [MONO_NESTED_CLASS_SIZE];
- mono_metadata_decode_row (&class->image->tables [MONO_TABLE_NESTEDCLASS], i - 1, cols, MONO_NESTED_CLASS_SIZE);
- if (cols [MONO_NESTED_CLASS_ENCLOSING] != mono_metadata_token_index (class->type_token))
- break;
- nclass = mono_class_create_from_typedef (class->image, MONO_TOKEN_TYPE_DEF | cols [MONO_NESTED_CLASS_NESTED]);
- class->nested_classes = g_list_prepend (class->nested_classes, nclass);
- ++i;
- }
+ class->vtable_size = cur_slot;
+ class->vtable = g_malloc0 (sizeof (gpointer) * class->vtable_size);
+ memcpy (class->vtable, vtable, sizeof (gpointer) * class->vtable_size);
+
+ class->inited = 1;
+ class->init_pending = 0;
if (mono_print_vtable) {
int icount = 0;
}
}
}
-}
-/**
- * mono_class_vtable:
- * @domain: the application domain
- * @class: the class to initialize
- *
- * VTables are domain specific because we create domain specific code, and
- * they contain the domain specific static class data.
- */
-MonoVTable *
-mono_class_vtable (MonoDomain *domain, MonoClass *class)
-{
- MonoClass *k;
- MonoVTable *vt;
- MonoClassField *field;
- guint32 cindex;
- guint32 cols [MONO_CONSTANT_SIZE];
- const char *p;
- char *t;
- int i;
-
- g_assert (class);
+ if (!default_ghc) {
+ if (class == mono_defaults.object_class) {
+
+ for (i = 0; i < class->vtable_size; ++i) {
+ MonoMethod *cm = vtable [i];
+
+ if (!strcmp (cm->name, "GetHashCode")) {
+ ghc_slot = i;
+ break;
+ }
+ }
- /* can interfaces have static fields? */
- if (class->flags & TYPE_ATTRIBUTE_INTERFACE)
- g_assert_not_reached ();
+ g_assert (ghc_slot > 0);
- if ((vt = g_hash_table_lookup (domain->class_vtable_hash, class)))
- return vt;
-
- if (!class->inited)
- mono_class_init (class);
-
- vt = g_malloc0 (sizeof (MonoVTable) + class->vtable_size * sizeof (gpointer));
- vt->klass = class;
- vt->domain = domain;
-
- if (class->class_size) {
- vt->data = g_malloc0 (class->class_size + 8);
- /* align: fixme not 64 bit clean */
- if (((guint32)vt->data) & 0x7)
- vt->data += 8 - (((guint32)vt->data) & 0x7);
- }
-
- for (i = class->field.first; i < class->field.last; ++i) {
- field = &class->fields [i - class->field.first];
- if (!(field->type->attrs & FIELD_ATTRIBUTE_STATIC))
- continue;
- if (!(field->type->attrs & FIELD_ATTRIBUTE_HAS_DEFAULT))
- continue;
- cindex = mono_metadata_get_constant_index (class->image, MONO_TOKEN_FIELD_DEF | (i + 1));
- if (!cindex) {
- g_warning ("constant for field %s not found", field->name);
- continue;
- }
- mono_metadata_decode_row (&class->image->tables [MONO_TABLE_CONSTANT], cindex - 1, cols, MONO_CONSTANT_SIZE);
- p = mono_metadata_blob_heap (class->image, cols [MONO_CONSTANT_VALUE]);
- mono_metadata_decode_blob_size (p, &p);
- t = (char*)vt->data + field->offset;
- /* should we check that the type matches? */
- switch (cols [MONO_CONSTANT_TYPE]) {
- case MONO_TYPE_BOOLEAN:
- case MONO_TYPE_U1:
- case MONO_TYPE_I1:
- *t = *p;
- break;
- case MONO_TYPE_CHAR:
- case MONO_TYPE_U2:
- case MONO_TYPE_I2: {
- guint16 *val = (guint16*)t;
- *val = read16 (p);
- break;
- }
- case MONO_TYPE_U4:
- case MONO_TYPE_I4: {
- guint32 *val = (guint32*)t;
- *val = read32 (p);
- break;
- }
- case MONO_TYPE_U8:
- case MONO_TYPE_I8: {
- guint64 *val = (guint64*)t;
- *val = read64 (p);
- break;
- }
- case MONO_TYPE_R4: {
- float *val = (float*)t;
- readr4 (p, val);
- break;
- }
- case MONO_TYPE_R8: {
- double *val = (double*)t;
- readr8 (p, val);
- break;
- }
- case MONO_TYPE_STRING: {
- g_warning ("we don't handle strings in constant table");
- break;
- }
- case MONO_TYPE_CLASS:
- /* nothing to do, we malloc0 the data and the value can be 0 only */
- break;
- default:
- g_warning ("type 0x%02x should not be in constant table", cols [MONO_CONSTANT_TYPE]);
+ default_ghc = vtable [ghc_slot];
}
}
+
+ class->ghcimpl = 1;
+ if (class != mono_defaults.object_class) {
- vt->interface_offsets = g_malloc0 (sizeof (gpointer) * (class->max_interface_id + 1));
-
- /* initialize interface offsets */
- for (k = class; k ; k = k->parent) {
- for (i = 0; i < k->interface_count; i++) {
- int slot;
- MonoClass *ic = k->interfaces [i];
- slot = class->interface_offsets [ic->interface_id];
- vt->interface_offsets [ic->interface_id] = &vt->vtable [slot];
+ if (vtable [ghc_slot] == default_ghc) {
+ class->ghcimpl = 0;
}
}
- /* initialize vtable */
- for (i = 0; i < class->vtable_size; ++i) {
- MonoMethod *cm;
+ if (!default_finalize) {
+ if (class == mono_defaults.object_class) {
+
+ for (i = 0; i < class->vtable_size; ++i) {
+ MonoMethod *cm = vtable [i];
- if ((cm = class->vtable [i]))
- vt->vtable [i] = arch_create_jit_trampoline (cm);
- }
+ if (!strcmp (cm->name, "Finalize")) {
+ finalize_slot = i;
+ break;
+ }
+ }
- g_hash_table_insert (domain->class_vtable_hash, class, vt);
+ g_assert (finalize_slot > 0);
- mono_runtime_class_init (class);
+ default_finalize = vtable [finalize_slot];
+ }
+ }
- return vt;
+ /* Object::Finalize should have empty implemenatation */
+ class->has_finalize = 0;
+ if (class != mono_defaults.object_class) {
+ if (vtable [finalize_slot] != default_finalize)
+ class->has_finalize = 1;
+ }
}
+
/*
* Compute a relative numbering of the class hierarchy as described in
* "Java for Large-Scale Scientific Computations?"
class->diffval = *c - class->baseval;
}
-static void
+void
mono_class_setup_mono_type (MonoClass *class)
{
const char *name = class->name;
const char *nspace = class->name_space;
+ class->this_arg.byref = 1;
+ class->this_arg.data.klass = class;
+ class->this_arg.type = MONO_TYPE_CLASS;
+ class->byval_arg.data.klass = class;
+ class->byval_arg.type = MONO_TYPE_CLASS;
+
if (!strcmp (nspace, "System")) {
if (!strcmp (name, "ValueType")) {
/*
}
}
+void
+mono_class_setup_parent (MonoClass *class, MonoClass *parent)
+{
+ gboolean system_namespace;
+
+ system_namespace = !strcmp (class->name_space, "System");
+
+ /* if root of the hierarchy */
+ if (system_namespace && !strcmp (class->name, "Object")) {
+ class->parent = NULL;
+ class->instance_size = sizeof (MonoObject);
+ return;
+ }
+
+ if (!(class->flags & TYPE_ATTRIBUTE_INTERFACE)) {
+ int rnum = 0;
+ class->parent = parent;
+
+ if (!parent)
+ g_assert_not_reached (); /* FIXME */
+
+ class->marshalbyref = parent->marshalbyref;
+ class->contextbound = parent->contextbound;
+ class->delegate = parent->delegate;
+
+ if (system_namespace) {
+ if (*class->name == 'M' && !strcmp (class->name, "MarshalByRefObject"))
+ class->marshalbyref = 1;
+
+ if (*class->name == 'C' && !strcmp (class->name, "ContextBoundObject"))
+ class->contextbound = 1;
+
+ if (*class->name == 'D' && !strcmp (class->name, "Delegate"))
+ class->delegate = 1;
+ }
+
+ if (class->parent->enumtype || ((strcmp (class->parent->name, "ValueType") == 0) &&
+ (strcmp (class->parent->name_space, "System") == 0)))
+ class->valuetype = 1;
+ if (((strcmp (class->parent->name, "Enum") == 0) && (strcmp (class->parent->name_space, "System") == 0))) {
+ class->valuetype = class->enumtype = 1;
+ }
+ //class->enumtype = class->parent->enumtype;
+ class->parent->subclasses = g_list_prepend (class->parent->subclasses, class);
+ mono_compute_relative_numbering (mono_defaults.object_class, &rnum);
+ } else {
+ class->parent = NULL;
+ }
+
+}
+
/**
* @image: context where the image is created
* @type_token: typedef token
guint32 cols_next [MONO_TYPEDEF_SIZE];
guint tidx = mono_metadata_token_index (type_token);
const char *name, *nspace;
- guint vtsize = 0, icount = 0;
+ guint icount = 0;
MonoClass **interfaces;
- int i;
if ((class = g_hash_table_lookup (image->class_cache, GUINT_TO_POINTER (type_token))))
return class;
mono_metadata_decode_row (tt, tidx - 1, cols, CSIZE (cols));
- if (tt->rows > tidx) {
- mono_metadata_decode_row (tt, tidx, cols_next, CSIZE (cols_next));
- vtsize += cols_next [MONO_TYPEDEF_METHOD_LIST] - cols [MONO_TYPEDEF_METHOD_LIST];
- } else {
- vtsize += image->tables [MONO_TABLE_METHOD].rows - cols [MONO_TYPEDEF_METHOD_LIST] + 1;
- }
-
name = mono_metadata_string_heap (image, cols[1]);
nspace = mono_metadata_string_heap (image, cols[2]);
}
interfaces = mono_metadata_interfaces_from_typedef (image, type_token, &icount);
- for (i = 0; i < icount; i++)
- vtsize += interfaces [i]->method.count;
-
- if (parent)
- vtsize += parent->vtable_size;
-
- if (cols [0] & TYPE_ATTRIBUTE_INTERFACE)
- vtsize = 0;
-
- class = g_malloc0 (sizeof (MonoClass) + vtsize * sizeof (gpointer));
-
+ class = g_malloc0 (sizeof (MonoClass));
+
g_hash_table_insert (image->class_cache, GUINT_TO_POINTER (type_token), class);
- class->parent = parent;
class->interfaces = interfaces;
class->interface_count = icount;
- class->vtable_size = vtsize;
-
- class->this_arg.byref = 1;
- class->this_arg.data.klass = class;
- class->this_arg.type = MONO_TYPE_CLASS;
- class->byval_arg.data.klass = class;
- class->byval_arg.type = MONO_TYPE_CLASS;
class->name = name;
class->name_space = nspace;
class->image = image;
class->type_token = type_token;
- class->flags = cols [0];
+ class->flags = cols [MONO_TYPEDEF_FLAGS];
class->element_class = class;
/*g_print ("Init class %s\n", name);*/
- /* if root of the hierarchy */
- if (!strcmp (nspace, "System") && !strcmp (name, "Object")) {
- class->parent = NULL;
- class->instance_size = sizeof (MonoObject);
- } else if (!(cols [0] & TYPE_ATTRIBUTE_INTERFACE)) {
- int rnum = 0;
- class->parent = mono_class_get (image, mono_metadata_token_from_dor (cols [3]));
- if (class->parent->enumtype || ((strcmp (class->parent->name, "ValueType") == 0) && (strcmp (class->parent->name_space, "System") == 0)))
- class->valuetype = 1;
- if (((strcmp (class->parent->name, "Enum") == 0) && (strcmp (class->parent->name_space, "System") == 0))) {
- class->valuetype = class->enumtype = 1;
- }
- //class->enumtype = class->parent->enumtype;
- class->parent->subclasses = g_list_prepend (class->parent->subclasses, class);
- mono_compute_relative_numbering (mono_defaults.object_class, &rnum);
- }
+ mono_class_setup_parent (class, parent);
mono_class_setup_mono_type (class);
//class->interfaces = mono_metadata_interfaces_from_typedef (image, type_token, &class->interface_count);
- if (class->enumtype)
- mono_class_init (class);
+ if (class->enumtype) {
+ class->fields = g_new0 (MonoClassField, class->field.count);
+ class_compute_field_layout (class);
+ }
if ((type_token = mono_metadata_nested_in_typedef (image, type_token)))
class->nested_in = mono_class_create_from_typedef (image, type_token);
return class;
}
-static MonoClass *
-mono_create_ptr_class (MonoType *type)
+MonoClass *
+mono_ptr_class_get (MonoType *type)
{
MonoClass *result;
MonoClass *el_class;
result->parent = NULL; /* no parent for PTR types */
result->name = "System";
result->name_space = "MonoPtrFakeClass";
- result->image = NULL;
+ result->image = el_class->image;
result->inited = TRUE;
/* Can pointers get boxed? */
result->instance_size = sizeof (gpointer);
case MONO_TYPE_STRING:
return mono_defaults.string_class;
case MONO_TYPE_ARRAY:
- return mono_array_class_get (mono_class_from_mono_type (type->data.array->type), type->data.array->rank);
+ return mono_array_class_get (type->data.array->type, type->data.array->rank);
case MONO_TYPE_PTR:
- return mono_create_ptr_class (type->data.type);
+ return mono_ptr_class_get (type->data.type);
case MONO_TYPE_SZARRAY:
- return mono_array_class_get (mono_class_from_mono_type (type->data.type), 1);
+ return mono_array_class_get (type->data.type, 1);
case MONO_TYPE_CLASS:
case MONO_TYPE_VALUETYPE:
return type->data.klass;
mono_class_create_from_typespec (MonoImage *image, guint32 type_spec)
{
MonoType *type;
- MonoClass *class, *eclass;
+ MonoClass *class;
type = mono_type_create_from_typespec (image, type_spec);
switch (type->type) {
case MONO_TYPE_ARRAY:
- eclass = mono_class_from_mono_type (type->data.array->type);
- class = mono_array_class_get (eclass, type->data.array->rank);
+ class = mono_array_class_get (type->data.array->type, type->data.array->rank);
break;
case MONO_TYPE_SZARRAY:
- eclass = mono_class_from_mono_type (type->data.type);
- class = mono_array_class_get (eclass, 1);
+ class = mono_array_class_get (type->data.type, 1);
break;
case MONO_TYPE_PTR:
class = mono_class_from_mono_type (type->data.type);
break;
default:
- g_warning ("implement me: %08x", type->type);
- g_assert_not_reached ();
+ /* it seems any type can be stored in TypeSpec as well */
+ class = mono_class_from_mono_type (type);
+ break;
}
mono_metadata_free_type (type);
/**
* mono_array_class_get:
- * @eclass: element type class
+ * @element_type: element type
* @rank: the dimension of the array class
*
- * Returns: a class object describing the array with element type @etype and
+ * Returns: a class object describing the array with element type @element_type and
* dimension @rank.
*/
MonoClass *
-mono_array_class_get (MonoClass *eclass, guint32 rank)
+mono_array_class_get (MonoType *element_type, guint32 rank)
{
+ MonoClass *eclass;
MonoImage *image;
MonoClass *class;
- static MonoClass *parent = NULL;
- guint32 key;
+ MonoClass *parent = NULL;
+ GSList *list;
int rnum = 0;
+ eclass = mono_class_from_mono_type (element_type);
g_assert (rank <= 255);
- if (!parent)
- parent = mono_defaults.array_class;
+ parent = mono_defaults.array_class;
if (!parent->inited)
mono_class_init (parent);
image = eclass->image;
- g_assert (!eclass->type_token ||
- mono_metadata_token_table (eclass->type_token) == MONO_TABLE_TYPEDEF);
-
- key = ((rank & 0xff) << 24) | (eclass->type_token & 0xffffff);
- if ((class = g_hash_table_lookup (image->array_cache, GUINT_TO_POINTER (key))))
- return class;
+ if ((list = g_hash_table_lookup (image->array_cache, element_type))) {
+ for (; list; list = list->next) {
+ class = list->data;
+ if (class->rank == rank)
+ return class;
+ }
+ }
class = g_malloc0 (sizeof (MonoClass) + parent->vtable_size * sizeof (gpointer));
class->rank = rank;
class->element_class = eclass;
if (rank > 1) {
+ MonoArrayType *at = g_new0 (MonoArrayType, 1);
class->byval_arg.type = MONO_TYPE_ARRAY;
+ class->byval_arg.data.array = at;
+ at->type = &eclass->byval_arg;
+ at->rank = rank;
/* FIXME: complete.... */
} else {
+ /* FIXME: this is not correct. the lbound could be >0 */
class->byval_arg.type = MONO_TYPE_SZARRAY;
class->byval_arg.data.type = &eclass->byval_arg;
}
class->this_arg = class->byval_arg;
class->this_arg.byref = 1;
-
- g_hash_table_insert (image->array_cache, GUINT_TO_POINTER (key), class);
+
+ list = g_slist_append (list, class);
+ g_hash_table_insert (image->array_cache, &class->element_class->byval_arg, list);
return class;
}
mono_class_instance_size (MonoClass *klass)
{
- if (!klass->inited)
+ if (!klass->size_inited)
mono_class_init (klass);
return klass->instance_size;
class = mono_class_create_from_typedef (image, type_token);
break;
case MONO_TOKEN_TYPE_REF:
- return mono_class_create_from_typeref (image, type_token);
+ class = mono_class_from_typeref (image, type_token);
+ break;
case MONO_TOKEN_TYPE_SPEC:
class = mono_class_create_from_typespec (image, type_token);
break;
g_assert_not_reached ();
}
+ if (!class)
+ g_warning ("Could not load class from token 0x%08x in %s", type_token, image->name);
return class;
}