Author: zoltan
Date: 2006-01-19 09:55:02 -0500 (Thu, 19 Jan 2006)
New Revision: 55784

Modified:
   branches/vargaz/mini-linear-il/mono/mono/mini/method-to-ir.c
   branches/vargaz/mini-linear-il/mono/mono/mini/mini-codegen.c
   branches/vargaz/mini-linear-il/mono/mono/mini/mini-x86.c
   branches/vargaz/mini-linear-il/mono/mono/mini/mini.c
Log:
Ongoing work

Modified: branches/vargaz/mini-linear-il/mono/mono/mini/method-to-ir.c
===================================================================
--- branches/vargaz/mini-linear-il/mono/mono/mini/method-to-ir.c        
2006-01-19 14:14:47 UTC (rev 55783)
+++ branches/vargaz/mini-linear-il/mono/mono/mini/method-to-ir.c        
2006-01-19 14:55:02 UTC (rev 55784)
@@ -8729,6 +8729,16 @@
                return OP_STOREI4_MEMBASE_IMM;
        case OP_X86_PUSH:
                return OP_X86_PUSH_IMM;
+
+       case OP_VOIDCALL_REG:
+               return OP_VOIDCALL;
+       case OP_CALL_REG:
+               return OP_CALL;
+       case OP_LCALL_REG:
+               return OP_LCALL;
+       case OP_FCALL_REG:
+               return OP_FCALL;
+
        default:
                return -1;
        }
@@ -9116,6 +9126,7 @@
                                if ((sreg != -1) && get_vreg_to_inst (cfg, 
regtype, sreg)) {
                                        MonoInst *var = cfg->vreg_to_inst 
[regtype][sreg];
                                        MonoInst *load_ins;
+                                       guint32 load_opcode;
 
                                        if (var->opcode == OP_REGVAR) {
                                                if (srcindex == 0)
@@ -9125,8 +9136,10 @@
                                        } else {
                                                g_assert (var->opcode == 
OP_REGOFFSET);
 
+                                               load_opcode = 
mono_type_to_load_membase (var->inst_vtype);
+
                                                /* FIXME: Generalize this */
-                                               if (ins->opcode == OP_X86_PUSH) 
{
+                                               if ((ins->opcode == 
OP_X86_PUSH) && ((load_opcode == OP_LOADI4_MEMBASE) || (load_opcode == 
OP_LOADU4_MEMBASE))) {
                                                        ins->opcode = 
OP_X86_PUSH_MEMBASE;
                                                        ins->inst_basereg = 
var->inst_basereg;
                                                        ins->inst_offset = 
var->inst_offset;
@@ -9145,7 +9158,7 @@
                                                                
insert_before_ins (bb, ins, load_ins, &prev);
                                                        }
                                                        else {
-                                                               
NEW_LOAD_MEMBASE (cfg, load_ins, mono_type_to_load_membase (var->inst_vtype), 
sreg, var->inst_basereg, var->inst_offset);
+                                                               
NEW_LOAD_MEMBASE (cfg, load_ins, load_opcode, sreg, var->inst_basereg, 
var->inst_offset);
                                                                
insert_before_ins (bb, ins, load_ins, &prev);
                                                        }
                                                }

Modified: branches/vargaz/mini-linear-il/mono/mono/mini/mini-codegen.c
===================================================================
--- branches/vargaz/mini-linear-il/mono/mono/mini/mini-codegen.c        
2006-01-19 14:14:47 UTC (rev 55783)
+++ branches/vargaz/mini-linear-il/mono/mono/mini/mini-codegen.c        
2006-01-19 14:55:02 UTC (rev 55784)
@@ -1246,11 +1246,6 @@
                        if (dest_dreg != -1)
                                dreg_mask = (regmask (dest_dreg));
 
-                       /* FIXME: Do this earlier */
-                       if (((ins->opcode == OP_MOVE) || (ins->opcode == 
OP_ICONST)) && !fp && (reginfo [ins->dreg].last_use == i) && (reginfo 
[ins->dreg].prev_use == 0)) {
-                               ins->opcode = CEE_NOP;
-                       }
-
                        val = rassign (cfg, ins->dreg, fp);
 
                        if (val < 0) {

Modified: branches/vargaz/mini-linear-il/mono/mono/mini/mini-x86.c
===================================================================
--- branches/vargaz/mini-linear-il/mono/mono/mini/mini-x86.c    2006-01-19 
14:14:47 UTC (rev 55783)
+++ branches/vargaz/mini-linear-il/mono/mono/mini/mini-x86.c    2006-01-19 
14:55:02 UTC (rev 55784)
@@ -853,7 +853,7 @@
                        return;
                }
 
-       if (cfg->ret)
+       if (cfg->new_ir && cfg->ret)
                cfg->ret->dreg = cinfo->ret.reg;
 
        g_free (cinfo);

Modified: branches/vargaz/mini-linear-il/mono/mono/mini/mini.c
===================================================================
--- branches/vargaz/mini-linear-il/mono/mono/mini/mini.c        2006-01-19 
14:14:47 UTC (rev 55783)
+++ branches/vargaz/mini-linear-il/mono/mono/mini/mini.c        2006-01-19 
14:55:02 UTC (rev 55784)
@@ -9379,6 +9379,9 @@
                                                else
                                                        ins->sreg2 = -1;
 
+                                               if ((opcode2 == OP_VOIDCALL) || 
(opcode2 == OP_CALL) || (opcode2 == OP_LCALL) || (opcode2 == OP_FCALL))
+                                                       
((MonoCallInst*)ins)->fptr = (gpointer)ins->inst_imm;
+
                                                /* Allow further iterations */
                                                srcindex = -1;
                                                continue;
@@ -9883,7 +9886,7 @@
        if (cfg->new_ir) {
                /* This must be done _before_ global reg alloc and _after_ 
decompose */
                mono_handle_global_vregs (cfg);
-               mono_local_deadce (cfg);
+               //mono_local_deadce (cfg);
        }
 
        if (cfg->opt & MONO_OPT_LINEARS) {

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

Reply via email to