Author: zoltan
Date: 2006-01-18 17:48:37 -0500 (Wed, 18 Jan 2006)
New Revision: 55763

Modified:
   branches/vargaz/mini-linear-il/mono/mono/mini/mini.c
Log:
Ongoing work

Modified: branches/vargaz/mini-linear-il/mono/mono/mini/mini.c
===================================================================
--- branches/vargaz/mini-linear-il/mono/mono/mini/mini.c        2006-01-18 
22:35:00 UTC (rev 55762)
+++ branches/vargaz/mini-linear-il/mono/mono/mini/mini.c        2006-01-18 
22:48:37 UTC (rev 55763)
@@ -9311,11 +9311,13 @@
        int ins_index;
        MonoInst **defs;
        guint32 *def_index;
+       gboolean *addr_taken;
 
        /* FIXME: Speed this up */
 
        defs = g_new0 (MonoInst*, cfg->next_vireg);
        def_index = g_new (guint32, cfg->next_vireg);
+       addr_taken = g_new0 (gboolean, cfg->next_vireg);
 
        ins_index = 0;
        for (ins = bb->code; ins; ins = ins->next) {
@@ -9326,9 +9328,13 @@
                        continue;
 
                /* FIXME: Optimize this */
-               if (ins->opcode == OP_LDADDR)
-                       return;
+               if (ins->opcode == OP_LDADDR) {
+                       MonoInst *var = ins->inst_p0;
 
+                       if (!MONO_TYPE_ISSTRUCT (var->inst_vtype))
+                               return;
+               }
+
                /* FIXME: Store opcodes */
                for (srcindex = 0; srcindex < 2; ++srcindex) {
                        regtype = spec [(srcindex == 0) ? MONO_INST_SRC1 : 
MONO_INST_SRC2];
@@ -9456,9 +9462,13 @@
                                continue;
 
                        /* FIXME: Optimize this */
-                       if (ins->opcode == OP_LDADDR)
-                               break;
+                       if (ins->opcode == OP_LDADDR) {
+                               MonoInst *var = ins->inst_p0;
 
+                               if (!MONO_TYPE_ISSTRUCT (var->inst_vtype))
+                                       return;
+                       }
+
                        /* FIXME: Store opcodes */
                        for (srcindex = 0; srcindex < 2; ++srcindex) {
                                regtype = spec [(srcindex == 0) ? 
MONO_INST_SRC1 : MONO_INST_SRC2];

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

Reply via email to