X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmini%2Fmethod-to-ir.c;h=2193d5f327281f402c52f295c118840fe1026541;hb=e21c1281c17f5aa1cfaa2c1711c861164c988192;hp=acb7e6fd275909b1f9ace6146fd24cd3cf656412;hpb=fcf4e1b7bfb8e7f9f9910b651ce9fddaa4466380;p=mono.git diff --git a/mono/mini/method-to-ir.c b/mono/mini/method-to-ir.c index acb7e6fd275..2193d5f3272 100644 --- a/mono/mini/method-to-ir.c +++ b/mono/mini/method-to-ir.c @@ -152,10 +152,16 @@ static int inline_method (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSigna static MonoInst* emit_llvmonly_virtual_call (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSignature *fsig, int context_used, MonoInst **sp); +inline static MonoInst* +mono_emit_calli (MonoCompile *cfg, MonoMethodSignature *sig, MonoInst **args, MonoInst *addr, MonoInst *imt_arg, MonoInst *rgctx_arg); + /* helper methods signatures */ static MonoMethodSignature *helper_sig_domain_get; static MonoMethodSignature *helper_sig_rgctx_lazy_fetch_trampoline; static MonoMethodSignature *helper_sig_llvmonly_imt_trampoline; +static MonoMethodSignature *helper_sig_jit_thread_attach; +static MonoMethodSignature *helper_sig_get_tls_tramp; +static MonoMethodSignature *helper_sig_set_tls_tramp; /* type loading helpers */ static GENERATE_GET_CLASS_WITH_CACHE (runtime_helpers, System.Runtime.CompilerServices, RuntimeHelpers) @@ -367,6 +373,9 @@ mono_create_helper_signatures (void) helper_sig_domain_get = mono_create_icall_signature ("ptr"); helper_sig_rgctx_lazy_fetch_trampoline = mono_create_icall_signature ("ptr ptr"); helper_sig_llvmonly_imt_trampoline = mono_create_icall_signature ("ptr ptr ptr"); + helper_sig_jit_thread_attach = mono_create_icall_signature ("ptr ptr"); + helper_sig_get_tls_tramp = mono_create_icall_signature ("ptr"); + helper_sig_set_tls_tramp = mono_create_icall_signature ("void ptr"); } static MONO_NEVER_INLINE void @@ -1572,267 +1581,10 @@ emit_runtime_constant (MonoCompile *cfg, MonoJumpInfoType patch_type, gpointer d return ins; } -static void -mini_emit_interface_bitmap_check (MonoCompile *cfg, int intf_bit_reg, int base_reg, int offset, MonoClass *klass) -{ - int ibitmap_reg = alloc_preg (cfg); -#ifdef COMPRESSED_INTERFACE_BITMAP - MonoInst *args [2]; - MonoInst *res, *ins; - NEW_LOAD_MEMBASE (cfg, ins, OP_LOAD_MEMBASE, ibitmap_reg, base_reg, offset); - MONO_ADD_INS (cfg->cbb, ins); - args [0] = ins; - args [1] = emit_runtime_constant (cfg, MONO_PATCH_INFO_IID, klass); - res = mono_emit_jit_icall (cfg, mono_class_interface_match, args); - MONO_EMIT_NEW_UNALU (cfg, OP_MOVE, intf_bit_reg, res->dreg); -#else - int ibitmap_byte_reg = alloc_preg (cfg); - - MONO_EMIT_NEW_LOAD_MEMBASE (cfg, ibitmap_reg, base_reg, offset); - - if (cfg->compile_aot) { - int iid_reg = alloc_preg (cfg); - int shifted_iid_reg = alloc_preg (cfg); - int ibitmap_byte_address_reg = alloc_preg (cfg); - int masked_iid_reg = alloc_preg (cfg); - int iid_one_bit_reg = alloc_preg (cfg); - int iid_bit_reg = alloc_preg (cfg); - MONO_EMIT_NEW_AOTCONST (cfg, iid_reg, klass, MONO_PATCH_INFO_IID); - MONO_EMIT_NEW_BIALU_IMM (cfg, OP_SHR_IMM, shifted_iid_reg, iid_reg, 3); - MONO_EMIT_NEW_BIALU (cfg, OP_PADD, ibitmap_byte_address_reg, ibitmap_reg, shifted_iid_reg); - MONO_EMIT_NEW_LOAD_MEMBASE_OP (cfg, OP_LOADU1_MEMBASE, ibitmap_byte_reg, ibitmap_byte_address_reg, 0); - MONO_EMIT_NEW_BIALU_IMM (cfg, OP_IAND_IMM, masked_iid_reg, iid_reg, 7); - MONO_EMIT_NEW_ICONST (cfg, iid_one_bit_reg, 1); - MONO_EMIT_NEW_BIALU (cfg, OP_ISHL, iid_bit_reg, iid_one_bit_reg, masked_iid_reg); - MONO_EMIT_NEW_BIALU (cfg, OP_IAND, intf_bit_reg, ibitmap_byte_reg, iid_bit_reg); - } else { - MONO_EMIT_NEW_LOAD_MEMBASE_OP (cfg, OP_LOADI1_MEMBASE, ibitmap_byte_reg, ibitmap_reg, klass->interface_id >> 3); - MONO_EMIT_NEW_BIALU_IMM (cfg, OP_AND_IMM, intf_bit_reg, ibitmap_byte_reg, 1 << (klass->interface_id & 7)); - } -#endif -} - -/* - * Emit code which loads into "intf_bit_reg" a nonzero value if the MonoClass - * stored in "klass_reg" implements the interface "klass". - */ -static void -mini_emit_load_intf_bit_reg_class (MonoCompile *cfg, int intf_bit_reg, int klass_reg, MonoClass *klass) -{ - mini_emit_interface_bitmap_check (cfg, intf_bit_reg, klass_reg, MONO_STRUCT_OFFSET (MonoClass, interface_bitmap), klass); -} - -/* - * 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 *cfg, int intf_bit_reg, int vtable_reg, MonoClass *klass) -{ - mini_emit_interface_bitmap_check (cfg, intf_bit_reg, vtable_reg, MONO_STRUCT_OFFSET (MonoVTable, interface_bitmap), klass); -} - -/* - * Emit code which checks whenever the interface id of @klass is smaller than - * than the value given by max_iid_reg. -*/ -static void -mini_emit_max_iid_check (MonoCompile *cfg, int max_iid_reg, MonoClass *klass, - MonoBasicBlock *false_target) -{ - if (cfg->compile_aot) { - int iid_reg = alloc_preg (cfg); - MONO_EMIT_NEW_AOTCONST (cfg, iid_reg, klass, MONO_PATCH_INFO_IID); - MONO_EMIT_NEW_BIALU (cfg, OP_COMPARE, -1, max_iid_reg, iid_reg); - } - else - MONO_EMIT_NEW_BIALU_IMM (cfg, OP_COMPARE_IMM, -1, max_iid_reg, klass->interface_id); - if (false_target) - MONO_EMIT_NEW_BRANCH_BLOCK (cfg, OP_PBLT_UN, false_target); - else - MONO_EMIT_NEW_COND_EXC (cfg, LT_UN, "InvalidCastException"); -} - -/* Same as above, but obtains max_iid from a vtable */ -static void -mini_emit_max_iid_check_vtable (MonoCompile *cfg, int vtable_reg, MonoClass *klass, - MonoBasicBlock *false_target) -{ - int max_iid_reg = alloc_preg (cfg); - - MONO_EMIT_NEW_LOAD_MEMBASE_OP (cfg, OP_LOADU4_MEMBASE, max_iid_reg, vtable_reg, MONO_STRUCT_OFFSET (MonoVTable, max_interface_id)); - mini_emit_max_iid_check (cfg, max_iid_reg, klass, false_target); -} - -/* Same as above, but obtains max_iid from a klass */ -static void -mini_emit_max_iid_check_class (MonoCompile *cfg, int klass_reg, MonoClass *klass, - MonoBasicBlock *false_target) -{ - int max_iid_reg = alloc_preg (cfg); - - MONO_EMIT_NEW_LOAD_MEMBASE_OP (cfg, OP_LOADU4_MEMBASE, max_iid_reg, klass_reg, MONO_STRUCT_OFFSET (MonoClass, max_interface_id)); - mini_emit_max_iid_check (cfg, max_iid_reg, klass, false_target); -} - -static void -mini_emit_isninst_cast_inst (MonoCompile *cfg, int klass_reg, MonoClass *klass, MonoInst *klass_ins, MonoBasicBlock *false_target, MonoBasicBlock *true_target) -{ - int idepth_reg = alloc_preg (cfg); - int stypes_reg = alloc_preg (cfg); - int stype = alloc_preg (cfg); - - mono_class_setup_supertypes (klass); - - if (klass->idepth > MONO_DEFAULT_SUPERTABLE_SIZE) { - MONO_EMIT_NEW_LOAD_MEMBASE_OP (cfg, OP_LOADU2_MEMBASE, idepth_reg, klass_reg, MONO_STRUCT_OFFSET (MonoClass, idepth)); - MONO_EMIT_NEW_BIALU_IMM (cfg, OP_COMPARE_IMM, -1, idepth_reg, klass->idepth); - MONO_EMIT_NEW_BRANCH_BLOCK (cfg, OP_PBLT_UN, false_target); - } - MONO_EMIT_NEW_LOAD_MEMBASE (cfg, stypes_reg, klass_reg, MONO_STRUCT_OFFSET (MonoClass, supertypes)); - MONO_EMIT_NEW_LOAD_MEMBASE (cfg, stype, stypes_reg, ((klass->idepth - 1) * SIZEOF_VOID_P)); - if (klass_ins) { - MONO_EMIT_NEW_BIALU (cfg, OP_COMPARE, -1, stype, klass_ins->dreg); - } else if (cfg->compile_aot) { - int const_reg = alloc_preg (cfg); - MONO_EMIT_NEW_CLASSCONST (cfg, const_reg, klass); - MONO_EMIT_NEW_BIALU (cfg, OP_COMPARE, -1, stype, const_reg); - } else { - MONO_EMIT_NEW_BIALU_IMM (cfg, OP_COMPARE_IMM, -1, stype, klass); - } - MONO_EMIT_NEW_BRANCH_BLOCK (cfg, OP_PBEQ, true_target); -} - -static void -mini_emit_isninst_cast (MonoCompile *cfg, int klass_reg, MonoClass *klass, MonoBasicBlock *false_target, MonoBasicBlock *true_target) -{ - mini_emit_isninst_cast_inst (cfg, klass_reg, klass, NULL, false_target, true_target); -} - -static void -mini_emit_iface_cast (MonoCompile *cfg, int vtable_reg, MonoClass *klass, MonoBasicBlock *false_target, MonoBasicBlock *true_target) -{ - int intf_reg = alloc_preg (cfg); - - mini_emit_max_iid_check_vtable (cfg, vtable_reg, klass, false_target); - mini_emit_load_intf_bit_reg_vtable (cfg, intf_reg, vtable_reg, klass); - MONO_EMIT_NEW_BIALU_IMM (cfg, OP_COMPARE_IMM, -1, intf_reg, 0); - if (true_target) - MONO_EMIT_NEW_BRANCH_BLOCK (cfg, OP_PBNE_UN, true_target); - else - MONO_EMIT_NEW_COND_EXC (cfg, EQ, "InvalidCastException"); -} - -/* - * Variant of the above that takes a register to the class, not the vtable. - */ -static void -mini_emit_iface_class_cast (MonoCompile *cfg, int klass_reg, MonoClass *klass, MonoBasicBlock *false_target, MonoBasicBlock *true_target) -{ - int intf_bit_reg = alloc_preg (cfg); - - mini_emit_max_iid_check_class (cfg, klass_reg, klass, false_target); - mini_emit_load_intf_bit_reg_class (cfg, intf_bit_reg, klass_reg, klass); - MONO_EMIT_NEW_BIALU_IMM (cfg, OP_COMPARE_IMM, -1, intf_bit_reg, 0); - if (true_target) - MONO_EMIT_NEW_BRANCH_BLOCK (cfg, OP_PBNE_UN, true_target); - else - MONO_EMIT_NEW_COND_EXC (cfg, EQ, "InvalidCastException"); -} - -static inline void -mini_emit_class_check_inst (MonoCompile *cfg, int klass_reg, MonoClass *klass, MonoInst *klass_inst) -{ - if (klass_inst) { - MONO_EMIT_NEW_BIALU (cfg, OP_COMPARE, -1, klass_reg, klass_inst->dreg); - } else { - MonoInst *ins = emit_runtime_constant (cfg, MONO_PATCH_INFO_CLASS, klass); - MONO_EMIT_NEW_BIALU (cfg, OP_COMPARE, -1, klass_reg, ins->dreg); - } - MONO_EMIT_NEW_COND_EXC (cfg, NE_UN, "InvalidCastException"); -} - -static inline void -mini_emit_class_check (MonoCompile *cfg, int klass_reg, MonoClass *klass) -{ - mini_emit_class_check_inst (cfg, klass_reg, klass, NULL); -} - -static inline void -mini_emit_class_check_branch (MonoCompile *cfg, int klass_reg, MonoClass *klass, int branch_op, MonoBasicBlock *target) -{ - if (cfg->compile_aot) { - int const_reg = alloc_preg (cfg); - MONO_EMIT_NEW_CLASSCONST (cfg, const_reg, klass); - MONO_EMIT_NEW_BIALU (cfg, OP_COMPARE, -1, klass_reg, const_reg); - } else { - MONO_EMIT_NEW_BIALU_IMM (cfg, OP_COMPARE_IMM, -1, klass_reg, klass); - } - MONO_EMIT_NEW_BRANCH_BLOCK (cfg, branch_op, target); -} - -static void -mini_emit_castclass (MonoCompile *cfg, int obj_reg, int klass_reg, MonoClass *klass, MonoBasicBlock *object_is_null); - -static void -mini_emit_castclass_inst (MonoCompile *cfg, int obj_reg, int klass_reg, MonoClass *klass, MonoInst *klass_inst, MonoBasicBlock *object_is_null) -{ - if (klass->rank) { - int rank_reg = alloc_preg (cfg); - int eclass_reg = alloc_preg (cfg); - - g_assert (!klass_inst); - MONO_EMIT_NEW_LOAD_MEMBASE_OP (cfg, OP_LOADU1_MEMBASE, rank_reg, klass_reg, MONO_STRUCT_OFFSET (MonoClass, rank)); - MONO_EMIT_NEW_BIALU_IMM (cfg, OP_COMPARE_IMM, -1, rank_reg, klass->rank); - MONO_EMIT_NEW_COND_EXC (cfg, NE_UN, "InvalidCastException"); - // MONO_EMIT_NEW_LOAD_MEMBASE (cfg, klass_reg, vtable_reg, MONO_STRUCT_OFFSET (MonoVTable, klass)); - MONO_EMIT_NEW_LOAD_MEMBASE (cfg, eclass_reg, klass_reg, MONO_STRUCT_OFFSET (MonoClass, cast_class)); - if (klass->cast_class == mono_defaults.object_class) { - int parent_reg = alloc_preg (cfg); - MONO_EMIT_NEW_LOAD_MEMBASE (cfg, parent_reg, eclass_reg, MONO_STRUCT_OFFSET (MonoClass, parent)); - mini_emit_class_check_branch (cfg, parent_reg, mono_defaults.enum_class->parent, OP_PBNE_UN, object_is_null); - mini_emit_class_check (cfg, eclass_reg, mono_defaults.enum_class); - } else if (klass->cast_class == mono_defaults.enum_class->parent) { - mini_emit_class_check_branch (cfg, eclass_reg, mono_defaults.enum_class->parent, OP_PBEQ, object_is_null); - mini_emit_class_check (cfg, eclass_reg, mono_defaults.enum_class); - } else if (klass->cast_class == mono_defaults.enum_class) { - mini_emit_class_check (cfg, eclass_reg, mono_defaults.enum_class); - } else if (mono_class_is_interface (klass->cast_class)) { - mini_emit_iface_class_cast (cfg, eclass_reg, klass->cast_class, NULL, NULL); - } else { - // Pass -1 as obj_reg to skip the check below for arrays of arrays - mini_emit_castclass (cfg, -1, eclass_reg, klass->cast_class, object_is_null); - } - - if ((klass->rank == 1) && (klass->byval_arg.type == MONO_TYPE_SZARRAY) && (obj_reg != -1)) { - /* Check that the object is a vector too */ - int bounds_reg = alloc_preg (cfg); - MONO_EMIT_NEW_LOAD_MEMBASE (cfg, bounds_reg, obj_reg, MONO_STRUCT_OFFSET (MonoArray, bounds)); - MONO_EMIT_NEW_BIALU_IMM (cfg, OP_COMPARE_IMM, -1, bounds_reg, 0); - MONO_EMIT_NEW_COND_EXC (cfg, NE_UN, "InvalidCastException"); - } - } else { - int idepth_reg = alloc_preg (cfg); - int stypes_reg = alloc_preg (cfg); - int stype = alloc_preg (cfg); - - mono_class_setup_supertypes (klass); - - if (klass->idepth > MONO_DEFAULT_SUPERTABLE_SIZE) { - MONO_EMIT_NEW_LOAD_MEMBASE_OP (cfg, OP_LOADU2_MEMBASE, idepth_reg, klass_reg, MONO_STRUCT_OFFSET (MonoClass, idepth)); - MONO_EMIT_NEW_BIALU_IMM (cfg, OP_COMPARE_IMM, -1, idepth_reg, klass->idepth); - MONO_EMIT_NEW_COND_EXC (cfg, LT_UN, "InvalidCastException"); - } - MONO_EMIT_NEW_LOAD_MEMBASE (cfg, stypes_reg, klass_reg, MONO_STRUCT_OFFSET (MonoClass, supertypes)); - MONO_EMIT_NEW_LOAD_MEMBASE (cfg, stype, stypes_reg, ((klass->idepth - 1) * SIZEOF_VOID_P)); - mini_emit_class_check_inst (cfg, stype, klass, klass_inst); - } -} - -static void -mini_emit_castclass (MonoCompile *cfg, int obj_reg, int klass_reg, MonoClass *klass, MonoBasicBlock *object_is_null) +MonoInst* +mini_emit_runtime_constant (MonoCompile *cfg, MonoJumpInfoType patch_type, gpointer data) { - mini_emit_castclass_inst (cfg, obj_reg, klass_reg, klass, NULL, object_is_null); + return emit_runtime_constant (cfg, patch_type, data); } static void @@ -1971,22 +1723,91 @@ mini_emit_memcpy (MonoCompile *cfg, int destreg, int doffset, int srcreg, int so } } -static void -emit_tls_set (MonoCompile *cfg, int sreg1, MonoTlsKey tls_key) +static MonoInst* +mono_create_fast_tls_getter (MonoCompile *cfg, MonoTlsKey key) +{ + int tls_offset = mono_tls_get_tls_offset (key); + + if (cfg->compile_aot) + return NULL; + + if (tls_offset != -1 && mono_arch_have_fast_tls ()) { + MonoInst *ins; + MONO_INST_NEW (cfg, ins, OP_TLS_GET); + ins->dreg = mono_alloc_preg (cfg); + ins->inst_offset = tls_offset; + return ins; + } + return NULL; +} + +static MonoInst* +mono_create_fast_tls_setter (MonoCompile *cfg, MonoInst* value, MonoTlsKey key) +{ + int tls_offset = mono_tls_get_tls_offset (key); + + if (cfg->compile_aot) + return NULL; + + if (tls_offset != -1 && mono_arch_have_fast_tls ()) { + MonoInst *ins; + MONO_INST_NEW (cfg, ins, OP_TLS_SET); + ins->sreg1 = value->dreg; + ins->inst_offset = tls_offset; + return ins; + } + return NULL; +} + + +MonoInst* +mono_create_tls_get (MonoCompile *cfg, MonoTlsKey key) { - MonoInst *ins, *c; + MonoInst *fast_tls = NULL; + + if (!mini_get_debug_options ()->use_fallback_tls) + fast_tls = mono_create_fast_tls_getter (cfg, key); + + if (fast_tls) { + MONO_ADD_INS (cfg->cbb, fast_tls); + return fast_tls; + } if (cfg->compile_aot) { - EMIT_NEW_TLS_OFFSETCONST (cfg, c, tls_key); - MONO_INST_NEW (cfg, ins, OP_TLS_SET_REG); - ins->sreg1 = sreg1; - ins->sreg2 = c->dreg; - MONO_ADD_INS (cfg->cbb, ins); + MonoInst *addr; + /* + * tls getters are critical pieces of code and we don't want to resolve them + * through the standard plt/tramp mechanism since we might expose ourselves + * to crashes and infinite recursions. + */ + EMIT_NEW_AOTCONST (cfg, addr, MONO_PATCH_INFO_GET_TLS_TRAMP, (void*)key); + return mono_emit_calli (cfg, helper_sig_get_tls_tramp, NULL, addr, NULL, NULL); } else { - MONO_INST_NEW (cfg, ins, OP_TLS_SET); - ins->sreg1 = sreg1; - ins->inst_offset = mini_get_tls_offset (tls_key); - MONO_ADD_INS (cfg->cbb, ins); + gpointer getter = mono_tls_get_tls_getter (key, FALSE); + return mono_emit_jit_icall (cfg, getter, NULL); + } +} + +static MonoInst* +mono_create_tls_set (MonoCompile *cfg, MonoInst *value, MonoTlsKey key) +{ + MonoInst *fast_tls = NULL; + + if (!mini_get_debug_options ()->use_fallback_tls) + fast_tls = mono_create_fast_tls_setter (cfg, value, key); + + if (fast_tls) { + MONO_ADD_INS (cfg->cbb, fast_tls); + return fast_tls; + } + + if (cfg->compile_aot) { + MonoInst *addr; + EMIT_NEW_AOTCONST (cfg, addr, MONO_PATCH_INFO_SET_TLS_TRAMP, (void*)key); + return mono_emit_calli (cfg, helper_sig_set_tls_tramp, &value, addr, NULL, NULL); + } else { + gpointer setter = mono_tls_get_tls_setter (key, FALSE); + return mono_emit_jit_icall (cfg, setter, &value); } } @@ -2005,24 +1826,23 @@ emit_push_lmf (MonoCompile *cfg) * lmf->prev_lmf = *lmf_addr * *lmf_addr = lmf */ - int lmf_reg, prev_lmf_reg; MonoInst *ins, *lmf_ins; if (!cfg->lmf_ir) return; - if (cfg->lmf_ir_mono_lmf && mini_tls_get_supported (cfg, TLS_KEY_LMF)) { + if (cfg->lmf_ir_mono_lmf) { + MonoInst *lmf_vara_ins, *lmf_ins; /* Load current lmf */ - lmf_ins = mono_get_lmf_intrinsic (cfg); + lmf_ins = mono_create_tls_get (cfg, TLS_KEY_LMF); g_assert (lmf_ins); - MONO_ADD_INS (cfg->cbb, lmf_ins); - EMIT_NEW_VARLOADA (cfg, ins, cfg->lmf_var, NULL); - lmf_reg = ins->dreg; + EMIT_NEW_VARLOADA (cfg, lmf_vara_ins, cfg->lmf_var, NULL); /* Save previous_lmf */ - EMIT_NEW_STORE_MEMBASE (cfg, ins, OP_STORE_MEMBASE_REG, lmf_reg, MONO_STRUCT_OFFSET (MonoLMF, previous_lmf), lmf_ins->dreg); + EMIT_NEW_STORE_MEMBASE (cfg, ins, OP_STORE_MEMBASE_REG, lmf_vara_ins->dreg, MONO_STRUCT_OFFSET (MonoLMF, previous_lmf), lmf_ins->dreg); /* Set new LMF */ - emit_tls_set (cfg, lmf_reg, TLS_KEY_LMF); + mono_create_tls_set (cfg, lmf_vara_ins, TLS_KEY_LMF); } else { + int lmf_reg, prev_lmf_reg; /* * Store lmf_addr in a variable, so it can be allocated to a global register. */ @@ -2030,41 +1850,15 @@ emit_push_lmf (MonoCompile *cfg) cfg->lmf_addr_var = mono_compile_create_var (cfg, &mono_defaults.int_class->byval_arg, OP_LOCAL); #ifdef HOST_WIN32 - ins = mono_get_jit_tls_intrinsic (cfg); - if (ins) { - int jit_tls_dreg = ins->dreg; + ins = mono_create_tls_get (cfg, TLS_KEY_JIT_TLS); + g_assert (ins); + int jit_tls_dreg = ins->dreg; - MONO_ADD_INS (cfg->cbb, ins); - lmf_reg = alloc_preg (cfg); - EMIT_NEW_BIALU_IMM (cfg, lmf_ins, OP_PADD_IMM, lmf_reg, jit_tls_dreg, MONO_STRUCT_OFFSET (MonoJitTlsData, lmf)); - } else { - lmf_ins = mono_emit_jit_icall (cfg, mono_get_lmf_addr, NULL); - } + lmf_reg = alloc_preg (cfg); + EMIT_NEW_BIALU_IMM (cfg, lmf_ins, OP_PADD_IMM, lmf_reg, jit_tls_dreg, MONO_STRUCT_OFFSET (MonoJitTlsData, lmf)); #else - lmf_ins = mono_get_lmf_addr_intrinsic (cfg); - if (lmf_ins) { - MONO_ADD_INS (cfg->cbb, lmf_ins); - } else { -#ifdef TARGET_IOS - MonoInst *args [16], *jit_tls_ins, *ins; - - /* Inline mono_get_lmf_addr () */ - /* jit_tls = pthread_getspecific (mono_jit_tls_id); lmf_addr = &jit_tls->lmf; */ - - /* Load mono_jit_tls_id */ - if (cfg->compile_aot) - EMIT_NEW_AOTCONST (cfg, args [0], MONO_PATCH_INFO_JIT_TLS_ID, NULL); - else - EMIT_NEW_ICONST (cfg, args [0], mono_jit_tls_id); - /* call pthread_getspecific () */ - jit_tls_ins = mono_emit_jit_icall (cfg, pthread_getspecific, args); - /* lmf_addr = &jit_tls->lmf */ - EMIT_NEW_BIALU_IMM (cfg, ins, OP_PADD_IMM, cfg->lmf_addr_var->dreg, jit_tls_ins->dreg, MONO_STRUCT_OFFSET (MonoJitTlsData, lmf)); - lmf_ins = ins; -#else - lmf_ins = mono_emit_jit_icall (cfg, mono_get_lmf_addr, NULL); -#endif - } + lmf_ins = mono_create_tls_get (cfg, TLS_KEY_LMF_ADDR); + g_assert (lmf_ins); #endif lmf_ins->dreg = cfg->lmf_addr_var->dreg; @@ -2088,7 +1882,7 @@ emit_push_lmf (MonoCompile *cfg) static void emit_pop_lmf (MonoCompile *cfg) { - int lmf_reg, lmf_addr_reg, prev_lmf_reg; + int lmf_reg, lmf_addr_reg; MonoInst *ins; if (!cfg->lmf_ir) @@ -2097,13 +1891,13 @@ emit_pop_lmf (MonoCompile *cfg) EMIT_NEW_VARLOADA (cfg, ins, cfg->lmf_var, NULL); lmf_reg = ins->dreg; - if (cfg->lmf_ir_mono_lmf && mini_tls_get_supported (cfg, TLS_KEY_LMF)) { + if (cfg->lmf_ir_mono_lmf) { /* Load previous_lmf */ - prev_lmf_reg = alloc_preg (cfg); - EMIT_NEW_LOAD_MEMBASE (cfg, ins, OP_LOAD_MEMBASE, prev_lmf_reg, lmf_reg, MONO_STRUCT_OFFSET (MonoLMF, previous_lmf)); + EMIT_NEW_LOAD_MEMBASE (cfg, ins, OP_LOAD_MEMBASE, alloc_preg (cfg), lmf_reg, MONO_STRUCT_OFFSET (MonoLMF, previous_lmf)); /* Set new LMF */ - emit_tls_set (cfg, prev_lmf_reg, TLS_KEY_LMF); + mono_create_tls_set (cfg, ins, TLS_KEY_LMF); } else { + int prev_lmf_reg; /* * Emit IR to pop the LMF: * *(lmf->lmf_addr) = lmf->prev_lmf @@ -2773,8 +2567,6 @@ emit_get_gsharedvt_info_klass (MonoCompile *cfg, MonoClass *klass, MonoRgctxInfo static MonoInst* emit_get_rgctx_method (MonoCompile *cfg, int context_used, MonoMethod *cmethod, MonoRgctxInfoType rgctx_type); -static MonoInst* -emit_get_rgctx_klass (MonoCompile *cfg, int context_used, MonoClass *klass, MonoRgctxInfoType rgctx_type); static MonoInst* mono_emit_method_call_full (MonoCompile *cfg, MonoMethod *method, MonoMethodSignature *sig, gboolean tail, @@ -3397,7 +3189,7 @@ mini_emit_stobj (MonoCompile *cfg, MonoInst *dest, MonoInst *src, MonoClass *kla if (!size_ins && (cfg->opt & MONO_OPT_INTRINS) && mono_emit_wb_aware_memcpy (cfg, klass, iargs, n, align)) { return; } else if (context_used) { - iargs [2] = emit_get_rgctx_klass (cfg, context_used, klass, MONO_RGCTX_INFO_KLASS); + iargs [2] = mini_emit_get_rgctx_klass (cfg, context_used, klass, MONO_RGCTX_INFO_KLASS); } else { iargs [2] = emit_runtime_constant (cfg, MONO_PATCH_INFO_CLASS, klass); if (!cfg->compile_aot) @@ -3499,8 +3291,8 @@ emit_get_rgctx (MonoCompile *cfg, MonoMethod *method, int context_used) if (!(method->flags & METHOD_ATTRIBUTE_STATIC) && !(context_used & MONO_GENERIC_CONTEXT_USED_METHOD) && - !method->klass->valuetype) - EMIT_NEW_ARGLOAD (cfg, this_ins, 0); + !method->klass->valuetype) + EMIT_NEW_VARLOAD (cfg, this_ins, cfg->this_arg, &mono_defaults.object_class->byval_arg); if (context_used & MONO_GENERIC_CONTEXT_USED_METHOD) { MonoInst *mrgctx_loc, *mrgctx_var; @@ -3677,12 +3469,12 @@ emit_rgctx_fetch (MonoCompile *cfg, MonoInst *rgctx, MonoJumpInfoRgctxEntry *ent return mono_emit_abs_call (cfg, MONO_PATCH_INFO_RGCTX_FETCH, entry, helper_sig_rgctx_lazy_fetch_trampoline, &rgctx); } -static MonoInst* -emit_get_rgctx_klass (MonoCompile *cfg, int context_used, +MonoInst* +mini_emit_get_rgctx_klass (MonoCompile *cfg, int context_used, MonoClass *klass, MonoRgctxInfoType rgctx_type) { - MonoJumpInfoRgctxEntry *entry = mono_patch_info_rgctx_entry_new (cfg->mempool, cfg->current_method, context_used & MONO_GENERIC_CONTEXT_USED_METHOD, MONO_PATCH_INFO_CLASS, klass, rgctx_type); - MonoInst *rgctx = emit_get_rgctx (cfg, cfg->current_method, context_used); + MonoJumpInfoRgctxEntry *entry = mono_patch_info_rgctx_entry_new (cfg->mempool, cfg->method, context_used & MONO_GENERIC_CONTEXT_USED_METHOD, MONO_PATCH_INFO_CLASS, klass, rgctx_type); + MonoInst *rgctx = emit_get_rgctx (cfg, cfg->method, context_used); return emit_rgctx_fetch (cfg, rgctx, entry); } @@ -3691,8 +3483,8 @@ static MonoInst* emit_get_rgctx_sig (MonoCompile *cfg, int context_used, MonoMethodSignature *sig, MonoRgctxInfoType rgctx_type) { - MonoJumpInfoRgctxEntry *entry = mono_patch_info_rgctx_entry_new (cfg->mempool, cfg->current_method, context_used & MONO_GENERIC_CONTEXT_USED_METHOD, MONO_PATCH_INFO_SIGNATURE, sig, rgctx_type); - MonoInst *rgctx = emit_get_rgctx (cfg, cfg->current_method, context_used); + MonoJumpInfoRgctxEntry *entry = mono_patch_info_rgctx_entry_new (cfg->mempool, cfg->method, context_used & MONO_GENERIC_CONTEXT_USED_METHOD, MONO_PATCH_INFO_SIGNATURE, sig, rgctx_type); + MonoInst *rgctx = emit_get_rgctx (cfg, cfg->method, context_used); return emit_rgctx_fetch (cfg, rgctx, entry); } @@ -3709,8 +3501,8 @@ emit_get_rgctx_gsharedvt_call (MonoCompile *cfg, int context_used, call_info->sig = sig; call_info->method = cmethod; - entry = mono_patch_info_rgctx_entry_new (cfg->mempool, cfg->current_method, context_used & MONO_GENERIC_CONTEXT_USED_METHOD, MONO_PATCH_INFO_GSHAREDVT_CALL, call_info, rgctx_type); - rgctx = emit_get_rgctx (cfg, cfg->current_method, context_used); + entry = mono_patch_info_rgctx_entry_new (cfg->mempool, cfg->method, context_used & MONO_GENERIC_CONTEXT_USED_METHOD, MONO_PATCH_INFO_GSHAREDVT_CALL, call_info, rgctx_type); + rgctx = emit_get_rgctx (cfg, cfg->method, context_used); return emit_rgctx_fetch (cfg, rgctx, entry); } @@ -3732,8 +3524,8 @@ emit_get_rgctx_virt_method (MonoCompile *cfg, int context_used, info->klass = klass; info->method = virt_method; - entry = mono_patch_info_rgctx_entry_new (cfg->mempool, cfg->current_method, context_used & MONO_GENERIC_CONTEXT_USED_METHOD, MONO_PATCH_INFO_VIRT_METHOD, info, rgctx_type); - rgctx = emit_get_rgctx (cfg, cfg->current_method, context_used); + entry = mono_patch_info_rgctx_entry_new (cfg->mempool, cfg->method, context_used & MONO_GENERIC_CONTEXT_USED_METHOD, MONO_PATCH_INFO_VIRT_METHOD, info, rgctx_type); + rgctx = emit_get_rgctx (cfg, cfg->method, context_used); return emit_rgctx_fetch (cfg, rgctx, entry); } @@ -3745,8 +3537,8 @@ emit_get_rgctx_gsharedvt_method (MonoCompile *cfg, int context_used, MonoJumpInfoRgctxEntry *entry; MonoInst *rgctx; - entry = mono_patch_info_rgctx_entry_new (cfg->mempool, cfg->current_method, context_used & MONO_GENERIC_CONTEXT_USED_METHOD, MONO_PATCH_INFO_GSHAREDVT_METHOD, info, MONO_RGCTX_INFO_METHOD_GSHAREDVT_INFO); - rgctx = emit_get_rgctx (cfg, cfg->current_method, context_used); + entry = mono_patch_info_rgctx_entry_new (cfg->mempool, cfg->method, context_used & MONO_GENERIC_CONTEXT_USED_METHOD, MONO_PATCH_INFO_GSHAREDVT_METHOD, info, MONO_RGCTX_INFO_METHOD_GSHAREDVT_INFO); + rgctx = emit_get_rgctx (cfg, cfg->method, context_used); return emit_rgctx_fetch (cfg, rgctx, entry); } @@ -3775,8 +3567,8 @@ emit_get_rgctx_method (MonoCompile *cfg, int context_used, g_assert_not_reached (); } } else { - MonoJumpInfoRgctxEntry *entry = mono_patch_info_rgctx_entry_new (cfg->mempool, cfg->current_method, context_used & MONO_GENERIC_CONTEXT_USED_METHOD, MONO_PATCH_INFO_METHODCONST, cmethod, rgctx_type); - MonoInst *rgctx = emit_get_rgctx (cfg, cfg->current_method, context_used); + MonoJumpInfoRgctxEntry *entry = mono_patch_info_rgctx_entry_new (cfg->mempool, cfg->method, context_used & MONO_GENERIC_CONTEXT_USED_METHOD, MONO_PATCH_INFO_METHODCONST, cmethod, rgctx_type); + MonoInst *rgctx = emit_get_rgctx (cfg, cfg->method, context_used); return emit_rgctx_fetch (cfg, rgctx, entry); } @@ -3786,8 +3578,8 @@ static MonoInst* emit_get_rgctx_field (MonoCompile *cfg, int context_used, MonoClassField *field, MonoRgctxInfoType rgctx_type) { - MonoJumpInfoRgctxEntry *entry = mono_patch_info_rgctx_entry_new (cfg->mempool, cfg->current_method, context_used & MONO_GENERIC_CONTEXT_USED_METHOD, MONO_PATCH_INFO_FIELD, field, rgctx_type); - MonoInst *rgctx = emit_get_rgctx (cfg, cfg->current_method, context_used); + MonoJumpInfoRgctxEntry *entry = mono_patch_info_rgctx_entry_new (cfg->mempool, cfg->method, context_used & MONO_GENERIC_CONTEXT_USED_METHOD, MONO_PATCH_INFO_FIELD, field, rgctx_type); + MonoInst *rgctx = emit_get_rgctx (cfg, cfg->method, context_used); return emit_rgctx_fetch (cfg, rgctx, entry); } @@ -3866,7 +3658,7 @@ emit_class_init (MonoCompile *cfg, MonoClass *klass) context_used = mini_class_check_context_used (cfg, klass); if (context_used) { - vtable_arg = emit_get_rgctx_klass (cfg, context_used, + vtable_arg = mini_emit_get_rgctx_klass (cfg, context_used, klass, MONO_RGCTX_INFO_VTABLE); } else { MonoVTable *vtable = mono_class_vtable (cfg->domain, klass); @@ -3887,20 +3679,13 @@ emit_class_init (MonoCompile *cfg, MonoClass *klass) ins->sreg1 = vtable_arg->dreg; MONO_ADD_INS (cfg->cbb, ins); } else { - static int byte_offset = -1; - static guint8 bitmask; - int bits_reg, inited_reg; + int inited_reg; MonoBasicBlock *inited_bb; MonoInst *args [16]; - if (byte_offset < 0) - mono_marshal_find_bitfield_offset (MonoVTable, initialized, &byte_offset, &bitmask); - - bits_reg = alloc_ireg (cfg); inited_reg = alloc_ireg (cfg); - MONO_EMIT_NEW_LOAD_MEMBASE_OP (cfg, OP_LOADU1_MEMBASE, bits_reg, vtable_arg->dreg, byte_offset); - MONO_EMIT_NEW_BIALU_IMM (cfg, OP_IAND_IMM, inited_reg, bits_reg, bitmask); + MONO_EMIT_NEW_LOAD_MEMBASE_OP (cfg, OP_LOADU1_MEMBASE, inited_reg, vtable_arg->dreg, MONO_STRUCT_OFFSET (MonoVTable, initialized)); NEW_BBLOCK (cfg, inited_bb); @@ -3927,8 +3712,8 @@ emit_seq_point (MonoCompile *cfg, MonoMethod *method, guint8* ip, gboolean intr_ } } -static void -save_cast_details (MonoCompile *cfg, MonoClass *klass, int obj_reg, gboolean null_check) +void +mini_save_cast_details (MonoCompile *cfg, MonoClass *klass, int obj_reg, gboolean null_check) { if (mini_get_debug_options ()->better_cast_details) { int vtable_reg = alloc_preg (cfg); @@ -3944,13 +3729,12 @@ save_cast_details (MonoCompile *cfg, MonoClass *klass, int obj_reg, gboolean nul MONO_EMIT_NEW_BRANCH_BLOCK (cfg, OP_PBEQ, is_null_bb); } - tls_get = mono_get_jit_tls_intrinsic (cfg); + tls_get = mono_create_tls_get (cfg, TLS_KEY_JIT_TLS); if (!tls_get) { fprintf (stderr, "error: --debug=casts not supported on this platform.\n."); exit (1); } - MONO_ADD_INS (cfg->cbb, tls_get); MONO_EMIT_NEW_LOAD_MEMBASE (cfg, vtable_reg, obj_reg, MONO_STRUCT_OFFSET (MonoObject, vtable)); MONO_EMIT_NEW_LOAD_MEMBASE (cfg, klass_reg, vtable_reg, MONO_STRUCT_OFFSET (MonoVTable, klass)); @@ -3960,7 +3744,7 @@ save_cast_details (MonoCompile *cfg, MonoClass *klass, int obj_reg, gboolean nul if (context_used) { MonoInst *class_ins; - class_ins = emit_get_rgctx_klass (cfg, context_used, klass, MONO_RGCTX_INFO_KLASS); + class_ins = mini_emit_get_rgctx_klass (cfg, context_used, klass, MONO_RGCTX_INFO_KLASS); to_klass_reg = class_ins->dreg; } else { to_klass_reg = alloc_preg (cfg); @@ -3973,14 +3757,12 @@ save_cast_details (MonoCompile *cfg, MonoClass *klass, int obj_reg, gboolean nul } } -static void -reset_cast_details (MonoCompile *cfg) +void +mini_reset_cast_details (MonoCompile *cfg) { /* Reset the variables holding the cast details */ if (mini_get_debug_options ()->better_cast_details) { - MonoInst *tls_get = mono_get_jit_tls_intrinsic (cfg); - - MONO_ADD_INS (cfg->cbb, tls_get); + MonoInst *tls_get = mono_create_tls_get (cfg, TLS_KEY_JIT_TLS); /* It is enough to reset the from field */ MONO_EMIT_NEW_STORE_MEMBASE_IMM (cfg, OP_STORE_MEMBASE_IMM, tls_get->dreg, MONO_STRUCT_OFFSET (MonoJitTlsData, class_cast_from), 0); } @@ -3997,7 +3779,7 @@ mini_emit_check_array_type (MonoCompile *cfg, MonoInst *obj, MonoClass *array_cl context_used = mini_class_check_context_used (cfg, array_class); - save_cast_details (cfg, array_class, obj->dreg, FALSE); + mini_save_cast_details (cfg, array_class, obj->dreg, FALSE); MONO_EMIT_NEW_LOAD_MEMBASE_FAULT (cfg, vtable_reg, obj->dreg, MONO_STRUCT_OFFSET (MonoObject, vtable)); @@ -4011,7 +3793,7 @@ mini_emit_check_array_type (MonoCompile *cfg, MonoInst *obj, MonoClass *array_cl } else if (context_used) { MonoInst *vtable_ins; - vtable_ins = emit_get_rgctx_klass (cfg, context_used, array_class, MONO_RGCTX_INFO_VTABLE); + vtable_ins = mini_emit_get_rgctx_klass (cfg, context_used, array_class, MONO_RGCTX_INFO_VTABLE); MONO_EMIT_NEW_BIALU (cfg, OP_COMPARE, -1, vtable_reg, vtable_ins->dreg); } else { if (cfg->compile_aot) { @@ -4033,7 +3815,7 @@ mini_emit_check_array_type (MonoCompile *cfg, MonoInst *obj, MonoClass *array_cl MONO_EMIT_NEW_COND_EXC (cfg, NE_UN, "ArrayTypeMismatchException"); - reset_cast_details (cfg); + mini_reset_cast_details (cfg); } /** @@ -4057,7 +3839,7 @@ handle_unbox_nullable (MonoCompile* cfg, MonoInst* val, MonoClass* klass, int co cfg->signatures = g_slist_prepend_mempool (cfg->mempool, cfg->signatures, mono_method_signature (method)); return emit_llvmonly_calli (cfg, mono_method_signature (method), &val, addr); } else { - rgctx = emit_get_rgctx (cfg, cfg->current_method, context_used); + rgctx = emit_get_rgctx (cfg, cfg->method, context_used); return mono_emit_calli (cfg, mono_method_signature (method), &val, addr, NULL, rgctx); } @@ -4109,15 +3891,15 @@ handle_unbox (MonoCompile *cfg, MonoClass *klass, MonoInst **sp, int context_use /* This assertion is from the unboxcast insn */ g_assert (klass->rank == 0); - element_class = emit_get_rgctx_klass (cfg, context_used, + element_class = mini_emit_get_rgctx_klass (cfg, context_used, klass, MONO_RGCTX_INFO_ELEMENT_KLASS); MONO_EMIT_NEW_BIALU (cfg, OP_COMPARE, -1, eclass_reg, element_class->dreg); MONO_EMIT_NEW_COND_EXC (cfg, NE_UN, "InvalidCastException"); } else { - save_cast_details (cfg, klass->element_class, obj_reg, FALSE); + mini_save_cast_details (cfg, klass->element_class, obj_reg, FALSE); mini_emit_class_check (cfg, eclass_reg, klass->element_class); - reset_cast_details (cfg); + mini_reset_cast_details (cfg); } NEW_BIALU_IMM (cfg, add, OP_ADD_IMM, alloc_dreg (cfg, STACK_MP), obj_reg, sizeof (MonoObject)); @@ -4231,7 +4013,7 @@ handle_alloc (MonoCompile *cfg, MonoClass *klass, gboolean for_box, int context_ rgctx_info = MONO_RGCTX_INFO_KLASS; else rgctx_info = MONO_RGCTX_INFO_VTABLE; - data = emit_get_rgctx_klass (cfg, context_used, klass, rgctx_info); + data = mini_emit_get_rgctx_klass (cfg, context_used, klass, rgctx_info); if (cfg->opt & MONO_OPT_SHARED) { EMIT_NEW_DOMAINCONST (cfg, iargs [0]); @@ -4324,7 +4106,7 @@ handle_box (MonoCompile *cfg, MonoInst *val, MonoClass *klass, int context_used) have to get the method address from the RGCTX. */ MonoInst *addr = emit_get_rgctx_method (cfg, context_used, method, MONO_RGCTX_INFO_GENERIC_METHOD_CODE); - MonoInst *rgctx = emit_get_rgctx (cfg, cfg->current_method, context_used); + MonoInst *rgctx = emit_get_rgctx (cfg, cfg->method, context_used); return mono_emit_calli (cfg, mono_method_signature (method), &val, addr, NULL, rgctx); } @@ -4428,34 +4210,6 @@ handle_box (MonoCompile *cfg, MonoInst *val, MonoClass *klass, int context_used) } } -static gboolean -mini_class_has_reference_variant_generic_argument (MonoCompile *cfg, MonoClass *klass, int context_used) -{ - int i; - MonoGenericContainer *container; - MonoGenericInst *ginst; - - if (mono_class_is_ginst (klass)) { - container = mono_class_get_generic_container (mono_class_get_generic_class (klass)->container_class); - ginst = mono_class_get_generic_class (klass)->context.class_inst; - } else if (mono_class_is_gtd (klass) && context_used) { - container = mono_class_get_generic_container (klass); - ginst = container->context.class_inst; - } else { - return FALSE; - } - - for (i = 0; i < container->type_argc; ++i) { - MonoType *type; - if (!(mono_generic_container_get_param_info (container, i)->flags & (MONO_GEN_PARAM_VARIANT|MONO_GEN_PARAM_COVARIANT))) - continue; - type = ginst->type_argv [i]; - if (mini_type_is_reference (type)) - return TRUE; - } - return FALSE; -} - static GHashTable* direct_icall_type_hash; static gboolean @@ -4498,493 +4252,6 @@ method_needs_stack_walk (MonoCompile *cfg, MonoMethod *cmethod) return FALSE; } -#define is_complex_isinst(klass) (mono_class_is_interface (klass) || klass->rank || mono_class_is_nullable (klass) || mono_class_is_marshalbyref (klass) || mono_class_is_sealed (klass) || klass->byval_arg.type == MONO_TYPE_VAR || klass->byval_arg.type == MONO_TYPE_MVAR) - -static MonoInst* -emit_isinst_with_cache (MonoCompile *cfg, MonoClass *klass, MonoInst **args) -{ - MonoMethod *mono_isinst = mono_marshal_get_isinst_with_cache (); - return mono_emit_method_call (cfg, mono_isinst, args, NULL); -} - -static MonoInst* -emit_castclass_with_cache (MonoCompile *cfg, MonoClass *klass, MonoInst **args) -{ - MonoMethod *mono_castclass = mono_marshal_get_castclass_with_cache (); - MonoInst *res; - - save_cast_details (cfg, klass, args [0]->dreg, TRUE); - res = mono_emit_method_call (cfg, mono_castclass, args, NULL); - reset_cast_details (cfg); - - return res; -} - -static int -get_castclass_cache_idx (MonoCompile *cfg) -{ - /* Each CASTCLASS_CACHE patch needs a unique index which identifies the call site */ - cfg->castclass_cache_index ++; - return (cfg->method_index << 16) | cfg->castclass_cache_index; -} - - -static MonoInst* -emit_isinst_with_cache_nonshared (MonoCompile *cfg, MonoInst *obj, MonoClass *klass) -{ - MonoInst *args [3]; - int idx; - - args [0] = obj; /* obj */ - EMIT_NEW_CLASSCONST (cfg, args [1], klass); /* klass */ - - idx = get_castclass_cache_idx (cfg); /* inline cache*/ - args [2] = emit_runtime_constant (cfg, MONO_PATCH_INFO_CASTCLASS_CACHE, GINT_TO_POINTER (idx)); - - return emit_isinst_with_cache (cfg, klass, args); -} - -static MonoInst* -emit_castclass_with_cache_nonshared (MonoCompile *cfg, MonoInst *obj, MonoClass *klass) -{ - MonoInst *args [3]; - int idx; - - /* obj */ - args [0] = obj; - - /* klass */ - EMIT_NEW_CLASSCONST (cfg, args [1], klass); - - /* inline cache*/ - idx = get_castclass_cache_idx (cfg); - args [2] = emit_runtime_constant (cfg, MONO_PATCH_INFO_CASTCLASS_CACHE, GINT_TO_POINTER (idx)); - - /*The wrapper doesn't inline well so the bloat of inlining doesn't pay off.*/ - return emit_castclass_with_cache (cfg, klass, args); -} - -/* - * Returns NULL and set the cfg exception on error. - */ -static MonoInst* -handle_castclass (MonoCompile *cfg, MonoClass *klass, MonoInst *src, int context_used) -{ - MonoBasicBlock *is_null_bb; - int obj_reg = src->dreg; - int vtable_reg = alloc_preg (cfg); - MonoInst *klass_inst = NULL; - - if (MONO_INS_IS_PCONST_NULL (src)) - return src; - - if (context_used) { - MonoInst *args [3]; - - if (mini_class_has_reference_variant_generic_argument (cfg, klass, context_used) || is_complex_isinst (klass)) { - MonoInst *cache_ins; - - cache_ins = emit_get_rgctx_klass (cfg, context_used, klass, MONO_RGCTX_INFO_CAST_CACHE); - - /* obj */ - args [0] = src; - - /* klass - it's the second element of the cache entry*/ - EMIT_NEW_LOAD_MEMBASE (cfg, args [1], OP_LOAD_MEMBASE, alloc_preg (cfg), cache_ins->dreg, sizeof (gpointer)); - - /* cache */ - args [2] = cache_ins; - - return emit_castclass_with_cache (cfg, klass, args); - } - - klass_inst = emit_get_rgctx_klass (cfg, context_used, klass, MONO_RGCTX_INFO_KLASS); - } - - NEW_BBLOCK (cfg, is_null_bb); - - MONO_EMIT_NEW_BIALU_IMM (cfg, OP_COMPARE_IMM, -1, obj_reg, 0); - MONO_EMIT_NEW_BRANCH_BLOCK (cfg, OP_PBEQ, is_null_bb); - - save_cast_details (cfg, klass, obj_reg, FALSE); - - if (mono_class_is_interface (klass)) { - MONO_EMIT_NEW_LOAD_MEMBASE (cfg, vtable_reg, obj_reg, MONO_STRUCT_OFFSET (MonoObject, vtable)); - mini_emit_iface_cast (cfg, vtable_reg, klass, NULL, NULL); - } else { - int klass_reg = alloc_preg (cfg); - - MONO_EMIT_NEW_LOAD_MEMBASE (cfg, vtable_reg, obj_reg, MONO_STRUCT_OFFSET (MonoObject, vtable)); - - if (!klass->rank && !cfg->compile_aot && !(cfg->opt & MONO_OPT_SHARED) && mono_class_is_sealed (klass)) { - /* the remoting code is broken, access the class for now */ - if (0) { /*FIXME what exactly is broken? This change refers to r39380 from 2005 and mention some remoting fixes were due.*/ - MonoVTable *vt = mono_class_vtable (cfg->domain, klass); - if (!vt) { - mono_cfg_set_exception (cfg, MONO_EXCEPTION_TYPE_LOAD); - cfg->exception_ptr = klass; - return NULL; - } - MONO_EMIT_NEW_BIALU_IMM (cfg, OP_COMPARE_IMM, -1, vtable_reg, vt); - } else { - MONO_EMIT_NEW_LOAD_MEMBASE (cfg, klass_reg, vtable_reg, MONO_STRUCT_OFFSET (MonoVTable, klass)); - MONO_EMIT_NEW_BIALU_IMM (cfg, OP_COMPARE_IMM, -1, klass_reg, klass); - } - MONO_EMIT_NEW_COND_EXC (cfg, NE_UN, "InvalidCastException"); - } else { - MONO_EMIT_NEW_LOAD_MEMBASE (cfg, klass_reg, vtable_reg, MONO_STRUCT_OFFSET (MonoVTable, klass)); - mini_emit_castclass_inst (cfg, obj_reg, klass_reg, klass, klass_inst, is_null_bb); - } - } - - MONO_START_BB (cfg, is_null_bb); - - reset_cast_details (cfg); - - return src; -} - -/* - * Returns NULL and set the cfg exception on error. - */ -static MonoInst* -handle_isinst (MonoCompile *cfg, MonoClass *klass, MonoInst *src, int context_used) -{ - MonoInst *ins; - MonoBasicBlock *is_null_bb, *false_bb, *end_bb; - int obj_reg = src->dreg; - int vtable_reg = alloc_preg (cfg); - int res_reg = alloc_ireg_ref (cfg); - MonoInst *klass_inst = NULL; - - if (context_used) { - MonoInst *args [3]; - - if(mini_class_has_reference_variant_generic_argument (cfg, klass, context_used) || is_complex_isinst (klass)) { - MonoInst *cache_ins = emit_get_rgctx_klass (cfg, context_used, klass, MONO_RGCTX_INFO_CAST_CACHE); - - args [0] = src; /* obj */ - - /* klass - it's the second element of the cache entry*/ - EMIT_NEW_LOAD_MEMBASE (cfg, args [1], OP_LOAD_MEMBASE, alloc_preg (cfg), cache_ins->dreg, sizeof (gpointer)); - - args [2] = cache_ins; /* cache */ - return emit_isinst_with_cache (cfg, klass, args); - } - - klass_inst = emit_get_rgctx_klass (cfg, context_used, klass, MONO_RGCTX_INFO_KLASS); - } - - NEW_BBLOCK (cfg, is_null_bb); - NEW_BBLOCK (cfg, false_bb); - NEW_BBLOCK (cfg, end_bb); - - /* Do the assignment at the beginning, so the other assignment can be if converted */ - EMIT_NEW_UNALU (cfg, ins, OP_MOVE, res_reg, obj_reg); - ins->type = STACK_OBJ; - ins->klass = klass; - - MONO_EMIT_NEW_BIALU_IMM (cfg, OP_COMPARE_IMM, -1, obj_reg, 0); - MONO_EMIT_NEW_BRANCH_BLOCK (cfg, OP_IBEQ, is_null_bb); - - MONO_EMIT_NEW_LOAD_MEMBASE (cfg, vtable_reg, obj_reg, MONO_STRUCT_OFFSET (MonoObject, vtable)); - - if (mono_class_is_interface (klass)) { - g_assert (!context_used); - /* the is_null_bb target simply copies the input register to the output */ - mini_emit_iface_cast (cfg, vtable_reg, klass, false_bb, is_null_bb); - } else { - int klass_reg = alloc_preg (cfg); - - if (klass->rank) { - int rank_reg = alloc_preg (cfg); - int eclass_reg = alloc_preg (cfg); - - g_assert (!context_used); - MONO_EMIT_NEW_LOAD_MEMBASE_OP (cfg, OP_LOADU1_MEMBASE, rank_reg, vtable_reg, MONO_STRUCT_OFFSET (MonoVTable, rank)); - MONO_EMIT_NEW_BIALU_IMM (cfg, OP_COMPARE_IMM, -1, rank_reg, klass->rank); - MONO_EMIT_NEW_BRANCH_BLOCK (cfg, OP_PBNE_UN, false_bb); - MONO_EMIT_NEW_LOAD_MEMBASE (cfg, klass_reg, vtable_reg, MONO_STRUCT_OFFSET (MonoVTable, klass)); - MONO_EMIT_NEW_LOAD_MEMBASE (cfg, eclass_reg, klass_reg, MONO_STRUCT_OFFSET (MonoClass, cast_class)); - if (klass->cast_class == mono_defaults.object_class) { - int parent_reg = alloc_preg (cfg); - MONO_EMIT_NEW_LOAD_MEMBASE (cfg, parent_reg, eclass_reg, MONO_STRUCT_OFFSET (MonoClass, parent)); - mini_emit_class_check_branch (cfg, parent_reg, mono_defaults.enum_class->parent, OP_PBNE_UN, is_null_bb); - mini_emit_class_check_branch (cfg, eclass_reg, mono_defaults.enum_class, OP_PBEQ, is_null_bb); - MONO_EMIT_NEW_BRANCH_BLOCK (cfg, OP_BR, false_bb); - } else if (klass->cast_class == mono_defaults.enum_class->parent) { - mini_emit_class_check_branch (cfg, eclass_reg, mono_defaults.enum_class->parent, OP_PBEQ, is_null_bb); - mini_emit_class_check_branch (cfg, eclass_reg, mono_defaults.enum_class, OP_PBEQ, is_null_bb); - MONO_EMIT_NEW_BRANCH_BLOCK (cfg, OP_BR, false_bb); - } else if (klass->cast_class == mono_defaults.enum_class) { - mini_emit_class_check_branch (cfg, eclass_reg, mono_defaults.enum_class, OP_PBEQ, is_null_bb); - MONO_EMIT_NEW_BRANCH_BLOCK (cfg, OP_BR, false_bb); - } else if (mono_class_is_interface (klass->cast_class)) { - mini_emit_iface_class_cast (cfg, eclass_reg, klass->cast_class, false_bb, is_null_bb); - } else { - if ((klass->rank == 1) && (klass->byval_arg.type == MONO_TYPE_SZARRAY)) { - /* Check that the object is a vector too */ - int bounds_reg = alloc_preg (cfg); - MONO_EMIT_NEW_LOAD_MEMBASE (cfg, bounds_reg, obj_reg, MONO_STRUCT_OFFSET (MonoArray, bounds)); - MONO_EMIT_NEW_BIALU_IMM (cfg, OP_COMPARE_IMM, -1, bounds_reg, 0); - MONO_EMIT_NEW_BRANCH_BLOCK (cfg, OP_PBNE_UN, false_bb); - } - - /* the is_null_bb target simply copies the input register to the output */ - mini_emit_isninst_cast (cfg, eclass_reg, klass->cast_class, false_bb, is_null_bb); - } - } else if (mono_class_is_nullable (klass)) { - g_assert (!context_used); - MONO_EMIT_NEW_LOAD_MEMBASE (cfg, klass_reg, vtable_reg, MONO_STRUCT_OFFSET (MonoVTable, klass)); - /* the is_null_bb target simply copies the input register to the output */ - mini_emit_isninst_cast (cfg, klass_reg, klass->cast_class, false_bb, is_null_bb); - } else { - if (!cfg->compile_aot && !(cfg->opt & MONO_OPT_SHARED) && mono_class_is_sealed (klass)) { - g_assert (!context_used); - /* the remoting code is broken, access the class for now */ - if (0) {/*FIXME what exactly is broken? This change refers to r39380 from 2005 and mention some remoting fixes were due.*/ - MonoVTable *vt = mono_class_vtable (cfg->domain, klass); - if (!vt) { - mono_cfg_set_exception (cfg, MONO_EXCEPTION_TYPE_LOAD); - cfg->exception_ptr = klass; - return NULL; - } - MONO_EMIT_NEW_BIALU_IMM (cfg, OP_COMPARE_IMM, -1, vtable_reg, vt); - } else { - MONO_EMIT_NEW_LOAD_MEMBASE (cfg, klass_reg, vtable_reg, MONO_STRUCT_OFFSET (MonoVTable, klass)); - MONO_EMIT_NEW_BIALU_IMM (cfg, OP_COMPARE_IMM, -1, klass_reg, klass); - } - MONO_EMIT_NEW_BRANCH_BLOCK (cfg, OP_PBNE_UN, false_bb); - MONO_EMIT_NEW_BRANCH_BLOCK (cfg, OP_BR, is_null_bb); - } else { - MONO_EMIT_NEW_LOAD_MEMBASE (cfg, klass_reg, vtable_reg, MONO_STRUCT_OFFSET (MonoVTable, klass)); - /* the is_null_bb target simply copies the input register to the output */ - mini_emit_isninst_cast_inst (cfg, klass_reg, klass, klass_inst, false_bb, is_null_bb); - } - } - } - - MONO_START_BB (cfg, false_bb); - - MONO_EMIT_NEW_PCONST (cfg, res_reg, 0); - MONO_EMIT_NEW_BRANCH_BLOCK (cfg, OP_BR, end_bb); - - MONO_START_BB (cfg, is_null_bb); - - MONO_START_BB (cfg, end_bb); - - return ins; -} - -static MonoInst* -handle_cisinst (MonoCompile *cfg, MonoClass *klass, MonoInst *src) -{ - /* This opcode takes as input an object reference and a class, and returns: - 0) if the object is an instance of the class, - 1) if the object is not instance of the class, - 2) if the object is a proxy whose type cannot be determined */ - - MonoInst *ins; -#ifndef DISABLE_REMOTING - MonoBasicBlock *true_bb, *false_bb, *false2_bb, *end_bb, *no_proxy_bb, *interface_fail_bb; -#else - MonoBasicBlock *true_bb, *false_bb, *end_bb; -#endif - int obj_reg = src->dreg; - int dreg = alloc_ireg (cfg); - int tmp_reg; -#ifndef DISABLE_REMOTING - int klass_reg = alloc_preg (cfg); -#endif - - NEW_BBLOCK (cfg, true_bb); - NEW_BBLOCK (cfg, false_bb); - NEW_BBLOCK (cfg, end_bb); -#ifndef DISABLE_REMOTING - NEW_BBLOCK (cfg, false2_bb); - NEW_BBLOCK (cfg, no_proxy_bb); -#endif - - MONO_EMIT_NEW_BIALU_IMM (cfg, OP_COMPARE_IMM, -1, obj_reg, 0); - MONO_EMIT_NEW_BRANCH_BLOCK (cfg, OP_PBEQ, false_bb); - - if (mono_class_is_interface (klass)) { -#ifndef DISABLE_REMOTING - NEW_BBLOCK (cfg, interface_fail_bb); -#endif - - tmp_reg = alloc_preg (cfg); - MONO_EMIT_NEW_LOAD_MEMBASE (cfg, tmp_reg, obj_reg, MONO_STRUCT_OFFSET (MonoObject, vtable)); -#ifndef DISABLE_REMOTING - mini_emit_iface_cast (cfg, tmp_reg, klass, interface_fail_bb, true_bb); - MONO_START_BB (cfg, interface_fail_bb); - MONO_EMIT_NEW_LOAD_MEMBASE (cfg, klass_reg, tmp_reg, MONO_STRUCT_OFFSET (MonoVTable, klass)); - - mini_emit_class_check_branch (cfg, klass_reg, mono_defaults.transparent_proxy_class, OP_PBNE_UN, false_bb); - - tmp_reg = alloc_preg (cfg); - MONO_EMIT_NEW_LOAD_MEMBASE (cfg, tmp_reg, obj_reg, MONO_STRUCT_OFFSET (MonoTransparentProxy, custom_type_info)); - MONO_EMIT_NEW_BIALU_IMM (cfg, OP_COMPARE_IMM, -1, tmp_reg, 0); - MONO_EMIT_NEW_BRANCH_BLOCK (cfg, OP_PBNE_UN, false2_bb); -#else - mini_emit_iface_cast (cfg, tmp_reg, klass, false_bb, true_bb); -#endif - } else { -#ifndef DISABLE_REMOTING - tmp_reg = alloc_preg (cfg); - MONO_EMIT_NEW_LOAD_MEMBASE (cfg, tmp_reg, obj_reg, MONO_STRUCT_OFFSET (MonoObject, vtable)); - MONO_EMIT_NEW_LOAD_MEMBASE (cfg, klass_reg, tmp_reg, MONO_STRUCT_OFFSET (MonoVTable, klass)); - - mini_emit_class_check_branch (cfg, klass_reg, mono_defaults.transparent_proxy_class, OP_PBNE_UN, no_proxy_bb); - tmp_reg = alloc_preg (cfg); - MONO_EMIT_NEW_LOAD_MEMBASE (cfg, tmp_reg, obj_reg, MONO_STRUCT_OFFSET (MonoTransparentProxy, remote_class)); - MONO_EMIT_NEW_LOAD_MEMBASE (cfg, klass_reg, tmp_reg, MONO_STRUCT_OFFSET (MonoRemoteClass, proxy_class)); - - tmp_reg = alloc_preg (cfg); - MONO_EMIT_NEW_LOAD_MEMBASE (cfg, tmp_reg, obj_reg, MONO_STRUCT_OFFSET (MonoTransparentProxy, custom_type_info)); - MONO_EMIT_NEW_BIALU_IMM (cfg, OP_COMPARE_IMM, -1, tmp_reg, 0); - MONO_EMIT_NEW_BRANCH_BLOCK (cfg, OP_PBEQ, no_proxy_bb); - - mini_emit_isninst_cast (cfg, klass_reg, klass, false2_bb, true_bb); - MONO_EMIT_NEW_BRANCH_BLOCK (cfg, OP_BR, false2_bb); - - MONO_START_BB (cfg, no_proxy_bb); - - mini_emit_isninst_cast (cfg, klass_reg, klass, false_bb, true_bb); -#else - g_error ("transparent proxy support is disabled while trying to JIT code that uses it"); -#endif - } - - MONO_START_BB (cfg, false_bb); - - MONO_EMIT_NEW_ICONST (cfg, dreg, 1); - MONO_EMIT_NEW_BRANCH_BLOCK (cfg, OP_BR, end_bb); - -#ifndef DISABLE_REMOTING - MONO_START_BB (cfg, false2_bb); - - MONO_EMIT_NEW_ICONST (cfg, dreg, 2); - MONO_EMIT_NEW_BRANCH_BLOCK (cfg, OP_BR, end_bb); -#endif - - MONO_START_BB (cfg, true_bb); - - MONO_EMIT_NEW_ICONST (cfg, dreg, 0); - - MONO_START_BB (cfg, end_bb); - - /* FIXME: */ - MONO_INST_NEW (cfg, ins, OP_ICONST); - ins->dreg = dreg; - ins->type = STACK_I4; - - return ins; -} - -static MonoInst* -handle_ccastclass (MonoCompile *cfg, MonoClass *klass, MonoInst *src) -{ - /* This opcode takes as input an object reference and a class, and returns: - 0) if the object is an instance of the class, - 1) if the object is a proxy whose type cannot be determined - an InvalidCastException exception is thrown otherwhise*/ - - MonoInst *ins; -#ifndef DISABLE_REMOTING - MonoBasicBlock *end_bb, *ok_result_bb, *no_proxy_bb, *interface_fail_bb, *fail_1_bb; -#else - MonoBasicBlock *ok_result_bb; -#endif - int obj_reg = src->dreg; - int dreg = alloc_ireg (cfg); - int tmp_reg = alloc_preg (cfg); - -#ifndef DISABLE_REMOTING - int klass_reg = alloc_preg (cfg); - NEW_BBLOCK (cfg, end_bb); -#endif - - NEW_BBLOCK (cfg, ok_result_bb); - - MONO_EMIT_NEW_BIALU_IMM (cfg, OP_COMPARE_IMM, -1, obj_reg, 0); - MONO_EMIT_NEW_BRANCH_BLOCK (cfg, OP_PBEQ, ok_result_bb); - - save_cast_details (cfg, klass, obj_reg, FALSE); - - if (mono_class_is_interface (klass)) { -#ifndef DISABLE_REMOTING - NEW_BBLOCK (cfg, interface_fail_bb); - - MONO_EMIT_NEW_LOAD_MEMBASE (cfg, tmp_reg, obj_reg, MONO_STRUCT_OFFSET (MonoObject, vtable)); - mini_emit_iface_cast (cfg, tmp_reg, klass, interface_fail_bb, ok_result_bb); - MONO_START_BB (cfg, interface_fail_bb); - MONO_EMIT_NEW_LOAD_MEMBASE (cfg, klass_reg, tmp_reg, MONO_STRUCT_OFFSET (MonoVTable, klass)); - - mini_emit_class_check (cfg, klass_reg, mono_defaults.transparent_proxy_class); - - tmp_reg = alloc_preg (cfg); - MONO_EMIT_NEW_LOAD_MEMBASE (cfg, tmp_reg, obj_reg, MONO_STRUCT_OFFSET (MonoTransparentProxy, custom_type_info)); - MONO_EMIT_NEW_BIALU_IMM (cfg, OP_COMPARE_IMM, -1, tmp_reg, 0); - MONO_EMIT_NEW_COND_EXC (cfg, EQ, "InvalidCastException"); - - MONO_EMIT_NEW_ICONST (cfg, dreg, 1); - MONO_EMIT_NEW_BRANCH_BLOCK (cfg, OP_BR, end_bb); -#else - MONO_EMIT_NEW_LOAD_MEMBASE (cfg, tmp_reg, obj_reg, MONO_STRUCT_OFFSET (MonoObject, vtable)); - mini_emit_iface_cast (cfg, tmp_reg, klass, NULL, NULL); - MONO_EMIT_NEW_BRANCH_BLOCK (cfg, OP_BR, ok_result_bb); -#endif - } else { -#ifndef DISABLE_REMOTING - NEW_BBLOCK (cfg, no_proxy_bb); - - MONO_EMIT_NEW_LOAD_MEMBASE (cfg, tmp_reg, obj_reg, MONO_STRUCT_OFFSET (MonoObject, vtable)); - MONO_EMIT_NEW_LOAD_MEMBASE (cfg, klass_reg, tmp_reg, MONO_STRUCT_OFFSET (MonoVTable, klass)); - mini_emit_class_check_branch (cfg, klass_reg, mono_defaults.transparent_proxy_class, OP_PBNE_UN, no_proxy_bb); - - tmp_reg = alloc_preg (cfg); - MONO_EMIT_NEW_LOAD_MEMBASE (cfg, tmp_reg, obj_reg, MONO_STRUCT_OFFSET (MonoTransparentProxy, remote_class)); - MONO_EMIT_NEW_LOAD_MEMBASE (cfg, klass_reg, tmp_reg, MONO_STRUCT_OFFSET (MonoRemoteClass, proxy_class)); - - tmp_reg = alloc_preg (cfg); - MONO_EMIT_NEW_LOAD_MEMBASE (cfg, tmp_reg, obj_reg, MONO_STRUCT_OFFSET (MonoTransparentProxy, custom_type_info)); - MONO_EMIT_NEW_BIALU_IMM (cfg, OP_COMPARE_IMM, -1, tmp_reg, 0); - MONO_EMIT_NEW_BRANCH_BLOCK (cfg, OP_PBEQ, no_proxy_bb); - - NEW_BBLOCK (cfg, fail_1_bb); - - mini_emit_isninst_cast (cfg, klass_reg, klass, fail_1_bb, ok_result_bb); - - MONO_START_BB (cfg, fail_1_bb); - - MONO_EMIT_NEW_ICONST (cfg, dreg, 1); - MONO_EMIT_NEW_BRANCH_BLOCK (cfg, OP_BR, end_bb); - - MONO_START_BB (cfg, no_proxy_bb); - - mini_emit_castclass (cfg, obj_reg, klass_reg, klass, ok_result_bb); -#else - g_error ("Transparent proxy support is disabled while trying to JIT code that uses it"); -#endif - } - - MONO_START_BB (cfg, ok_result_bb); - - MONO_EMIT_NEW_ICONST (cfg, dreg, 0); - -#ifndef DISABLE_REMOTING - MONO_START_BB (cfg, end_bb); -#endif - - /* FIXME: */ - MONO_INST_NEW (cfg, ins, OP_ICONST); - ins->dreg = dreg; - ins->type = STACK_I4; - - return ins; -} - static G_GNUC_UNUSED MonoInst* handle_enum_has_flag (MonoCompile *cfg, MonoClass *klass, MonoInst *enum_this, MonoInst *enum_flag) { @@ -5207,7 +4474,7 @@ handle_constrained_gsharedvt_call (MonoCompile *cfg, MonoMethod *cmethod, MonoMe args [1] = emit_get_rgctx_method (cfg, mono_method_check_context_used (cmethod), cmethod, MONO_RGCTX_INFO_METHOD); else EMIT_NEW_METHODCONST (cfg, args [1], cmethod); - args [2] = emit_get_rgctx_klass (cfg, mono_class_check_context_used (constrained_class), constrained_class, MONO_RGCTX_INFO_KLASS); + args [2] = mini_emit_get_rgctx_klass (cfg, mono_class_check_context_used (constrained_class), constrained_class, MONO_RGCTX_INFO_KLASS); /* !fsig->hasthis is for the wrapper for the Object.GetType () icall */ if (fsig->hasthis && fsig->param_count) { @@ -5315,7 +4582,7 @@ mono_method_check_inlining (MonoCompile *cfg, MonoMethod *method) if (cfg->disable_inline) return FALSE; - if (cfg->gshared) + if (cfg->gsharedvt) return FALSE; if (cfg->inline_depth > 10) @@ -5349,17 +4616,22 @@ mono_method_check_inlining (MonoCompile *cfg, MonoMethod *method) * since it would mean inserting a call to mono_runtime_class_init() * inside the inlined code */ + if (cfg->gshared && method->klass->has_cctor && mini_class_check_context_used (cfg, method->klass)) + return FALSE; + if (!(cfg->opt & MONO_OPT_SHARED)) { /* The AggressiveInlining hint is a good excuse to force that cctor to run. */ if (method->iflags & METHOD_IMPL_ATTRIBUTE_AGGRESSIVE_INLINING) { - vtable = mono_class_vtable (cfg->domain, method->klass); - if (!vtable) - return FALSE; - if (!cfg->compile_aot) { - MonoError error; - if (!mono_runtime_class_init_full (vtable, &error)) { - mono_error_cleanup (&error); + if (method->klass->has_cctor) { + vtable = mono_class_vtable (cfg->domain, method->klass); + if (!vtable) return FALSE; + if (!cfg->compile_aot) { + MonoError error; + if (!mono_runtime_class_init_full (vtable, &error)) { + mono_error_cleanup (&error); + return FALSE; + } } } } else if (mono_class_is_before_field_init (method->klass)) { @@ -6149,7 +5421,7 @@ mini_emit_inst_for_method (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSign ins = mono_emit_jit_icall (cfg, is_v4 ? (gpointer)mono_monitor_enter_v4_fast : (gpointer)mono_monitor_enter_fast, args); MONO_EMIT_NEW_BIALU_IMM (cfg, OP_ICOMPARE_IMM, -1, ins->dreg, 0); MONO_EMIT_NEW_BRANCH_BLOCK (cfg, OP_IBNE_UN, end_bb); - ins = mono_emit_jit_icall (cfg, is_v4 ? (gpointer)mono_monitor_enter_v4 : (gpointer)mono_monitor_enter, args); + ins = mono_emit_jit_icall (cfg, is_v4 ? (gpointer)mono_monitor_enter_v4_internal : (gpointer)mono_monitor_enter_internal, args); MONO_START_BB (cfg, end_bb); return ins; } @@ -7083,6 +6355,12 @@ emit_init_local (MonoCompile *cfg, int local, MonoType *type, gboolean init) } } +int +mini_inline_method (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSignature *fsig, MonoInst **sp, guchar *ip, guint real_offset, gboolean inline_always) +{ + return inline_method (cfg, cmethod, fsig, sp, ip, real_offset, inline_always); +} + /* * inline_method: * @@ -7214,7 +6492,7 @@ inline_method (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSignature *fsig, if ((costs >= 0 && costs < 60) || inline_always || (costs >= 0 && (cmethod->iflags & METHOD_IMPL_ATTRIBUTE_AGGRESSIVE_INLINING))) { if (cfg->verbose_level > 2) printf ("INLINE END %s -> %s\n", mono_method_full_name (cfg->method, TRUE), mono_method_full_name (cmethod, TRUE)); - + cfg->stat_inlined_methods++; /* always add some code to avoid block split failures */ @@ -8052,7 +7330,7 @@ handle_ctor_call (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSignature *fs cmethod, MONO_RGCTX_INFO_METHOD_RGCTX); } else { if (context_used) { - vtable_arg = emit_get_rgctx_klass (cfg, context_used, + vtable_arg = mini_emit_get_rgctx_klass (cfg, context_used, cmethod->klass, MONO_RGCTX_INFO_VTABLE); } else { MonoVTable *vtable = mono_class_vtable (cfg->domain, cmethod->klass); @@ -9598,7 +8876,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b if (pass_vtable) { if (context_used) { - vtable_arg = emit_get_rgctx_klass (cfg, context_used, cmethod->klass, MONO_RGCTX_INFO_VTABLE); + vtable_arg = mini_emit_get_rgctx_klass (cfg, context_used, cmethod->klass, MONO_RGCTX_INFO_VTABLE); } else { MonoVTable *vtable = mono_class_vtable (cfg->domain, cmethod->klass); @@ -11570,7 +10848,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b is_special_static = mono_class_field_is_special_static (field); if (is_special_static && ((gsize)addr & 0x80000000) == 0) - thread_ins = mono_get_thread_intrinsic (cfg); + thread_ins = mono_create_tls_get (cfg, TLS_KEY_THREAD); else thread_ins = NULL; @@ -11586,7 +10864,6 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b GSHAREDVT_FAILURE (op); - MONO_ADD_INS (cfg->cbb, thread_ins); static_data_reg = alloc_ireg (cfg); MONO_EMIT_NEW_LOAD_MEMBASE (cfg, static_data_reg, thread_ins->dreg, MONO_STRUCT_OFFSET (MonoInternalThread, static_data)); @@ -11648,7 +10925,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b * * super_info.static_data + field->offset */ - static_data = emit_get_rgctx_klass (cfg, context_used, + static_data = mini_emit_get_rgctx_klass (cfg, context_used, klass, MONO_RGCTX_INFO_STATIC_DATA); if (mini_is_gsharedvt_klass (klass)) { @@ -11899,7 +11176,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b /* FIXME: Use OP_NEWARR and decompose later to help abcrem */ /* vtable */ - args [0] = emit_get_rgctx_klass (cfg, context_used, + args [0] = mini_emit_get_rgctx_klass (cfg, context_used, array_class, MONO_RGCTX_INFO_VTABLE); /* array len */ args [1] = sp [0]; @@ -12155,7 +11432,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b if (context_used) { MonoInst *klass_ins; - klass_ins = emit_get_rgctx_klass (cfg, context_used, + klass_ins = mini_emit_get_rgctx_klass (cfg, context_used, klass, MONO_RGCTX_INFO_KLASS); // FIXME: @@ -12192,7 +11469,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b MonoInst *const_ins; int type_reg = alloc_preg (cfg); - const_ins = emit_get_rgctx_klass (cfg, context_used, klass, MONO_RGCTX_INFO_KLASS); + const_ins = mini_emit_get_rgctx_klass (cfg, context_used, klass, MONO_RGCTX_INFO_KLASS); MONO_EMIT_NEW_STORE_MEMBASE (cfg, OP_STOREP_MEMBASE_REG, addr->dreg, MONO_STRUCT_OFFSET (MonoTypedRef, klass), const_ins->dreg); MONO_EMIT_NEW_BIALU_IMM (cfg, OP_ADD_IMM, type_reg, const_ins->dreg, MONO_STRUCT_OFFSET (MonoClass, byval_arg)); MONO_EMIT_NEW_STORE_MEMBASE (cfg, OP_STOREP_MEMBASE_REG, addr->dreg, MONO_STRUCT_OFFSET (MonoTypedRef, type), type_reg); @@ -12289,7 +11566,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b mono_class_init (tclass); if (context_used) { - ins = emit_get_rgctx_klass (cfg, context_used, + ins = mini_emit_get_rgctx_klass (cfg, context_used, tclass, MONO_RGCTX_INFO_REFLECTION_TYPE); } else if (cfg->compile_aot) { if (method->wrapper_type) { @@ -12321,7 +11598,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b if (context_used) { if (handle_class == mono_defaults.typehandle_class) { - ins = emit_get_rgctx_klass (cfg, context_used, + ins = mini_emit_get_rgctx_klass (cfg, context_used, mono_class_from_mono_type ((MonoType *)handle), MONO_RGCTX_INFO_TYPE); } else if (handle_class == mono_defaults.methodhandle_class) { @@ -12724,22 +12001,6 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b ip += 6; break; } - case CEE_MONO_CISINST: - case CEE_MONO_CCASTCLASS: { - int token; - CHECK_STACK (1); - --sp; - CHECK_OPSIZE (6); - token = read32 (ip + 2); - klass = (MonoClass *)mono_method_get_wrapper_data (method, token); - if (ip [1] == CEE_MONO_CISINST) - ins = handle_cisinst (cfg, klass, sp [0]); - else - ins = handle_ccastclass (cfg, klass, sp [0]); - *sp++ = ins; - ip += 6; - break; - } case CEE_MONO_SAVE_LMF: case CEE_MONO_RESTORE_LMF: ip += 2; @@ -12766,18 +12027,8 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b g_assert (key < TLS_KEY_NUM); ins = mono_create_tls_get (cfg, key); - if (!ins) { - if (cfg->compile_aot) { - DISABLE_AOT (cfg); - MONO_INST_NEW (cfg, ins, OP_TLS_GET); - ins->dreg = alloc_preg (cfg); - ins->type = STACK_PTR; - } else { - g_assert_not_reached (); - } - } + g_assert (ins); ins->type = STACK_PTR; - MONO_ADD_INS (cfg->cbb, ins); *sp++ = ins; ip += 6; break; @@ -12845,10 +12096,10 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b EMIT_NEW_PCONST (cfg, ins, NULL); MONO_EMIT_NEW_UNALU (cfg, OP_MOVE, cfg->orig_domain_var->dreg, ins->dreg); - ad_ins = mono_get_domain_intrinsic (cfg); - jit_tls_ins = mono_get_jit_tls_intrinsic (cfg); + ad_ins = mono_create_tls_get (cfg, TLS_KEY_DOMAIN); + jit_tls_ins = mono_create_tls_get (cfg, TLS_KEY_JIT_TLS); - if (cfg->backend->have_tls_get && ad_ins && jit_tls_ins) { + if (ad_ins && jit_tls_ins) { NEW_BBLOCK (cfg, next_bb); NEW_BBLOCK (cfg, call_bb); @@ -12858,11 +12109,9 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b } else { EMIT_NEW_PCONST (cfg, domain_ins, cfg->domain); } - MONO_ADD_INS (cfg->cbb, ad_ins); MONO_EMIT_NEW_BIALU (cfg, OP_COMPARE, -1, ad_ins->dreg, domain_ins->dreg); MONO_EMIT_NEW_BRANCH_BLOCK (cfg, OP_PBNE_UN, call_bb); - MONO_ADD_INS (cfg->cbb, jit_tls_ins); MONO_EMIT_NEW_BIALU_IMM (cfg, OP_COMPARE_IMM, -1, jit_tls_ins->dreg, 0); MONO_EMIT_NEW_BRANCH_BLOCK (cfg, OP_PBEQ, call_bb); @@ -12872,13 +12121,24 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b /* AOT code is only used in the root domain */ EMIT_NEW_PCONST (cfg, args [0], cfg->compile_aot ? NULL : cfg->domain); - ins = mono_emit_jit_icall (cfg, mono_jit_thread_attach, args); + if (cfg->compile_aot) { + MonoInst *addr; + + /* + * This is called on unattached threads, so it cannot go through the trampoline + * infrastructure. Use an indirect call through a got slot initialized at load time + * instead. + */ + EMIT_NEW_AOTCONST (cfg, addr, MONO_PATCH_INFO_JIT_THREAD_ATTACH, NULL); + ins = mono_emit_calli (cfg, helper_sig_jit_thread_attach, args, addr, NULL, NULL); + } else { + ins = mono_emit_jit_icall (cfg, mono_jit_thread_attach, args); + } MONO_EMIT_NEW_UNALU (cfg, OP_MOVE, cfg->orig_domain_var->dreg, ins->dreg); if (next_bb) MONO_START_BB (cfg, next_bb); - ip += 2; break; } @@ -13650,11 +12910,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b cfg->cbb = init_localsbb; - if ((get_domain = mono_get_domain_intrinsic (cfg))) { - MONO_ADD_INS (cfg->cbb, get_domain); - } else { - get_domain = mono_emit_jit_icall (cfg, mono_domain_get, NULL); - } + get_domain = mono_create_tls_get (cfg, TLS_KEY_DOMAIN); NEW_TEMPSTORE (cfg, store, cfg->domainvar->inst_c0, get_domain); MONO_ADD_INS (cfg->cbb, store); } @@ -14367,6 +13623,7 @@ mono_handle_global_vregs (MonoCompile *cfg) mono_compile_create_var_for_vreg (cfg, &mono_defaults.double_class->byval_arg, OP_LOCAL, vreg); break; case 'v': + case 'x': mono_compile_create_var_for_vreg (cfg, &ins->klass->byval_arg, OP_LOCAL, vreg); break; default: @@ -15134,73 +14391,6 @@ mono_spill_global_vars (MonoCompile *cfg, gboolean *need_local_opts) g_free (live_range_end_bb); } -static void -mono_decompose_typecheck (MonoCompile *cfg, MonoBasicBlock *bb, MonoInst *ins) -{ - MonoInst *ret, *move, *source; - MonoClass *klass = ins->klass; - int context_used = mini_class_check_context_used (cfg, klass); - int is_isinst = ins->opcode == OP_ISINST; - g_assert (is_isinst || ins->opcode == OP_CASTCLASS); - source = get_vreg_to_inst (cfg, ins->sreg1); - if (!source || source == (MonoInst *) -1) - source = mono_compile_create_var_for_vreg (cfg, &mono_defaults.object_class->byval_arg, OP_LOCAL, ins->sreg1); - g_assert (source && source != (MonoInst *) -1); - - MonoBasicBlock *first_bb; - NEW_BBLOCK (cfg, first_bb); - cfg->cbb = first_bb; - - if (!context_used && mini_class_has_reference_variant_generic_argument (cfg, klass, context_used)) { - if (is_isinst) - ret = emit_isinst_with_cache_nonshared (cfg, source, klass); - else - ret = emit_castclass_with_cache_nonshared (cfg, source, klass); - } else if (!context_used && (mono_class_is_marshalbyref (klass) || mono_class_is_interface (klass))) { - MonoInst *iargs [1]; - int costs; - - iargs [0] = source; - if (is_isinst) { - MonoMethod *wrapper = mono_marshal_get_isinst (klass); - costs = inline_method (cfg, wrapper, mono_method_signature (wrapper), iargs, 0, 0, TRUE); - } else { - MonoMethod *wrapper = mono_marshal_get_castclass (klass); - save_cast_details (cfg, klass, source->dreg, TRUE); - costs = inline_method (cfg, wrapper, mono_method_signature (wrapper), iargs, 0, 0, TRUE); - reset_cast_details (cfg); - } - g_assert (costs > 0); - ret = iargs [0]; - } else { - if (is_isinst) - ret = handle_isinst (cfg, klass, source, context_used); - else - ret = handle_castclass (cfg, klass, source, context_used); - } - EMIT_NEW_UNALU (cfg, move, OP_MOVE, ins->dreg, ret->dreg); - - g_assert (cfg->cbb->code || first_bb->code); - MonoInst *prev = ins->prev; - mono_replace_ins (cfg, bb, ins, &prev, first_bb, cfg->cbb); -} - -void -mono_decompose_typechecks (MonoCompile *cfg) -{ - for (MonoBasicBlock *bb = cfg->bb_entry; bb; bb = bb->next_bb) { - MonoInst *ins; - MONO_BB_FOR_EACH_INS (bb, ins) { - switch (ins->opcode) { - case OP_ISINST: - case OP_CASTCLASS: - mono_decompose_typecheck (cfg, bb, ins); - break; - } - } - } -} - /** * FIXME: