Author: massi
Date: 2007-05-15 15:35:18 -0400 (Tue, 15 May 2007)
New Revision: 77433

Modified:
   trunk/mono/mono/metadata/ChangeLog
   trunk/mono/mono/metadata/class-internals.h
   trunk/mono/mono/metadata/object.c
   trunk/mono/mono/mini/ChangeLog
   trunk/mono/mono/mini/inssel.brg
Log:
        * class-internals.h: Added "MonoVTable.interface_bitmap" as a next
        step in implementing IMT, so that all isinst checks now can go
        through the bitmap.
        This was needed because vtables for TransparentProxy need to look
        like the vtable of the "target" class, so they need to point to
        its interface bitmap directly.

        * object.c: inside "mono_class_create_runtime_vtable" and
        "mono_class_proxy_vtable", initialize "MonoVTable.interface_bitmap".

        * inssel.brg: added "mini_emit_load_intf_bit_reg_vtable", and used it
        inside "mini_emit_isninst_iface_cast" and "mini_emit_castclass_iface"
        so that all isinst checks now use "interface_bitmap".



Modified: trunk/mono/mono/metadata/ChangeLog
===================================================================
--- trunk/mono/mono/metadata/ChangeLog  2007-05-15 19:29:12 UTC (rev 77432)
+++ trunk/mono/mono/metadata/ChangeLog  2007-05-15 19:35:18 UTC (rev 77433)
@@ -1,3 +1,15 @@
+2007-05-15  Massimiliano Mantione  <[EMAIL PROTECTED]>
+
+       * class-internals.h: Added "MonoVTable.interface_bitmap" as a next
+       step in implementing IMT, so that all isinst checks now can go
+       through the bitmap.
+       This was needed because vtables for TransparentProxy need to look
+       like the vtable of the "target" class, so they need to point to
+       its interface bitmap directly.
+
+       * object.c: inside "mono_class_create_runtime_vtable" and
+       "mono_class_proxy_vtable", initialize "MonoVTable.interface_bitmap".
+
 2007-05-15  Atsushi Enomoto  <[EMAIL PROTECTED]>
 
        * object-internals.h

Modified: trunk/mono/mono/metadata/class-internals.h
===================================================================
--- trunk/mono/mono/metadata/class-internals.h  2007-05-15 19:29:12 UTC (rev 
77432)
+++ trunk/mono/mono/metadata/class-internals.h  2007-05-15 19:35:18 UTC (rev 
77433)
@@ -341,6 +341,7 @@
        MonoDomain *domain;  /* each object/vtable belongs to exactly one 
domain */
         gpointer    data; /* to store static class data */
         gpointer    type; /* System.Type type for klass */
+       guint8     *interface_bitmap;
        guint16     max_interface_id;
        guint8      rank;
        guint remote          : 1; /* class is remotely activated */

Modified: trunk/mono/mono/metadata/object.c
===================================================================
--- trunk/mono/mono/metadata/object.c   2007-05-15 19:29:12 UTC (rev 77432)
+++ trunk/mono/mono/metadata/object.c   2007-05-15 19:35:18 UTC (rev 77433)
@@ -1077,6 +1077,7 @@
        }
 
        vt->max_interface_id = class->max_interface_id;
+       vt->interface_bitmap = class->interface_bitmap;
        
        //printf ("Initializing VT for class %s (interface_offsets_count = 
%d)\n",
        //              class->name, class->interface_offsets_count);
@@ -1261,6 +1262,7 @@
        }
 
        pvt->max_interface_id = max_interface_id;
+       pvt->interface_bitmap = class->interface_bitmap;
 
        /* initialize interface offsets */
        for (i = 0; i < class->interface_offsets_count; ++i) {

Modified: trunk/mono/mono/mini/ChangeLog
===================================================================
--- trunk/mono/mono/mini/ChangeLog      2007-05-15 19:29:12 UTC (rev 77432)
+++ trunk/mono/mono/mini/ChangeLog      2007-05-15 19:35:18 UTC (rev 77433)
@@ -1,3 +1,9 @@
+2007-05-15  Massimiliano Mantione  <[EMAIL PROTECTED]>
+
+       * inssel.brg: added "mini_emit_load_intf_bit_reg_vtable", and used it
+       inside "mini_emit_isninst_iface_cast" and "mini_emit_castclass_iface"
+       so that all isinst checks now use "interface_bitmap".
+
 2007-05-15  Zoltan Varga  <[EMAIL PROTECTED]>
 
        * cpu-amd64.md (jmp): Fix a warning.

Modified: trunk/mono/mono/mini/inssel.brg
===================================================================
--- trunk/mono/mono/mini/inssel.brg     2007-05-15 19:29:12 UTC (rev 77432)
+++ trunk/mono/mono/mini/inssel.brg     2007-05-15 19:35:18 UTC (rev 77433)
@@ -1605,7 +1605,7 @@
 }
 
 /* 
- * Emit code which loads into "intf_bit_reg" a nonzero value if the MonoKlass
+ * Emit code which loads into "intf_bit_reg" a nonzero value if the MonoClass
  * stored in "klass_reg" implements the interface "klass".
  */
 static void
@@ -1636,7 +1636,39 @@
                MONO_EMIT_NEW_BIALU_IMM (s, OP_AND_IMM, intf_bit_reg, 
ibitmap_byte_reg, 1 << (klass->interface_id & 7));
        }
 }
+/* 
+ * Emit code which loads into "intf_bit_reg" a nonzero value if the MonoVTable
+ * stored in "vtable_reg" implements the interface "klass".
+ */
+static void
+mini_emit_load_intf_bit_reg_vtable (MonoCompile *s, int intf_bit_reg, int 
vtable_reg, MonoClass *klass)
+{
+       int ibitmap_reg = mono_regstate_next_int (s->rs);
+       int ibitmap_byte_reg = mono_regstate_next_int (s->rs);
 
+       MONO_EMIT_NEW_LOAD_MEMBASE (s, ibitmap_reg, vtable_reg, G_STRUCT_OFFSET 
(MonoVTable, interface_bitmap));
+
+       if (s->compile_aot) {
+               int iid_reg = mono_regstate_next_int (s->rs);
+               int shifted_iid_reg = mono_regstate_next_int (s->rs);
+               int ibitmap_byte_address_reg = mono_regstate_next_int (s->rs);
+               int masked_iid_reg = mono_regstate_next_int (s->rs);
+               int iid_one_bit_reg = mono_regstate_next_int (s->rs);
+               int iid_bit_reg = mono_regstate_next_int (s->rs);
+               MONO_EMIT_NEW_AOTCONST (s, iid_reg, klass, MONO_PATCH_INFO_IID);
+               MONO_EMIT_NEW_BIALU_IMM (s, OP_SHR_IMM, shifted_iid_reg, 
iid_reg, 3);
+               MONO_EMIT_NEW_BIALU (s, CEE_ADD, ibitmap_byte_address_reg, 
ibitmap_reg, shifted_iid_reg);
+               MONO_EMIT_NEW_LOAD_MEMBASE_OP (s, OP_LOADU1_MEMBASE, 
ibitmap_byte_reg, ibitmap_byte_address_reg, 0);
+               MONO_EMIT_NEW_BIALU_IMM (s, OP_AND_IMM, masked_iid_reg, 
iid_reg, 7);
+               MONO_EMIT_NEW_ICONST (s, iid_one_bit_reg, 1);
+               MONO_EMIT_NEW_BIALU (s, CEE_SHL, iid_bit_reg, iid_one_bit_reg, 
masked_iid_reg);
+               MONO_EMIT_NEW_BIALU (s, CEE_AND, intf_bit_reg, 
ibitmap_byte_reg, iid_bit_reg);
+       } else {
+               MONO_EMIT_NEW_LOAD_MEMBASE_OP (s, OP_LOADI1_MEMBASE, 
ibitmap_byte_reg, ibitmap_reg, klass->interface_id >> 3);
+               MONO_EMIT_NEW_BIALU_IMM (s, OP_AND_IMM, intf_bit_reg, 
ibitmap_byte_reg, 1 << (klass->interface_id & 7));
+       }
+}
+
 static void 
 mini_emit_virtual_call (MonoCompile *cfg, void *st, MonoInst *tree, int 
novirtop, int virtop)
 {
@@ -1716,14 +1748,13 @@
        int intf_reg = mono_regstate_next_int (s->rs);
 
        mini_emit_max_iid_check_vtable (s, vtable_reg, klass, false_target);
-       mini_emit_load_intf_reg_vtable (s, intf_reg, vtable_reg, klass);
+       mini_emit_load_intf_bit_reg_vtable (s, intf_reg, vtable_reg, klass);
        /* the object_is_null target simply copies the input register to the 
output */
        MONO_EMIT_NEW_COMPARE_IMM_BRANCH_LABEL (s, CEE_BNE_UN, intf_reg, 0, 
true_target);
 }
 
 /*
  * Variant of the above that takes a register to the class, not the vtable.
- * Note that inside interfaces_offsets the empty value is -1, not NULL, in 
this case.
  */
 static void
 mini_emit_isninst_iface_class_cast (MonoCompile *s, int klass_reg, MonoClass 
*klass, MonoInst *false_target, MonoInst *true_target)
@@ -1742,13 +1773,12 @@
        int intf_reg = mono_regstate_next_int (s->rs);
 
        mini_emit_max_iid_check_vtable (s, vtable_reg, klass, NULL);
-       mini_emit_load_intf_reg_vtable (s, intf_reg, vtable_reg, klass);
+       mini_emit_load_intf_bit_reg_vtable (s, intf_reg, vtable_reg, klass);
        MONO_EMIT_NEW_COMPARE_IMM_EXC (s, EQ, intf_reg, 0, 
"InvalidCastException");
 }
 
 /*
  * Variant of the aboce that takes a register to the class, not the vtable.
- * Note that inside interfaces_offsets the empty value is -1, not NULL, in 
this case.
  */
 static void
 mini_emit_castclass_iface_class (MonoCompile *s, int klass_reg, MonoClass 
*klass)

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to