#include <mono/metadata/class.h>
#include <mono/metadata/object.h>
#include <mono/metadata/appdomain.h>
+#include <mono/metadata/mono-endian.h>
+#include <mono/metadata/debug-helpers.h>
+#include <mono/os/gc_wrapper.h>
#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;
-}
+MonoStats mono_stats;
-static void
-default_runtime_class_init (MonoClass *klass)
-{
- return;
-}
+gboolean mono_print_vtable = FALSE;
-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;
-}
+static MonoClass * mono_class_create_from_typedef (MonoImage *image, guint32 type_token);
-void
-mono_install_runtime_class_init (MonoRuntimeClassInit func)
-{
- mono_runtime_class_init = func? func: default_runtime_class_init;
-}
+void (*mono_debugger_class_init_func) (MonoClass *klass) = NULL;
-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];
guint32 idx;
const char *name, *nspace;
MonoClass *res;
+ MonoAssembly **references;
+ MonoImageOpenStatus status;
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;
- if (!image->references || !image->references [idx-1]) {
+ 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:
+ return mono_class_from_name (image->modules [idx - 1], nspace, name);
+ case RESOLTION_SCOPE_TYPEREF: {
+ MonoClass *enclosing = mono_class_from_typeref (image, MONO_TOKEN_TYPE_REF | idx);
+ GList *tmp;
+ mono_class_init (enclosing);
+ for (tmp = enclosing->nested_classes; tmp; tmp = tmp->next) {
+ res = tmp->data;
+ if (strcmp (res->name, name) == 0)
+ return res;
+ }
+ g_warning ("TypeRef ResolutionScope not yet handled (%d)", idx);
+ return NULL;
+ }
+ case RESOLTION_SCOPE_ASSEMBLYREF:
+ break;
+ }
+
+ mono_image_load_references (image, &status);
+ references = image->references;
+ if (!references || !references [idx-1]) {
/*
* detected a reference to mscorlib, we simply return a reference to a dummy
* until we have a better solution.
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;
+ image = references [idx-1]->image;
return mono_class_from_name (image, nspace, name);
}
+MonoMarshalType *
+mono_marshal_load_type_info (MonoClass* klass)
+{
+ int i, j, count = 0;
+ MonoMarshalType *info;
+ guint32 layout;
+
+ g_assert (klass != NULL);
+
+ if (klass->marshal_info)
+ return klass->marshal_info;
+
+ if (!klass->inited)
+ mono_class_init (klass);
+
+ for (i = 0; i < klass->field.count; ++i) {
+ if (klass->fields [i].type->attrs & FIELD_ATTRIBUTE_STATIC)
+ continue;
+ count++;
+ }
+
+ layout = klass->flags & TYPE_ATTRIBUTE_LAYOUT_MASK;
+
+ klass->marshal_info = info = g_malloc0 (sizeof (MonoMarshalType) + sizeof (MonoMarshalField) * count);
+ info->num_fields = count;
+
+ if (klass->parent)
+ info->native_size = mono_class_native_size (klass->parent, NULL);
+
+ for (j = i = 0; i < klass->field.count; ++i) {
+ int size, align;
+
+ if (klass->fields [i].type->attrs & FIELD_ATTRIBUTE_STATIC)
+ continue;
+
+ if (klass->fields [i].type->attrs & FIELD_ATTRIBUTE_HAS_FIELD_MARSHAL)
+ mono_metadata_field_info (klass->image, klass->field.first + i,
+ NULL, NULL, &info->fields [j].mspec);
+
+ info->fields [j].field = &klass->fields [i];
+
+ switch (layout) {
+ case TYPE_ATTRIBUTE_AUTO_LAYOUT:
+ case TYPE_ATTRIBUTE_SEQUENTIAL_LAYOUT:
+ size = mono_marshal_type_size (klass->fields [i].type, info->fields [j].mspec,
+ &align, TRUE, klass->unicode);
+ align = klass->packing_size ? MIN (klass->packing_size, align): align;
+ info->fields [j].offset = info->native_size;
+ info->fields [j].offset += align - 1;
+ info->fields [j].offset &= ~(align - 1);
+ info->native_size = info->fields [j].offset + size;
+ break;
+ case TYPE_ATTRIBUTE_EXPLICIT_LAYOUT:
+ /* FIXME: */
+ info->fields [j].offset = klass->fields [i].offset - sizeof (MonoObject);
+ info->native_size = klass->instance_size - sizeof (MonoObject);
+ break;
+ }
+ j++;
+ }
+
+ if (info->native_size & (klass->min_align - 1)) {
+ info->native_size += klass->min_align - 1;
+ info->native_size &= ~(klass->min_align - 1);
+ }
+
+ return klass->marshal_info;
+}
+
/**
* class_compute_field_layout:
* @m: pointer to the metadata.
const int top = class->field.count;
guint32 layout = class->flags & TYPE_ATTRIBUTE_LAYOUT_MASK;
MonoTableInfo *t = &m->tables [MONO_TABLE_FIELD];
- int i;
+ int i, blittable = TRUE;
+ guint32 rva;
+ guint32 packing_size = 0;
+
+ if (class->size_inited)
+ return;
+
+ if (class->parent) {
+ if (!class->parent->size_inited)
+ class_compute_field_layout (class->parent);
+ class->instance_size += class->parent->instance_size;
+ class->min_align = class->parent->min_align;
+ } else {
+ class->instance_size = sizeof (MonoObject);
+ class->min_align = 1;
+ }
+
+ if (mono_metadata_packing_from_typedef (class->image, class->type_token, &packing_size, &class->instance_size)) {
+ class->instance_size += sizeof (MonoObject);
+ }
+
+ g_assert ((packing_size & 0xfffffff0) == 0);
+ class->packing_size = packing_size;
+
+ if (!top) {
+ class->size_inited = 1;
+ return;
+ }
+
+ class->fields = g_new0 (MonoClassField, top);
/*
* Fetch all the field information.
g_assert (*sig == 0x06);
class->fields [i].type = mono_metadata_parse_field_type (
m, cols [MONO_FIELD_FLAGS], sig + 1, &sig);
+
+ class->fields [i].parent = class;
+
+ if (!(class->fields [i].type->attrs & FIELD_ATTRIBUTE_STATIC)) {
+ if (class->fields [i].type->byref) {
+ blittable = FALSE;
+ } else {
+ MonoClass *field_class = mono_class_from_mono_type (class->fields [i].type);
+ if (!field_class || !field_class->blittable)
+ blittable = FALSE;
+ }
+ }
+ if (layout == TYPE_ATTRIBUTE_EXPLICIT_LAYOUT) {
+ 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);
+ }
+
if (cols [MONO_FIELD_FLAGS] & FIELD_ATTRIBUTE_HAS_FIELD_RVA) {
- mono_metadata_field_info (m, idx, NULL, &class->fields [i].data, NULL);
- if (!class->fields [i].data)
+ mono_metadata_field_info (m, idx, NULL, &rva, NULL);
+ if (!rva)
g_warning ("field %s in %s should have RVA data, but hasn't", class->fields [i].name, class->name);
+ class->fields [i].data = mono_cli_rva_map (class->image->image_info, rva);
}
+
if (class->enumtype && !(cols [MONO_FIELD_FLAGS] & FIELD_ATTRIBUTE_STATIC)) {
class->enum_basetype = class->fields [i].type;
- class->element_class = mono_class_from_mono_type (class->enum_basetype);
+ class->cast_class = class->element_class = mono_class_from_mono_type (class->enum_basetype);
+ blittable = class->element_class->blittable;
}
}
+
+ if (class == mono_defaults.string_class)
+ blittable = FALSE;
+
+ class->blittable = blittable;
+
if (class->enumtype && !class->enum_basetype) {
if (!((strcmp (class->name, "Enum") == 0) && (strcmp (class->name_space, "System") == 0)))
G_BREAKPOINT ();
}
+ mono_class_layout_fields (class);
+}
+
+void
+mono_class_layout_fields (MonoClass *class)
+{
+ int i;
+ const int top = class->field.count;
+ guint32 layout = class->flags & TYPE_ATTRIBUTE_LAYOUT_MASK;
+
/*
- * 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->class_size += (class->class_size % align);
- class->class_size += size;
- } else {
- class->min_align = MAX (align, class->min_align);
- class->fields [i].offset = class->instance_size;
- class->instance_size += (class->instance_size % align);
- class->instance_size += size;
- }
+
+ /* FIXME (LAMESPEC): should we also change the min alignment according to pack? */
+ align = class->packing_size ? MIN (class->packing_size, align): align;
+ 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++) {
+ 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);
+
+ /*
+ * When we get here, class->fields [i].offset is already set by the
+ * loader (for either runtime fields or fields loaded from metadata).
+ * 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.
+ */
+ class->instance_size = MAX (class->instance_size, size + class->fields [i].offset);
+ }
+ 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;
- int idx = class->field.first + i;
/*
* 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);
- if (class->fields [i].type->attrs & FIELD_ATTRIBUTE_STATIC) {
- class->fields [i].offset = class->class_size;
- class->class_size += (class->class_size % align);
- class->class_size += 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);
- }
+ 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)
{
++iid;
}
- g_free (str);
return iid - 1;
}
-void
-mono_class_init (MonoClass *class)
+static void
+collect_implemented_interfaces_aux (MonoClass *klass, GPtrArray *res)
{
- MonoClass *k, *ic;
- MonoMethod **vtable = class->vtable;
- int i, max_iid, cur_slot = 0;
-
- g_assert (class);
+ int i;
+ MonoClass *ic;
+
+ for (i = 0; i < klass->interface_count; i++) {
+ ic = klass->interfaces [i];
- if (class->inited)
- return;
- class->inited = 1;
+ g_ptr_array_add (res, ic);
- if (class->parent) {
- if (!class->parent->inited)
- mono_class_init (class->parent);
- class->instance_size += class->parent->instance_size;
- class->class_size += class->parent->class_size;
- class->min_align = class->parent->min_align;
- cur_slot = class->parent->vtable_size;
- } else
- class->min_align = 1;
-
- /*
- * Computes the size used by the fields, and their locations
- */
- if (class->field.count > 0){
- class->fields = g_new0 (MonoClassField, class->field.count);
- class_compute_field_layout (class);
+ collect_implemented_interfaces_aux (ic, res);
}
+}
- /* 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);
+static GPtrArray*
+collect_implemented_interfaces (MonoClass *klass)
+{
+ GPtrArray *res = g_ptr_array_new ();
- if (class->flags & TYPE_ATTRIBUTE_INTERFACE) {
- for (i = 0; i < class->method.count; ++i)
- class->methods [i]->slot = i;
- return;
- }
+ collect_implemented_interfaces_aux (klass, res);
+ return res;
+}
- //printf ("METAINIT %s.%s\n", class->name_space, class->name);
+static int
+setup_interface_offsets (MonoClass *class, int cur_slot)
+{
+ MonoClass *k, *ic;
+ int i, max_iid;
+ GPtrArray *ifaces;
/* compute maximum number of slots and maximum interface id */
max_iid = 0;
max_iid = ic->interface_id;
}
}
-
+
+ if (class->flags & TYPE_ATTRIBUTE_INTERFACE) {
+ if (max_iid < class->interface_id)
+ max_iid = class->interface_id;
+ }
class->max_interface_id = max_iid;
/* compute vtable offset for interfaces */
class->interface_offsets = g_malloc (sizeof (gpointer) * (max_iid + 1));
for (i = 0; i <= max_iid; i++)
class->interface_offsets [i] = -1;
- for (i = 0; i < class->interface_count; i++) {
- ic = class->interfaces [i];
+ ifaces = collect_implemented_interfaces (class);
+ for (i = 0; i < ifaces->len; ++i) {
+ ic = g_ptr_array_index (ifaces, i);
class->interface_offsets [ic->interface_id] = cur_slot;
cur_slot += ic->method.count;
}
+ g_ptr_array_free (ifaces, TRUE);
for (k = class->parent; k ; k = k->parent) {
- for (i = 0; i < k->interface_count; i++) {
- ic = k->interfaces [i];
+ ifaces = collect_implemented_interfaces (k);
+ for (i = 0; i < ifaces->len; ++i) {
+ ic = g_ptr_array_index (ifaces, i);
+
if (class->interface_offsets [ic->interface_id] == -1) {
int io = k->interface_offsets [ic->interface_id];
g_assert (io >= 0);
- g_assert (io <= class->vtable_size);
class->interface_offsets [ic->interface_id] = io;
}
}
+ g_ptr_array_free (ifaces, TRUE);
+ }
+ return cur_slot;
+}
+
+void
+mono_class_setup_vtable (MonoClass *class, MonoMethod **overrides, int onum)
+{
+ MonoClass *k, *ic;
+ MonoMethod **vtable;
+ int i, max_vtsize = 0, max_iid, cur_slot = 0;
+ GPtrArray *ifaces;
+ MonoGHashTable *override_map;
+
+ /* setup_vtable() must be called only once on the type */
+ if (class->interface_offsets) {
+ g_warning ("vtable already computed in %s.%s", class->name_space, class->name);
+ return;
}
+ ifaces = collect_implemented_interfaces (class);
+ for (i = 0; i < ifaces->len; i++) {
+ MonoClass *ic = g_ptr_array_index (ifaces, i);
+ max_vtsize += ic->method.count;
+ }
+ g_ptr_array_free (ifaces, TRUE);
+
+ if (class->parent) {
+ max_vtsize += class->parent->vtable_size;
+ cur_slot = class->parent->vtable_size;
+ }
+
+ max_vtsize += class->method.count;
+
+ vtable = alloca (sizeof (gpointer) * max_vtsize);
+ memset (vtable, 0, sizeof (gpointer) * max_vtsize);
+
+ /* printf ("METAINIT %s.%s\n", class->name_space, class->name); */
+
+ cur_slot = setup_interface_offsets (class, cur_slot);
+ max_iid = class->max_interface_id;
+
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);
+
+ override_map = mono_g_hash_table_new (NULL, NULL);
+
+ /* override interface methods */
+ for (i = 0; i < onum; i++) {
+ MonoMethod *decl = overrides [i*2];
+ if (decl->klass->flags & TYPE_ATTRIBUTE_INTERFACE) {
+ int dslot;
+ g_assert (decl->slot != -1);
+ dslot = decl->slot + class->interface_offsets [decl->klass->interface_id];
+ vtable [dslot] = overrides [i*2 + 1];
+ vtable [dslot]->slot = dslot;
+ mono_g_hash_table_insert (override_map, overrides [i * 2], overrides [i * 2 + 1]);
+ }
+ }
+
for (k = class; k ; k = k->parent) {
- for (i = 0; i < k->interface_count; i++) {
+ ifaces = collect_implemented_interfaces (k);
+ for (i = 0; i < ifaces->len; i++) {
int j, l, io;
- ic = k->interfaces [i];
+ ic = g_ptr_array_index (ifaces, 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++) {
for (j = 0; j < class->method.count; ++j) {
MonoMethod *cm = class->methods [j];
if (!(cm->flags & METHOD_ATTRIBUTE_VIRTUAL) ||
- !(cm->flags & METHOD_ATTRIBUTE_PUBLIC) ||
+ !((cm->flags & METHOD_ATTRIBUTE_MEMBER_ACCESS_MASK) == METHOD_ATTRIBUTE_PUBLIC) ||
!(cm->flags & METHOD_ATTRIBUTE_NEW_SLOT))
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])
+ if (vtable [io + l] && !(vtable [io + l]->flags & METHOD_ATTRIBUTE_ABSTRACT))
continue;
for (k1 = class; k1; k1 = k1->parent) {
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);
- if (vtable [io + l])
+ g_assert (io + l <= max_vtsize);
+ if (vtable [io + l] && !(vtable [io + l]->flags & METHOD_ATTRIBUTE_ABSTRACT))
break;
}
}
for (l = 0; l < ic->method.count; l++) {
MonoMethod *im = ic->methods [l];
- char *qname;
+ char *qname, *fqname;
+ MonoClass *k1;
+
+ if (vtable [io + l])
+ continue;
+
+ 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];
+ for (k1 = class; k1; k1 = k1->parent) {
+ for (j = 0; j < k1->method.count; ++j) {
+ MonoMethod *cm = k1->methods [j];
- if (!(cm->flags & METHOD_ATTRIBUTE_VIRTUAL))
- continue;
+ if (!(cm->flags & METHOD_ATTRIBUTE_VIRTUAL))
+ continue;
- if (!strcmp (cm->name, qname) &&
- mono_metadata_signature_equal (cm->signature, im->signature)) {
- g_assert (io + l <= class->vtable_size);
- vtable [io + l] = cm;
- break;
+ if (((fqname && !strcmp (cm->name, fqname)) || !strcmp (cm->name, qname)) &&
+ mono_metadata_signature_equal (cm->signature, im->signature)) {
+ 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);
+ char *msig;
+ MonoMethod *im = ic->methods [l];
+ if (im->flags & METHOD_ATTRIBUTE_STATIC)
+ continue;
+ 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);
-
+ for (j = 0; j < onum; ++j) {
+ g_print (" at slot %d: %s (%d) overrides %s (%d)\n", io+l, overrides [j*2+1]->name,
+ overrides [j*2+1]->slot, overrides [j*2]->name, overrides [j*2]->slot);
+ }
+ msig = mono_signature_get_desc (im->signature, FALSE);
+ printf ("no implementation for interface method %s.%s::%s(%s) in class %s.%s\n",
+ ic->name_space, ic->name, im->name, msig, class->name_space, class->name);
+ g_free (msig);
for (j = 0; j < class->method.count; ++j) {
MonoMethod *cm = class->methods [j];
+ msig = mono_signature_get_desc (cm->signature, FALSE);
- printf ("METHOD %s\n", cm->name);
+ printf ("METHOD %s(%s)\n", cm->name, msig);
+ g_free (msig);
}
g_assert_not_reached ();
}
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 ?
+ /* FIXME: why do we need this ? */
im->slot = io + l;
- // g_assert_not_reached ();
+ /* g_assert_not_reached (); */
}
}
}
}
+ g_ptr_array_free (ifaces, TRUE);
}
for (i = 0; i < class->method.count; ++i) {
cm = class->methods [i];
- if (!(cm->flags & METHOD_ATTRIBUTE_VIRTUAL) ||
- (cm->slot >= 0))
- continue;
-
- if (!(cm->flags & METHOD_ATTRIBUTE_NEW_SLOT)) {
+ if (!(cm->flags & METHOD_ATTRIBUTE_NEW_SLOT) && (cm->flags & METHOD_ATTRIBUTE_VIRTUAL)) {
+ int slot = -1;
for (k = class->parent; k ; k = k->parent) {
int j;
for (j = 0; j < k->method.count; ++j) {
continue;
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);
+ slot = k->methods [j]->slot;
+ g_assert (cm->slot < max_vtsize);
+ mono_g_hash_table_insert (override_map, m1, cm);
break;
}
}
- if (cm->slot >= 0)
+ if (slot >= 0)
break;
}
+ if (slot >= 0)
+ cm->slot = slot;
}
if (cm->slot < 0)
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;
+ /* override non interface methods */
+ for (i = 0; i < onum; i++) {
+ MonoMethod *decl = overrides [i*2];
+ if (!(decl->klass->flags & TYPE_ATTRIBUTE_INTERFACE)) {
+ g_assert (decl->slot != -1);
+ vtable [decl->slot] = overrides [i*2 + 1];
+ overrides [i * 2 + 1]->slot = decl->slot;
+ mono_g_hash_table_insert (override_map, decl, overrides [i * 2 + 1]);
+ }
}
- mono_runtime_class_init (class);
-
/*
- printf ("VTABLE %s.%s\n", class->name_space, class->name);
+ * If a method occupies more than one place in the vtable, and it is
+ * overriden, then change the other occurances too.
+ */
+ for (i = 0; i < max_vtsize; ++i)
+ if (vtable [i]) {
+ MonoMethod *cm = mono_g_hash_table_lookup (override_map, vtable [i]);
+ if (cm)
+ vtable [i] = cm;
+ }
+ mono_g_hash_table_destroy (override_map);
- for (i = 0; i < class->vtable_size; ++i) {
- MonoMethod *cm;
+
+ class->vtable_size = cur_slot;
+ class->vtable = g_malloc0 (sizeof (gpointer) * class->vtable_size);
+ memcpy (class->vtable, vtable, sizeof (gpointer) * class->vtable_size);
+
+ if (mono_print_vtable) {
+ int icount = 0;
+
+ for (i = 0; i <= max_iid; i++)
+ if (class->interface_offsets [i] != -1)
+ icount++;
+
+ printf ("VTable %s.%s (size = %d, interfaces = %d)\n", class->name_space,
+ class->name, class->vtable_size, icount);
+
+ for (i = 0; i < class->vtable_size; ++i) {
+ MonoMethod *cm;
- cm = vtable [i];
- if (cm) {
- printf (" METH%d %p %s %d\n", i, cm, cm->name, cm->slot);
+ cm = vtable [i];
+ if (cm) {
+ printf (" slot %03d(%03d) %s.%s:%s\n", i, cm->slot,
+ cm->klass->name_space, cm->klass->name,
+ cm->name);
+ }
}
- }
+
+
+ if (icount) {
+ printf ("Interfaces %s.%s (max_iid = %d)\n", class->name_space,
+ class->name, max_iid);
- printf ("METAEND %s.%s\n", class->name_space, class->name);
- */
+ for (i = 0; i < class->interface_count; i++) {
+ ic = class->interfaces [i];
+ printf (" slot %03d(%03d) %s.%s\n",
+ class->interface_offsets [ic->interface_id],
+ ic->method.count, ic->name_space, ic->name);
+ }
+
+ for (k = class->parent; k ; k = k->parent) {
+ for (i = 0; i < k->interface_count; i++) {
+ ic = k->interfaces [i];
+ printf (" slot %03d(%03d) %s.%s\n",
+ class->interface_offsets [ic->interface_id],
+ ic->method.count, ic->name_space, ic->name);
+ }
+ }
+ }
+ }
}
-MonoVTable *
-mono_class_vtable (MonoDomain *domain, MonoClass *class)
+/**
+ * mono_class_init:
+ * @class: the class to initialize
+ *
+ * compute the instance_size, class_size and other infos that cannot be
+ * computed at mono_class_get() time. Also compute a generic vtable and
+ * the method slot numbers. We use this infos later to create a domain
+ * specific vtable.
+ */
+void
+mono_class_init (MonoClass *class)
{
- MonoClass *k;
- MonoVTable *vt;
int i;
+ static MonoMethod *default_ghc = NULL;
+ static MonoMethod *default_finalize = NULL;
+ static int finalize_slot = -1;
+ static int ghc_slot = -1;
+ MonoMethod **overrides;
+ int onum = 0;
g_assert (class);
- if (class->flags & TYPE_ATTRIBUTE_INTERFACE)
- g_assert_not_reached ();
+ if (class->inited)
+ return;
- 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->init_pending) {
+ /* this indicates a cyclic dependency */
+ g_error ("pending init %s.%s\n", class->name_space, class->name);
+ }
- if (class->class_size)
- vt->data = g_malloc0 (class->class_size);
+ class->init_pending = 1;
- vt->interface_offsets = g_malloc0 (sizeof (gpointer) * (class->max_interface_id + 1));
+ mono_stats.initialized_class_count++;
- /* 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 (class->parent && !class->parent->inited)
+ mono_class_init (class->parent);
+
+ /*
+ * Computes the size used by the fields, and their locations
+ */
+ if (!class->size_inited)
+ class_compute_field_layout (class);
+
+ /* 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, 1);
+ 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);
+ 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 = mono_metadata_nesting_typedef (class->image, class->type_token, i + 1);
+ }
+
+ mono_class_setup_supertypes (class);
+
+ 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;
+ /*
+ * class->interface_offsets is needed for the castclass/isinst code, so
+ * we have to setup them for interfaces, too.
+ */
+ setup_interface_offsets (class, 0);
+ return;
+ }
+
+ overrides = mono_class_get_overrides (class->image, class->type_token, &onum);
+ mono_class_setup_vtable (class, overrides, onum);
+ g_free (overrides);
+
+ class->inited = 1;
+ class->init_pending = 0;
+
+ if (!default_ghc) {
+ if (class == mono_defaults.object_class) {
+
+ for (i = 0; i < class->vtable_size; ++i) {
+ MonoMethod *cm = class->vtable [i];
+
+ if (!strcmp (cm->name, "GetHashCode")) {
+ ghc_slot = i;
+ break;
+ }
+ }
+
+ g_assert (ghc_slot > 0);
+
+ default_ghc = class->vtable [ghc_slot];
+ }
+ }
+
+ class->ghcimpl = 1;
+ if (class->parent) {
+
+ if (class->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 = class->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_assert (finalize_slot > 0);
+
+ default_finalize = class->vtable [finalize_slot];
+ }
}
- g_hash_table_insert (domain->class_vtable_hash, class, vt);
+ /* Object::Finalize should have empty implemenatation */
+ class->has_finalize = 0;
+ if (class->parent) {
+ if (class->vtable [finalize_slot] != default_finalize)
+ class->has_finalize = 1;
+ }
- return vt;
+ if (mono_debugger_class_init_func)
+ mono_debugger_class_init_func (class);
}
+
/*
* Compute a relative numbering of the class hierarchy as described in
* "Java for Large-Scale Scientific Computations?"
class->diffval = *c - class->baseval;
}
-/**
- * @image: context where the image is created
- * @type_token: typedef token
- */
-static MonoClass *
-mono_class_create_from_typedef (MonoImage *image, guint32 type_token)
+void
+mono_class_setup_mono_type (MonoClass *class)
{
- MonoTableInfo *tt = &image->tables [MONO_TABLE_TYPEDEF];
- MonoClass *class, *parent = NULL;
- guint32 cols [MONO_TYPEDEF_SIZE];
- guint32 cols_next [MONO_TYPEDEF_SIZE];
- guint tidx = mono_metadata_token_index (type_token);
- const char *name, *nspace;
- guint vtsize = 0, icount = 0;
- MonoClass **interfaces;
- int i;
-
- if ((class = g_hash_table_lookup (image->class_cache, GUINT_TO_POINTER (type_token))))
- return class;
+ const char *name = class->name;
+ const char *nspace = class->name_space;
- g_assert (mono_metadata_token_table (type_token) == MONO_TABLE_TYPEDEF);
-
- 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]);
-
- if (!(!strcmp (nspace, "System") && !strcmp (name, "Object")) &&
- !(cols [0] & TYPE_ATTRIBUTE_INTERFACE)) {
- parent = mono_class_get (image, mono_metadata_token_from_dor (cols [3]));
- }
- 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));
-
- 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;
+ if (class->flags & TYPE_ATTRIBUTE_INTERFACE)
+ class->interface_id = mono_get_unique_iid (class);
class->this_arg.byref = 1;
class->this_arg.data.klass = 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->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;
- class->enumtype = class->parent->enumtype;
- class->parent->subclasses = g_list_prepend (class->parent->subclasses, class);
- mono_compute_relative_numbering (mono_defaults.object_class, &rnum);
- }
-
if (!strcmp (nspace, "System")) {
if (!strcmp (name, "ValueType")) {
/*
* class->valuetype = 1;
*/
class->valuetype = 0;
- class->enumtype = 1;
+ class->enumtype = 0;
} else if (!strcmp (name, "Object")) {
class->this_arg.type = class->byval_arg.type = MONO_TYPE_OBJECT;
} else if (!strcmp (name, "String")) {
class->this_arg.type = class->byval_arg.type = MONO_TYPE_STRING;
+ } else if (!strcmp (name, "TypedReference")) {
+ class->this_arg.type = class->byval_arg.type = MONO_TYPE_TYPEDBYREF;
}
}
t = MONO_TYPE_BOOLEAN;
} else if (!strcmp(name, "Byte")) {
t = MONO_TYPE_U1;
+ class->blittable = TRUE;
}
break;
case 'C':
case 'D':
if (!strcmp (name, "Double")) {
t = MONO_TYPE_R8;
+ class->blittable = TRUE;
}
break;
case 'I':
if (!strcmp (name, "Int32")) {
t = MONO_TYPE_I4;
+ class->blittable = TRUE;
} else if (!strcmp(name, "Int16")) {
t = MONO_TYPE_I2;
+ class->blittable = TRUE;
} else if (!strcmp(name, "Int64")) {
t = MONO_TYPE_I8;
+ class->blittable = TRUE;
} else if (!strcmp(name, "IntPtr")) {
t = MONO_TYPE_I;
+ class->blittable = TRUE;
}
break;
case 'S':
if (!strcmp (name, "Single")) {
t = MONO_TYPE_R4;
+ class->blittable = TRUE;
} else if (!strcmp(name, "SByte")) {
t = MONO_TYPE_I1;
+ class->blittable = TRUE;
}
break;
case 'U':
if (!strcmp (name, "UInt32")) {
t = MONO_TYPE_U4;
+ class->blittable = TRUE;
} else if (!strcmp(name, "UInt16")) {
t = MONO_TYPE_U2;
+ class->blittable = TRUE;
} else if (!strcmp(name, "UInt64")) {
t = MONO_TYPE_U8;
+ class->blittable = TRUE;
} else if (!strcmp(name, "UIntPtr")) {
t = MONO_TYPE_U;
+ class->blittable = TRUE;
}
break;
case 'V':
break;
}
}
- class->this_arg.type = class->byval_arg.type = t;
+ class->this_arg.type = class->byval_arg.type = t;
+ }
+}
+
+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 (!strcmp (class->name, "<Module>")) {
+ class->parent = NULL;
+ class->instance_size = 0;
+ 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);
+ mono_class_setup_supertypes (class);
+ } else {
+ class->parent = NULL;
+ }
+
+}
+
+void
+mono_class_setup_supertypes (MonoClass *class)
+{
+ MonoClass *k;
+ int ms, i;
+
+ if (class->supertypes)
+ return;
+
+ class->idepth = 0;
+ for (k = class; k ; k = k->parent) {
+ class->idepth++;
+ }
+
+ ms = MAX (MONO_DEFAULT_SUPERTABLE_SIZE, class->idepth);
+ class->supertypes = g_new0 (MonoClass *, ms);
+
+ if (class->parent) {
+ for (i = class->idepth, k = class; k ; k = k->parent)
+ class->supertypes [--i] = k;
+ } else {
+ class->supertypes [0] = class;
}
+}
+
+/**
+ * @image: context where the image is created
+ * @type_token: typedef token
+ */
+static MonoClass *
+mono_class_create_from_typedef (MonoImage *image, guint32 type_token)
+{
+ MonoTableInfo *tt = &image->tables [MONO_TABLE_TYPEDEF];
+ MonoClass *class, *parent = NULL;
+ guint32 cols [MONO_TYPEDEF_SIZE];
+ guint32 cols_next [MONO_TYPEDEF_SIZE];
+ guint tidx = mono_metadata_token_index (type_token);
+ const char *name, *nspace;
+ guint icount = 0;
+ MonoClass **interfaces;
+
+ if ((class = g_hash_table_lookup (image->class_cache, GUINT_TO_POINTER (type_token))))
+ return class;
+
+ g_assert (mono_metadata_token_table (type_token) == MONO_TABLE_TYPEDEF);
+
+ mono_metadata_decode_row (tt, tidx - 1, cols, MONO_TYPEDEF_SIZE);
+
+ name = mono_metadata_string_heap (image, cols [MONO_TYPEDEF_NAME]);
+ nspace = mono_metadata_string_heap (image, cols [MONO_TYPEDEF_NAMESPACE]);
+
+ if (cols [MONO_TYPEDEF_EXTENDS])
+ parent = mono_class_get (image, mono_metadata_token_from_dor (cols [MONO_TYPEDEF_EXTENDS]));
+ interfaces = mono_metadata_interfaces_from_typedef (image, type_token, &icount);
+
+ class = g_malloc0 (sizeof (MonoClass));
+
+ g_hash_table_insert (image->class_cache, GUINT_TO_POINTER (type_token), class);
+
+ class->interfaces = interfaces;
+ class->interface_count = icount;
+
+ class->name = name;
+ class->name_space = nspace;
+
+ class->image = image;
+ class->type_token = type_token;
+ class->flags = cols [MONO_TYPEDEF_FLAGS];
+
+ if ((class->flags & TYPE_ATTRIBUTE_STRING_FORMAT_MASK) == TYPE_ATTRIBUTE_UNICODE_CLASS)
+ class->unicode = 1;
+ /* fixme: maybe we must set this on windows
+ if ((class->flags & TYPE_ATTRIBUTE_STRING_FORMAT_MASK) == TYPE_ATTRIBUTE_AUTO_CLASS)
+ class->unicode = 1;
+ */
+
+ class->cast_class = class->element_class = class;
+
+ /*g_print ("Init class %s\n", name);*/
+
+ mono_class_setup_parent (class, parent);
+
+ mono_class_setup_mono_type (class);
/*
* Compute the field and method lists
g_assert (class->field.count == 0);
}
- if (class->flags & TYPE_ATTRIBUTE_INTERFACE)
- class->interface_id = mono_get_unique_iid (class);
-
- //class->interfaces = mono_metadata_interfaces_from_typedef (image, type_token, &class->interface_count);
-
if (class->enumtype)
- mono_class_init (class);
+ 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;
}
+MonoClass *
+mono_ptr_class_get (MonoType *type)
+{
+ MonoClass *result;
+ MonoClass *el_class;
+ static GHashTable *ptr_hash = NULL;
+
+ if (!ptr_hash)
+ ptr_hash = g_hash_table_new (g_direct_hash, g_direct_equal);
+ el_class = mono_class_from_mono_type (type);
+ if ((result = g_hash_table_lookup (ptr_hash, el_class)))
+ return result;
+ result = g_new0 (MonoClass, 1);
+
+ result->parent = NULL; /* no parent for PTR types */
+ result->name = "System";
+ result->name_space = "MonoPtrFakeClass";
+ result->image = el_class->image;
+ result->inited = TRUE;
+ result->flags = TYPE_ATTRIBUTE_CLASS | (el_class->flags & TYPE_ATTRIBUTE_VISIBILITY_MASK);
+ /* Can pointers get boxed? */
+ result->instance_size = sizeof (gpointer);
+ /*
+ * baseval, diffval: need them to allow casting ?
+ */
+ result->cast_class = result->element_class = el_class;
+ result->enum_basetype = &result->element_class->byval_arg;
+
+ result->this_arg.type = result->byval_arg.type = MONO_TYPE_PTR;
+ result->this_arg.data.type = result->byval_arg.data.type = result->enum_basetype;
+ result->this_arg.byref = TRUE;
+
+ g_hash_table_insert (ptr_hash, el_class, result);
+
+ return result;
+}
+
+static MonoClass *
+mono_fnptr_class_get (MonoMethodSignature *sig)
+{
+ MonoClass *result;
+ static GHashTable *ptr_hash = NULL;
+
+ if (!ptr_hash)
+ ptr_hash = g_hash_table_new (g_direct_hash, g_direct_equal);
+
+ if ((result = g_hash_table_lookup (ptr_hash, sig)))
+ return result;
+ result = g_new0 (MonoClass, 1);
+
+ result->parent = NULL; /* no parent for PTR types */
+ result->name = "System";
+ result->name_space = "MonoFNPtrFakeClass";
+ result->image = NULL; /* need to fix... */
+ result->inited = TRUE;
+ result->flags = TYPE_ATTRIBUTE_CLASS; // | (el_class->flags & TYPE_ATTRIBUTE_VISIBILITY_MASK);
+ /* Can pointers get boxed? */
+ result->instance_size = sizeof (gpointer);
+ /*
+ * baseval, diffval: need them to allow casting ?
+ */
+ result->cast_class = result->element_class = result;
+
+ result->this_arg.type = result->byval_arg.type = MONO_TYPE_FNPTR;
+ result->this_arg.data.method = result->byval_arg.data.method = sig;
+ result->this_arg.byref = TRUE;
+ result->enum_basetype = &result->element_class->byval_arg;
+
+ g_hash_table_insert (ptr_hash, sig, result);
+
+ return result;
+}
+
MonoClass *
mono_class_from_mono_type (MonoType *type)
{
return mono_defaults.double_class;
case MONO_TYPE_STRING:
return mono_defaults.string_class;
+ case MONO_TYPE_TYPEDBYREF:
+ return mono_defaults.typed_reference_class;
case MONO_TYPE_ARRAY:
- return mono_defaults.array_class;
+ return mono_array_class_get (type->data.array->type, type->data.array->rank);
case MONO_TYPE_PTR:
- /* FIXME: this is wrong. Need to handle PTR types */
- return mono_class_from_mono_type (type->data.type);
+ return mono_ptr_class_get (type->data.type);
+ case MONO_TYPE_FNPTR:
+ return mono_fnptr_class_get (type->data.method);
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;
+
+ case MONO_TYPE_GENERICINST:
+ g_warning ("mono_class_from_type: implement me MONO_TYPE_GENERICINST");
+ g_assert_not_reached ();
+
+ case MONO_TYPE_VAR:
+ g_warning ("mono_class_from_type: implement me MONO_TYPE_VAR");
+ g_assert_not_reached ();
+
+ case MONO_TYPE_MVAR:
+ g_warning ("mono_class_from_type: implement me MONO_TYPE_MVAR");
+ g_assert_not_reached ();
+
default:
- g_warning ("implement me %02x\n", type->type);
+ g_warning ("implement me 0x%02x\n", type->type);
g_assert_not_reached ();
}
/**
* @image: context where the image is created
* @type_spec: typespec token
- * @at: an optional pointer to return the array type
*/
static MonoClass *
mono_class_create_from_typespec (MonoImage *image, guint32 type_spec)
{
- guint32 idx = mono_metadata_token_index (type_spec);
- MonoTableInfo *t;
- guint32 cols [MONO_TYPESPEC_SIZE];
- const char *ptr;
- guint32 len;
MonoType *type;
- MonoClass *class, *eclass;
+ MonoClass *class;
- t = &image->tables [MONO_TABLE_TYPESPEC];
-
- mono_metadata_decode_row (t, idx-1, cols, MONO_TYPESPEC_SIZE);
- ptr = mono_metadata_blob_heap (image, cols [MONO_TYPESPEC_SIGNATURE]);
- len = mono_metadata_decode_value (ptr, &ptr);
- type = mono_metadata_parse_type (image, MONO_PARSE_TYPE, 0, ptr, &ptr);
+ 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;
- int rnum = 0;
+ MonoClass *parent = NULL;
+ GSList *list;
+ int rnum = 0, nsize;
+ char *name;
+ 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->image = image;
- class->name_space = "System";
- class->name = "Array";
+ class->name_space = eclass->name_space;
+ nsize = strlen (eclass->name);
+ name = g_malloc (nsize + 2 + rank);
+ memcpy (name, eclass->name, nsize);
+ name [nsize] = '[';
+ if (rank > 1)
+ memset (name + nsize + 1, ',', rank - 1);
+ name [nsize + rank] = ']';
+ name [nsize + rank + 1] = 0;
+ class->name = name;
class->type_token = 0;
- class->flags = TYPE_ATTRIBUTE_CLASS;
+ class->flags = TYPE_ATTRIBUTE_CLASS | (eclass->flags & TYPE_ATTRIBUTE_VISIBILITY_MASK);
class->parent = parent;
class->instance_size = mono_class_instance_size (class->parent);
class->class_size = 0;
class->vtable_size = parent->vtable_size;
class->parent->subclasses = g_list_prepend (class->parent->subclasses, class);
mono_compute_relative_numbering (mono_defaults.object_class, &rnum);
+ mono_class_setup_supertypes (class);
class->rank = rank;
+
+ if (eclass->enumtype)
+ class->cast_class = eclass->element_class;
+ else
+ class->cast_class = eclass;
+
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;
}
+/**
+ * mono_class_native_size:
+ * @klass: a class
+ *
+ * Returns: the native size of an object instance (when marshaled
+ * to unmanaged code)
+ */
+gint32
+mono_class_native_size (MonoClass *klass, guint32 *align)
+{
+
+ if (!klass->marshal_info)
+ mono_marshal_load_type_info (klass);
+
+ if (align)
+ *align = klass->min_align;
+
+ return klass->marshal_info->native_size;
+}
+
+/**
+ * mono_class_min_align:
+ * @klass: a class
+ *
+ * Returns: minimm alignment requirements
+ */
+gint32
+mono_class_min_align (MonoClass *klass)
+{
+
+ if (!klass->size_inited)
+ mono_class_init (klass);
+
+ return klass->min_align;
+}
+
/**
* mono_class_value_size:
* @klass: a class
mono_class_get_field_from_name (MonoClass *klass, const char *name)
{
int i;
- guint32 token;
- MonoTableInfo *t = &klass->image->tables [MONO_TABLE_FIELD];
- for (i = 0; i < klass->field.count; ++i) {
- token = mono_metadata_decode_row_col (t, klass->field.first + i, MONO_FIELD_NAME);
- if (strcmp (name, mono_metadata_string_heap (klass->image, token)) == 0)
- return &klass->fields [i];
+ while (klass) {
+ for (i = 0; i < klass->field.count; ++i) {
+ if (strcmp (name, klass->fields [i].name) == 0)
+ return &klass->fields [i];
+ }
+ klass = klass->parent;
+ }
+ return NULL;
+}
+
+MonoProperty*
+mono_class_get_property_from_name (MonoClass *klass, const char *name)
+{
+ int i;
+
+ while (klass) {
+ for (i = 0; i < klass->property.count; ++i) {
+ if (strcmp (name, klass->properties [i].name) == 0)
+ return &klass->properties [i];
+ }
+ klass = klass->parent;
}
return NULL;
}
{
MonoClass *class;
+ if (image->assembly->dynamic)
+ return mono_lookup_dynamic_token (image, type_token);
+
switch (type_token & 0xff000000){
case MONO_TOKEN_TYPE_DEF:
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;
}
+MonoClass *
+mono_class_from_name_case (MonoImage *image, const char* name_space, const char *name)
+{
+ MonoTableInfo *t = &image->tables [MONO_TABLE_TYPEDEF];
+ guint32 cols [MONO_TYPEDEF_SIZE];
+ const char *n;
+ const char *nspace;
+ guint32 i, visib;
+
+ /* add a cache if needed */
+ for (i = 1; i <= t->rows; ++i) {
+ mono_metadata_decode_row (t, i - 1, cols, MONO_TYPEDEF_SIZE);
+ /* nested types are accessed from the nesting name */
+ visib = cols [MONO_TYPEDEF_FLAGS] & TYPE_ATTRIBUTE_VISIBILITY_MASK;
+ if (visib > TYPE_ATTRIBUTE_PUBLIC && visib <= TYPE_ATTRIBUTE_NESTED_ASSEMBLY)
+ continue;
+ n = mono_metadata_string_heap (image, cols [MONO_TYPEDEF_NAME]);
+ nspace = mono_metadata_string_heap (image, cols [MONO_TYPEDEF_NAMESPACE]);
+ if (g_strcasecmp (n, name) == 0 && g_strcasecmp (nspace, name_space) == 0)
+ return mono_class_get (image, MONO_TOKEN_TYPE_DEF | i);
+ }
+ return NULL;
+}
+
+static MonoImage*
+load_file_for_image (MonoImage *image, int fileidx)
+{
+ char *base_dir, *name;
+ MonoImage *res;
+ MonoTableInfo *t = &image->tables [MONO_TABLE_FILE];
+ const char *fname;
+ guint32 fname_id;
+
+ if (fileidx < 1 || fileidx > t->rows)
+ return NULL;
+ fname_id = mono_metadata_decode_row_col (t, fileidx - 1, MONO_FILE_NAME);
+ fname = mono_metadata_string_heap (image, fname_id);
+ base_dir = g_path_get_dirname (image->name);
+ name = g_build_filename (base_dir, fname, NULL);
+ res = mono_image_open (name, NULL);
+ if (res) {
+ int i;
+ t = &res->tables [MONO_TABLE_MODULEREF];
+ //g_print ("loaded file %s from %s (%p)\n", name, image->name, image->assembly);
+ res->assembly = image->assembly;
+ for (i = 0; i < t->rows; ++i) {
+ if (res->modules [i] && !res->modules [i]->assembly)
+ res->modules [i]->assembly = image->assembly;
+ }
+ mono_image_load_references (image, NULL);
+ }
+ g_free (name);
+ g_free (base_dir);
+ return res;
+}
+
+static MonoClass*
+return_nested_in (MonoClass *class, char *nested) {
+ MonoClass *found;
+ char *s = strchr (nested, '/');
+ GList *tmp;
+
+ if (s) {
+ *s = 0;
+ s++;
+ }
+ for (tmp = class->nested_classes; tmp; tmp = tmp->next) {
+ found = tmp->data;
+ if (strcmp (found->name, nested) == 0) {
+ if (s)
+ return return_nested_in (found, s);
+ return found;
+ }
+ }
+ return NULL;
+}
+
MonoClass *
mono_class_from_name (MonoImage *image, const char* name_space, const char *name)
{
GHashTable *nspace_table;
+ MonoImage *loaded_image;
guint32 token;
+ MonoClass *class;
+ char *nested;
+ char buf [1024];
+
+ if ((nested = strchr (name, '/'))) {
+ int pos = nested - name;
+ int len = strlen (name);
+ if (len > 1023)
+ return NULL;
+ memcpy (buf, name, len + 1);
+ buf [pos] = 0;
+ nested = buf + pos + 1;
+ name = buf;
+ }
nspace_table = g_hash_table_lookup (image->name_cache, name_space);
- if (!nspace_table)
- return 0;
- token = GPOINTER_TO_UINT (g_hash_table_lookup (nspace_table, name));
- if (!token) {
+ if (!nspace_table || !(token = GPOINTER_TO_UINT (g_hash_table_lookup (nspace_table, name)))) {
+ MonoTableInfo *t = &image->tables [MONO_TABLE_EXPORTEDTYPE];
+ guint32 cols [MONO_EXP_TYPE_SIZE];
+ int i;
+
+ for (i = 0; i < t->rows; ++i) {
+ const char *ename, *enspace;
+ mono_metadata_decode_row (t, i, cols, MONO_EXP_TYPE_SIZE);
+ ename = mono_metadata_string_heap (image, cols [MONO_EXP_TYPE_NAME]);
+ enspace = mono_metadata_string_heap (image, cols [MONO_EXP_TYPE_NAMESPACE]);
+
+ if (strcmp (name, ename) == 0 && strcmp (name_space, enspace) == 0) {
+ guint32 impl = cols [MONO_EXP_TYPE_IMPLEMENTATION];
+ if ((impl & IMPLEMENTATION_MASK) == IMPLEMENTATION_FILE) {
+ loaded_image = load_file_for_image (image, impl >> IMPLEMENTATION_BITS);
+ if (!loaded_image)
+ return NULL;
+ class = mono_class_from_name (loaded_image, name_space, name);
+ if (nested)
+ return return_nested_in (class, nested);
+ return class;
+ } else {
+ g_error ("not yet implemented");
+ }
+ }
+ }
/*g_warning ("token not found for %s.%s in image %s", name_space, name, image->name);*/
return NULL;
}
token = MONO_TOKEN_TYPE_DEF | token;
- return mono_class_get (image, token);
+ class = mono_class_get (image, token);
+ if (nested)
+ return return_nested_in (class, nested);
+ return class;
+}
+
+gboolean
+mono_class_is_subclass_of (MonoClass *klass, MonoClass *klassc,
+ gboolean check_interfaces)
+{
+ if (check_interfaces && (klassc->flags & TYPE_ATTRIBUTE_INTERFACE) && !(klass->flags & TYPE_ATTRIBUTE_INTERFACE)) {
+ if ((klassc->interface_id <= klass->max_interface_id) &&
+ (klass->interface_offsets [klassc->interface_id] >= 0))
+ return TRUE;
+ } else if (check_interfaces && (klassc->flags & TYPE_ATTRIBUTE_INTERFACE) && (klass->flags & TYPE_ATTRIBUTE_INTERFACE)) {
+ int i;
+
+ for (i = 0; i < klass->interface_count; i ++) {
+ MonoClass *ic = klass->interfaces [i];
+ if (ic == klassc)
+ return TRUE;
+ }
+ } else {
+ /*
+ * klass->baseval is 0 for interfaces
+ */
+ if (klass->baseval && ((klass->baseval - klassc->baseval) <= klassc->diffval))
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+/*
+ * Returns the nnumber of bytes an element of type klass
+ * uses when stored into an array.
+ */
+gint32
+mono_class_array_element_size (MonoClass *klass)
+{
+ int t = klass->byval_arg.type;
+
+handle_enum:
+ switch (t) {
+ case MONO_TYPE_I1:
+ case MONO_TYPE_U1:
+ case MONO_TYPE_BOOLEAN:
+ return 1;
+ case MONO_TYPE_I2:
+ case MONO_TYPE_U2:
+ case MONO_TYPE_CHAR:
+ return 2;
+ case MONO_TYPE_I4:
+ case MONO_TYPE_U4:
+ case MONO_TYPE_R4:
+ return 4;
+ case MONO_TYPE_I:
+ case MONO_TYPE_U:
+ case MONO_TYPE_PTR:
+ case MONO_TYPE_CLASS:
+ case MONO_TYPE_STRING:
+ case MONO_TYPE_OBJECT:
+ case MONO_TYPE_SZARRAY:
+ case MONO_TYPE_ARRAY:
+ return sizeof (gpointer);
+ case MONO_TYPE_I8:
+ case MONO_TYPE_U8:
+ case MONO_TYPE_R8:
+ return 8;
+ case MONO_TYPE_VALUETYPE:
+ if (klass->enumtype) {
+ t = klass->enum_basetype->type;
+ goto handle_enum;
+ }
+ return mono_class_instance_size (klass) - sizeof (MonoObject);
+ default:
+ g_error ("unknown type 0x%02x in mono_class_array_element_size", t);
+ }
+ return -1;
}
/**
gint32
mono_array_element_size (MonoClass *ac)
{
- if (ac->element_class->valuetype)
- return mono_class_instance_size (ac->element_class) - sizeof (MonoObject);
- else
- return sizeof (gpointer);
+ return mono_class_array_element_size (ac->element_class);
}
gpointer
mono_ldtoken (MonoImage *image, guint32 token, MonoClass **handle_class)
{
+ if (image->assembly->dynamic) {
+ gpointer obj = mono_lookup_dynamic_token (image, token);
+
+ switch (token & 0xff000000) {
+ case MONO_TOKEN_TYPE_DEF:
+ case MONO_TOKEN_TYPE_REF:
+ case MONO_TOKEN_TYPE_SPEC:
+ if (handle_class)
+ *handle_class = mono_defaults.typehandle_class;
+ return &((MonoClass*)obj)->byval_arg;
+ case MONO_TOKEN_METHOD_DEF:
+ if (handle_class)
+ *handle_class = mono_defaults.methodhandle_class;
+ return obj;
+ case MONO_TOKEN_FIELD_DEF:
+ if (handle_class)
+ *handle_class = mono_defaults.fieldhandle_class;
+ return obj;
+ default:
+ g_assert_not_reached ();
+ }
+ }
+
switch (token & 0xff000000) {
case MONO_TOKEN_TYPE_DEF:
case MONO_TOKEN_TYPE_REF: {
if (handle_class)
*handle_class = mono_defaults.typehandle_class;
class = mono_class_get (image, token);
+ mono_class_init (class);
/* We return a MonoType* as handle */
return &class->byval_arg;
}
if (handle_class)
*handle_class = mono_defaults.typehandle_class;
class = mono_class_create_from_typespec (image, token);
+ mono_class_init (class);
return &class->byval_arg;
}
case MONO_TOKEN_FIELD_DEF: {
class = mono_class_get (image, MONO_TOKEN_TYPE_DEF | type);
mono_class_init (class);
if (handle_class)
- *handle_class = mono_class_from_name (mono_defaults.corlib, "System", "RuntimeFieldHandle");
+ *handle_class = mono_defaults.fieldhandle_class;
return mono_class_get_field (class, token);
}
case MONO_TOKEN_METHOD_DEF:
return NULL;
}
+/**
+ * This function might need to call runtime functions so it can't be part
+ * of the metadata library.
+ */
+static MonoLookupDynamicToken lookup_dynamic = NULL;
+
+void
+mono_install_lookup_dynamic_token (MonoLookupDynamicToken func)
+{
+ lookup_dynamic = func;
+}
+
+gpointer
+mono_lookup_dynamic_token (MonoImage *image, guint32 token)
+{
+ return lookup_dynamic (image, token);
+}
projects / mono.git / blobdiff