X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmini%2Fmini.c;h=3db26016be6916051fc83df8484df66823b41208;hb=07956c6dc20ce785cd45c2ec1c654a1421f0ef72;hp=fd96e6df945ed3acd7d34bd286a25e5b37c2b73e;hpb=beb5430caa096d6f333c88aef9caa2c0c9977aed;p=mono.git diff --git a/mono/mini/mini.c b/mono/mini/mini.c index fd96e6df945..3db26016be6 100644 --- a/mono/mini/mini.c +++ b/mono/mini/mini.c @@ -22,6 +22,10 @@ #include #endif +#ifdef PLATFORM_WIN32 +#define _WIN32_WINNT 0x0500 +#endif + #ifdef HAVE_VALGRIND_MEMCHECK_H #include #endif @@ -92,6 +96,7 @@ static gpointer mono_jit_compile_method_with_opt (MonoMethod *method, guint32 op static gpointer mono_jit_compile_method (MonoMethod *method); static gpointer mono_jit_find_compiled_method (MonoDomain *domain, MonoMethod *method); static gpointer mono_create_jit_trampoline_in_domain (MonoDomain *domain, MonoMethod *method); +inline static int mono_emit_jit_icall (MonoCompile *cfg, MonoBasicBlock *bblock, gconstpointer func, MonoInst **args, const guint8 *ip); static void handle_stobj (MonoCompile *cfg, MonoBasicBlock *bblock, MonoInst *dest, MonoInst *src, const unsigned char *ip, MonoClass *klass, gboolean to_end, gboolean native, gboolean write_barrier); @@ -1410,8 +1415,12 @@ type_from_op (MonoInst *ins) { ins->type = STACK_PTR; switch (ins->inst_i0->type) { case STACK_I4: + break; case STACK_PTR: case STACK_MP: +#if SIZEOF_VOID_P == 8 + ins->opcode = OP_LCONV_TO_U; +#endif break; case STACK_I8: ins->opcode = OP_LCONV_TO_U; @@ -1627,7 +1636,8 @@ mono_compile_create_var (MonoCompile *cfg, MonoType *type, int opcode) MONO_INIT_VARINFO (cfg->vars [num], num); cfg->num_varinfo++; - //g_print ("created temp %d of type %s\n", num, mono_type_get_name (type)); + if (cfg->verbose_level > 2) + g_print ("created temp %d of type %s\n", num, mono_type_get_name (type)); return inst; } @@ -1680,7 +1690,14 @@ type_from_stack_type (MonoInst *ins) { return &ins->klass->this_arg; else return &mono_defaults.object_class->this_arg; - case STACK_OBJ: return &mono_defaults.object_class->byval_arg; + case STACK_OBJ: + /* ins->klass may not be set for ldnull. + * Also, if we have a boxed valuetype, we want an object lass, + * not the valuetype class + */ + if (ins->klass && !ins->klass->valuetype) + return &ins->klass->byval_arg; + return &mono_defaults.object_class->byval_arg; case STACK_VTYPE: return &ins->klass->byval_arg; default: g_error ("stack type %d to montype not handled\n", ins->type); @@ -1694,7 +1711,7 @@ mono_type_from_stack_type (MonoInst *ins) { } static MonoClass* -array_access_to_klass (int opcode) +array_access_to_klass (int opcode, MonoInst *array_obj) { switch (opcode) { case CEE_LDELEM_U1: @@ -1725,8 +1742,13 @@ array_access_to_klass (int opcode) case CEE_STELEM_R8: return mono_defaults.double_class; case CEE_LDELEM_REF: - case CEE_STELEM_REF: + case CEE_STELEM_REF: { + MonoClass *klass = array_obj->klass; + /* FIXME: add assert */ + if (klass && klass->rank) + return klass->element_class; return mono_defaults.object_class; + } default: g_assert_not_reached (); } @@ -1986,11 +2008,16 @@ handle_stack_args (MonoCompile *cfg, MonoBasicBlock *bb, MonoInst **sp, int coun * in the inlined methods do not inherit their in_stack from * the bblock they are inlined to. See bug #58863 for an * example. + * This hack is disabled since it also prevents proper tracking of types. */ +#if 1 + bb->out_stack [i] = mono_compile_create_var (cfg, type_from_stack_type (sp [i]), OP_LOCAL); +#else if (cfg->inlined_method) bb->out_stack [i] = mono_compile_create_var (cfg, type_from_stack_type (sp [i]), OP_LOCAL); else bb->out_stack [i] = mono_compile_get_interface_var (cfg, i, sp [i]); +#endif } } } @@ -2218,9 +2245,20 @@ target_type_is_incompatible (MonoCompile *cfg, MonoType *target, MonoInst *arg) if (arg->type != STACK_I4 && arg->type != STACK_PTR) return 1; return 0; - case MONO_TYPE_CLASS: - case MONO_TYPE_STRING: case MONO_TYPE_OBJECT: + if (arg->type != STACK_OBJ) + return 1; + return 0; + case MONO_TYPE_STRING: + if (arg->type != STACK_OBJ) + return 1; + /* ldnull has arg->klass unset */ + /*if (arg->klass && arg->klass != mono_defaults.string_class) { + G_BREAKPOINT (); + return 1; + }*/ + return 0; + case MONO_TYPE_CLASS: case MONO_TYPE_SZARRAY: case MONO_TYPE_ARRAY: if (arg->type != STACK_OBJ) @@ -2253,9 +2291,11 @@ target_type_is_incompatible (MonoCompile *cfg, MonoType *target, MonoInst *arg) return 0; case MONO_TYPE_GENERICINST: if (mono_type_generic_inst_is_valuetype (simple_type)) { + klass = mono_class_from_mono_type (simple_type); + if (klass->enumtype) + return target_type_is_incompatible (cfg, klass->enum_basetype, arg); if (arg->type != STACK_VTYPE) return 1; - klass = mono_class_from_mono_type (simple_type); if (klass != arg->klass) return 1; return 0; @@ -2708,10 +2748,19 @@ handle_load_float (MonoCompile *cfg, MonoBasicBlock *bblock, MonoInst *ptr, cons NEW_TEMPLOAD (cfg, (ins), temp); \ } \ } while (0) +#define STARG_SOFT_FLOAT(cfg,ins,idx,ip) do {\ + if (param_types [(idx)]->type == MONO_TYPE_R4 && !param_types [(idx)]->byref) { \ + int temp; \ + NEW_ARGLOADA (cfg, (ins), (idx)); \ + handle_store_float (cfg, bblock, (ins), *sp, (ip)); \ + MONO_INST_NEW (cfg, (ins), CEE_NOP); \ + } \ + } while (0) #else #define LDLOC_SOFT_FLOAT(cfg,ins,idx,ip) #define STLOC_SOFT_FLOAT(cfg,ins,idx,ip) #define LDARG_SOFT_FLOAT(cfg,ins,idx,ip) +#define STARG_SOFT_FLOAT(cfg,ins,idx,ip) #endif static MonoMethod* @@ -3027,6 +3076,11 @@ mono_method_check_inlining (MonoCompile *cfg, MonoMethod *method) MONO_TYPE_ISSTRUCT (signature->ret)) return FALSE; +#ifdef MONO_ARCH_SOFT_FLOAT + /* this complicates things, fix later */ + if (signature->ret->type == MONO_TYPE_R4) + return FALSE; +#endif /* its not worth to inline methods with valuetype arguments?? */ for (i = 0; i < signature->param_count; i++) { if (MONO_TYPE_ISSTRUCT (signature->params [i])) { @@ -3261,6 +3315,15 @@ mini_get_inst_for_method (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSigna MONO_INST_NEW (cfg, ins, CEE_BREAK); return ins; } + if (cmethod->name [0] == 'g' && strcmp (cmethod->name, "get_IsRunningOnWindows") == 0 + && strcmp (cmethod->klass->name, "Environment") == 0) { +#ifdef PLATFORM_WIN32 + NEW_ICONST (cfg, ins, 1); +#else + NEW_ICONST (cfg, ins, 0); +#endif + return ins; + } } return mono_arch_get_inst_for_method (cfg, cmethod, fsig, args); @@ -3697,6 +3760,13 @@ can_access_internals (MonoAssembly *accessing, MonoAssembly* accessed) static gboolean can_access_member (MonoClass *access_klass, MonoClass *member_klass, int access_level) { + if (access_klass->generic_class && member_klass->generic_class && + access_klass->generic_class->container_class && member_klass->generic_class->container_class) { + if (can_access_member (access_klass->generic_class->container_class, + member_klass->generic_class->container_class, access_level)) + return TRUE; + } + /* Partition I 8.5.3.2 */ /* the access level values are the same for fields and methods */ switch (access_level) { @@ -3704,12 +3774,10 @@ can_access_member (MonoClass *access_klass, MonoClass *member_klass, int access_ /* same compilation unit */ return access_klass->image == member_klass->image; case FIELD_ATTRIBUTE_PRIVATE: - if (access_klass->generic_class && member_klass->generic_class && member_klass->generic_class->container_class) - return member_klass->generic_class->container_class == access_klass->generic_class->container_class; return access_klass == member_klass; case FIELD_ATTRIBUTE_FAM_AND_ASSEM: if (mono_class_has_parent (access_klass, member_klass) && - can_access_internals (access_klass->image->assembly, member_klass->image->assembly)) + can_access_internals (access_klass->image->assembly, member_klass->image->assembly)) return TRUE; return FALSE; case FIELD_ATTRIBUTE_ASSEMBLY: @@ -4316,6 +4384,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b ins->cil_code = ip; if (!dont_verify_stloc && target_type_is_incompatible (cfg, param_types [ip [1]], *sp)) UNVERIFIED; + STARG_SOFT_FLOAT (cfg, ins, ip [1], ip); if (ins->opcode == CEE_STOBJ) { NEW_ARGLOADA (cfg, ins, ip [1]); handle_stobj (cfg, bblock, ins, *sp, ip, ins->klass, FALSE, FALSE, FALSE); @@ -4556,6 +4625,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b } else if (constrained_call) { cmethod = mono_get_method_constrained (image, token, constrained_call, generic_context, &cil_method); cmethod = mono_get_inflated_method (cmethod); + cil_method = cmethod; } else { cmethod = mini_get_method (method, token, NULL, generic_context); cil_method = cmethod; @@ -5481,6 +5551,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b n = read32 (ip + 1); if (method->wrapper_type == MONO_WRAPPER_DYNAMIC_METHOD) { + /* FIXME: moving GC */ NEW_PCONST (cfg, ins, mono_method_get_wrapper_data (method, n)); ins->cil_code = ip; ins->type = STACK_OBJ; @@ -6383,6 +6454,8 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b link_bblock (cfg, bblock, tblock); CHECK_BBLOCK (target, ip, tblock); ins->inst_target_bb = tblock; + GET_BBLOCK (cfg, bbhash, tblock, ip); + link_bblock (cfg, bblock, tblock); if (sp != stack_start) { handle_stack_args (cfg, bblock, stack_start, sp - stack_start); sp = stack_start; @@ -6420,7 +6493,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b ins->inst_newa_class = klass; ins->inst_newa_len = *sp; ins->type = STACK_OBJ; - ins->klass = klass; + ins->klass = mono_array_class_get (klass, 1); ip += 5; *sp++ = ins; /* @@ -6556,7 +6629,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b sp -= 2; if (sp [0]->type != STACK_OBJ) UNVERIFIED; - klass = array_access_to_klass (*ip); + klass = array_access_to_klass (*ip, sp [0]); NEW_LDELEMA (cfg, load, sp, klass); load->cil_code = ip; #ifdef MONO_ARCH_SOFT_FLOAT @@ -6595,7 +6668,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b sp -= 3; if (sp [0]->type != STACK_OBJ) UNVERIFIED; - klass = array_access_to_klass (*ip); + klass = array_access_to_klass (*ip, sp [0]); NEW_LDELEMA (cfg, load, sp, klass); load->cil_code = ip; #ifdef MONO_ARCH_SOFT_FLOAT @@ -7294,6 +7367,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b ins->cil_code = ip; if (!dont_verify_stloc && target_type_is_incompatible (cfg, param_types [n], *sp)) UNVERIFIED; + STARG_SOFT_FLOAT (cfg, ins, n, ip); if (ins->opcode == CEE_STOBJ) { NEW_ARGLOADA (cfg, ins, n); handle_stobj (cfg, bblock, ins, *sp, ip, ins->klass, FALSE, FALSE, FALSE); @@ -8142,15 +8216,28 @@ mono_dynamic_code_hash_lookup (MonoDomain *domain, MonoMethod *method) typedef struct { MonoClass *vtype; GList *active; - GList *slots; + GSList *slots; } StackSlotInfo; +static inline GSList* +g_slist_prepend_mempool (MonoMemPool *mp, GSList *list, + gpointer data) +{ + GSList *new_list; + + new_list = mono_mempool_alloc (mp, sizeof (GSList)); + new_list->data = data; + new_list->next = list; + + return new_list; +} + /* * mono_allocate_stack_slots_full: * * Allocate stack slots for all non register allocated variables using a * linear scan algorithm. - * Returns: an array of stack offsets which the caller should free. + * Returns: an array of stack offsets. * STACK_SIZE is set to the amount of stack space needed. * STACK_ALIGN is set to the alignment needed by the locals area. */ @@ -8167,11 +8254,11 @@ mono_allocate_stack_slots_full (MonoCompile *m, gboolean backward, guint32 *stac MonoType *t; int nvtypes; - scalar_stack_slots = g_new0 (StackSlotInfo, MONO_TYPE_PINNED); - vtype_stack_slots = g_new0 (StackSlotInfo, 256); + scalar_stack_slots = mono_mempool_alloc0 (m->mempool, sizeof (StackSlotInfo) * MONO_TYPE_PINNED); + vtype_stack_slots = NULL; nvtypes = 0; - offsets = g_new (gint32, m->num_varinfo); + offsets = mono_mempool_alloc (m->mempool, sizeof (gint32) * m->num_varinfo); for (i = 0; i < m->num_varinfo; ++i) offsets [i] = -1; @@ -8215,6 +8302,8 @@ mono_allocate_stack_slots_full (MonoCompile *m, gboolean backward, guint32 *stac } /* Fall through */ case MONO_TYPE_VALUETYPE: + if (!vtype_stack_slots) + vtype_stack_slots = mono_mempool_alloc0 (m->mempool, sizeof (StackSlotInfo) * 256); for (i = 0; i < nvtypes; ++i) if (t->data.klass == vtype_stack_slots [i].vtype) break; @@ -8227,6 +8316,22 @@ mono_allocate_stack_slots_full (MonoCompile *m, gboolean backward, guint32 *stac nvtypes ++; } break; + case MONO_TYPE_CLASS: + case MONO_TYPE_OBJECT: + case MONO_TYPE_ARRAY: + case MONO_TYPE_SZARRAY: + case MONO_TYPE_STRING: + case MONO_TYPE_PTR: + case MONO_TYPE_I: + case MONO_TYPE_U: +#if SIZEOF_VOID_P == 4 + case MONO_TYPE_I4: +#else + case MONO_TYPE_I8: +#endif + /* Share non-float stack slots of the same size */ + slot_info = &scalar_stack_slots [MONO_TYPE_CLASS]; + break; default: slot_info = &scalar_stack_slots [t->type]; } @@ -8246,7 +8351,7 @@ mono_allocate_stack_slots_full (MonoCompile *m, gboolean backward, guint32 *stac //printf ("EXPIR %2d %08x %08x C%d R%d\n", amv->idx, amv->range.first_use.abs_pos, amv->range.last_use.abs_pos, amv->spill_costs, amv->reg); slot_info->active = g_list_delete_link (slot_info->active, slot_info->active); - slot_info->slots = g_list_prepend (slot_info->slots, GINT_TO_POINTER (offsets [amv->idx])); + slot_info->slots = g_slist_prepend_mempool (m->mempool, slot_info->slots, GINT_TO_POINTER (offsets [amv->idx])); } /* @@ -8261,7 +8366,7 @@ mono_allocate_stack_slots_full (MonoCompile *m, gboolean backward, guint32 *stac if (slot_info->slots) { slot = GPOINTER_TO_INT (slot_info->slots->data); - slot_info->slots = g_list_delete_link (slot_info->slots, slot_info->slots); + slot_info->slots = slot_info->slots->next; } slot_info->active = mono_varlist_insert_sorted (m, slot_info->active, vmv, TRUE); @@ -8312,15 +8417,15 @@ mono_allocate_stack_slots_full (MonoCompile *m, gboolean backward, guint32 *stac } g_list_free (vars); for (i = 0; i < MONO_TYPE_PINNED; ++i) { - g_list_free (scalar_stack_slots [i].active); - g_list_free (scalar_stack_slots [i].slots); + if (scalar_stack_slots [i].active) + g_list_free (scalar_stack_slots [i].active); } for (i = 0; i < nvtypes; ++i) { - g_list_free (vtype_stack_slots [i].active); - g_list_free (vtype_stack_slots [i].slots); + if (vtype_stack_slots [i].active) + g_list_free (vtype_stack_slots [i].active); } - g_free (scalar_stack_slots); - g_free (vtype_stack_slots); + + mono_jit_stats.locals_stack_size += offset; *stack_size = offset; return offsets; @@ -9938,8 +10043,7 @@ mini_select_instructions (MonoCompile *cfg) } emit_state (cfg, mbstate, MB_NTERM_stmt); } - bb->max_ireg = cfg->rs->next_vireg; - bb->max_freg = cfg->rs->next_vfreg; + bb->max_vreg = cfg->rs->next_vreg; if (bb->last_ins) bb->last_ins->next = NULL; @@ -10457,6 +10561,15 @@ mini_method_compile (MonoMethod *method, guint32 opts, MonoDomain *domain, gbool g_list_free (regs); } + /* todo: remove code when we have verified that the liveness for try/catch blocks + * works perfectly + */ + /* + * Currently, this can't be commented out since exception blocks are not + * processed during liveness analysis. + */ + mono_liveness_handle_exception_clauses (cfg); + if (cfg->opt & MONO_OPT_LINEARS) { GList *vars, *regs; @@ -11061,6 +11174,8 @@ SIG_HANDLER_SIGNATURE (sigsegv_signal_handler) mono_arch_handle_exception (ctx, exc, FALSE); } +#ifndef PLATFORM_WIN32 + static void SIG_HANDLER_SIGNATURE (sigabrt_signal_handler) { @@ -11130,6 +11245,16 @@ SIG_HANDLER_SIGNATURE (sigquit_signal_handler) mono_print_thread_dump (ctx); } +static void +SIG_HANDLER_SIGNATURE (sigusr2_signal_handler) +{ + gboolean enabled = mono_trace_is_enabled (); + + mono_trace_enable (!enabled); +} + +#endif + static void SIG_HANDLER_SIGNATURE (sigint_signal_handler) { @@ -11141,14 +11266,6 @@ SIG_HANDLER_SIGNATURE (sigint_signal_handler) mono_arch_handle_exception (ctx, exc, FALSE); } -static void -SIG_HANDLER_SIGNATURE (sigusr2_signal_handler) -{ - gboolean enabled = mono_trace_is_enabled (); - - mono_trace_enable (!enabled); -} - #ifdef PLATFORM_MACOSX /* @@ -11402,6 +11519,26 @@ enable_rtc_timer (gboolean enable) } #endif +#ifdef PLATFORM_WIN32 +static HANDLE win32_main_thread; +static MMRESULT win32_timer; + +static void CALLBACK +win32_time_proc (UINT uID, UINT uMsg, DWORD dwUser, DWORD dw1, DWORD dw2) +{ + CONTEXT context; + + context.ContextFlags = CONTEXT_CONTROL; + if (GetThreadContext (win32_main_thread, &context)) { +#ifdef _WIN64 + mono_profiler_stat_hit ((guchar *) context.Rip, &context); +#else + mono_profiler_stat_hit ((guchar *) context.Eip, &context); +#endif + } +} +#endif + static void setup_stat_profiler (void) { @@ -11454,6 +11591,27 @@ setup_stat_profiler (void) return; inited = 1; add_signal_handler (SIGPROF, sigprof_signal_handler); +#elif defined (PLATFORM_WIN32) + static int inited = 0; + TIMECAPS timecaps; + + if (inited) + return; + + inited = 1; + if (timeGetDevCaps (&timecaps, sizeof (timecaps)) != TIMERR_NOERROR) + return; + + if ((win32_main_thread = OpenThread (READ_CONTROL | THREAD_GET_CONTEXT, FALSE, GetCurrentThreadId ())) == NULL) + return; + + if (timeBeginPeriod (1) != TIMERR_NOERROR) + return; + + if ((win32_timer = timeSetEvent (1, 0, win32_time_proc, 0, TIME_PERIODIC)) == 0) { + timeEndPeriod (1); + return; + } #endif } @@ -11838,7 +11996,8 @@ print_jit_stats (void) g_print ("Allocated code size: %ld\n", mono_jit_stats.allocated_code_size); g_print ("Inlineable methods: %ld\n", mono_jit_stats.inlineable_methods); g_print ("Inlined methods: %ld\n", mono_jit_stats.inlined_methods); - + g_print ("Locals stack size: %ld\n", mono_jit_stats.locals_stack_size); + g_print ("\nCreated object count: %ld\n", mono_stats.new_object_count); g_print ("Initialized classes: %ld\n", mono_stats.initialized_class_count); g_print ("Used classes: %ld\n", mono_stats.used_class_count);