Add par_alloc_object to the major collector function table.

[mono.git] / mono / mini / mini-codegen.c

diff --git a/mono/mini/mini-codegen.c b/mono/mini/mini-codegen.c
index 2a948d261bd6ca8079f712cd33b8922385c8d51a..6a58d726318c54cf2daaaf29bd49a94d6fc70574 100644 (file)
--- a/mono/mini/mini-codegen.c
+++ b/mono/mini/mini-codegen.c
@@ -271,6 +271,17 @@ mono_call_inst_add_outarg_reg (MonoCompile *cfg, MonoCallInst *call, int vreg, i
        }
 }
 
+/*
+ * mono_call_inst_add_outarg_vt:
+ *
+ *   Register OUTARG_VT as belonging to CALL.
+ */
+void
+mono_call_inst_add_outarg_vt (MonoCompile *cfg, MonoCallInst *call, MonoInst *outarg_vt)
+{
+       call->outarg_vts = g_slist_append_mempool (cfg->mempool, call->outarg_vts, outarg_vt);
+}
+
 static void
 resize_spill_info (MonoCompile *cfg, int bank)
 {
@@ -552,7 +563,8 @@ mono_print_ins_index (int i, MonoInst *ins)
        case OP_VCALL2_MEMBASE:
        case OP_VOIDCALL:
        case OP_VOIDCALL_MEMBASE:
-       case OP_VOIDCALLVIRT: {
+       case OP_VOIDCALLVIRT:
+       case OP_TAILCALL: {
                MonoCallInst *call = (MonoCallInst*)ins;
                GSList *list;
 
@@ -625,6 +637,9 @@ mono_print_ins_index (int i, MonoInst *ins)
        case OP_GC_LIVENESS_USE:
                printf (" R%d", (int)ins->inst_c1);
                break;
+       case OP_SEQ_POINT:
+               printf (" il: %x", (int)ins->inst_imm);
+               break;
        default:
                break;
        }
@@ -841,7 +856,7 @@ static void
 free_up_hreg (MonoCompile *cfg, MonoBasicBlock *bb, MonoInst **last, MonoInst *ins, int hreg, int bank)
 {
        if (G_UNLIKELY (bank)) {
-               if (!(cfg->rs->free_mask [1] & (regmask (hreg)))) {
+               if (!(cfg->rs->free_mask [bank] & (regmask (hreg)))) {
                        bank = translate_bank (cfg->rs, bank, hreg);
                        DEBUG (printf ("\tforced spill of R%d\n", cfg->rs->symbolic [bank] [hreg]));
                        spill_vreg (cfg, bb, last, ins, cfg->rs->symbolic [bank] [hreg], bank);
@@ -911,7 +926,6 @@ create_spilled_store (MonoCompile *cfg, MonoBasicBlock *bb, int spill, int reg,
                def->inst_c0 = spill;
                def->inst_c1 = bank;
                mono_bblock_insert_after_ins (bb, store, def);
-               *last = def;
        }
 }
 
@@ -1043,7 +1057,7 @@ mono_local_regalloc (MonoCompile *cfg, MonoBasicBlock *bb)
        int fpstack [8];
        int sp = 0;
 #endif
-       int num_sregs;
+       int num_sregs = 0;
        int sregs [MONO_MAX_SRC_REGS];
 
        if (!bb->code)
@@ -2429,7 +2443,6 @@ mono_opcode_to_type (int opcode, int cmp_opcode)
                switch (cmp_opcode) {
                case OP_ICOMPARE:
                case OP_ICOMPARE_IMM:
-               case OP_LCOMPARE_IMM:
                        return CMP_TYPE_I;
                default:
                        return CMP_TYPE_L;
@@ -2478,8 +2491,9 @@ mono_is_regsize_var (MonoType *t)
                return FALSE;
        case MONO_TYPE_VALUETYPE:
                return FALSE;
+       default:
+               return FALSE;
        }
-       return FALSE;
 }
 
 #ifndef DISABLE_JIT