X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmini%2Finssel.brg;h=e0bc1f0254b165b55cf4d4a939468848df685173;hb=d4257ef3dc3d8adf23b2744130952b26303f5d33;hp=8166c811c34a170084e5bf267497d73597bafe90;hpb=2c176a5bb6bc0c57fa1a65bc62470d3c11f47871;p=mono.git diff --git a/mono/mini/inssel.brg b/mono/mini/inssel.brg index 8166c811c34..e0bc1f0254b 100644 --- a/mono/mini/inssel.brg +++ b/mono/mini/inssel.brg @@ -8,12 +8,12 @@ * (C) 2002 Ximian, Inc. * */ - +#include #include #include "mini.h" -#include "mini-arch.h" #include +#include #define MBTREE_TYPE MonoInst #define MBCGEN_TYPE MonoCompile @@ -185,6 +185,24 @@ mono_bblock_add_inst ((cfg)->cbb, inst); \ } while (0) +#define MONO_EMIT_NEW_I8CONST(cfg,dr,imm) do { \ + MonoInst *inst; \ + inst = mono_mempool_alloc0 ((cfg)->mempool, sizeof (MonoInst)); \ + inst->opcode = OP_I8CONST; \ + inst->dreg = dr; \ + inst->inst_l = imm; \ + mono_bblock_add_inst ((cfg)->cbb, inst); \ + } while (0) + +#define MONO_EMIT_NEW_PCONST(cfg,dr,imm) do { \ + MonoInst *inst; \ + inst = mono_mempool_alloc0 ((cfg)->mempool, sizeof (MonoInst)); \ + inst->opcode = OP_ICONST; \ + inst->dreg = dr; \ + inst->inst_p0 = (gpointer) imm; \ + mono_bblock_add_inst ((cfg)->cbb, inst); \ + } while (0) + #define MONO_EMIT_NEW_AOTCONST(cfg,dr,imm,type) do { \ MonoInst *inst; \ inst = mono_mempool_alloc0 ((cfg)->mempool, sizeof (MonoInst)); \ @@ -226,6 +244,24 @@ (inst)->opcode = OP_LABEL; \ } while (0) +#define MONO_EMIT_BOUNDS_CHECK(cfg, array_reg, array_type, array_length_field, index_reg) do { \ + if (! (state->tree->flags & MONO_INST_NORANGECHECK)) { \ + int _length_reg = mono_regstate_next_int (cfg->rs); \ + MONO_EMIT_NEW_LOAD_MEMBASE_OP (cfg, OP_LOADI4_MEMBASE, _length_reg, array_reg, G_STRUCT_OFFSET (array_type, array_length_field)); \ + MONO_EMIT_NEW_BIALU (cfg, OP_COMPARE, -1, _length_reg, index_reg); \ + MONO_EMIT_NEW_COND_EXC (cfg, LE_UN, "IndexOutOfRangeException"); \ + } \ + } while (0) + +#define MONO_EMIT_BOUNDS_CHECK_IMM(cfg, array_reg, array_type, array_length_field, index_imm) do { \ + if (! (state->tree->flags & MONO_INST_NORANGECHECK)) { \ + int _length_reg = mono_regstate_next_int (cfg->rs); \ + MONO_EMIT_NEW_LOAD_MEMBASE_OP (cfg, OP_LOADI4_MEMBASE, _length_reg, array_reg, G_STRUCT_OFFSET (array_type, array_length_field)); \ + MONO_EMIT_NEW_BIALU_IMM (cfg, OP_COMPARE_IMM, -1, _length_reg, index_imm); \ + MONO_EMIT_NEW_COND_EXC (cfg, LE_UN, "IndexOutOfRangeException"); \ + } \ + } while (0) + /* we need to kludge state because monoburg puts this stuff before the definition of MBState */ void mini_emit_virtual_call (MonoCompile *s, void *state, MonoInst *tree, int novirt_op, int virtop); void mini_emit_isninst_cast (MonoCompile *s, int klass_reg, MonoClass *klass, MonoInst *false_target, MonoInst *true_target); @@ -235,6 +271,8 @@ void mini_emit_castclass (MonoCompile *s, int klass_reg, MonoClass *klass); void mini_emit_castclass_iface (MonoCompile *s, int vtable_reg, MonoClass *klass); void mini_emit_castclass_iface_class (MonoCompile *s, int klass_reg, MonoClass *klass); +void mini_emit_memcpy (MonoCompile *s, int destreg, int doffset, int srcreg, int soffset, int size, int align); +void mini_emit_memset (MonoCompile *s, int destreg, int offset, int size, int val, int align); %% @@ -262,6 +300,11 @@ base: reg "0" { //tree->inst_basereg = state->reg1; } +base: CEE_LDIND_I (OP_REGVAR) "0" { + tree->inst_offset = 0; + tree->inst_basereg = state->left->tree->dreg; +} + base: OP_REGOFFSET "0" { /* nothing to do */ } @@ -281,6 +324,16 @@ base: CEE_ADD (base, OP_ICONST) "0" { tree->inst_basereg = state->left->tree->inst_basereg; } +base: CEE_ADD (CEE_LDIND_REF (OP_REGVAR), OP_ICONST) "0" { + tree->inst_offset = state->right->tree->inst_c0; + tree->inst_basereg = state->left->left->tree->dreg; +} + +base: CEE_ADD (CEE_LDIND_I (OP_REGVAR), OP_ICONST) "0" { + tree->inst_offset = state->right->tree->inst_c0; + tree->inst_basereg = state->left->left->tree->dreg; +} + # # helpers # @@ -327,7 +380,7 @@ reg: CEE_LDIND_U2 (base) { state->left->tree->inst_basereg, state->left->tree->inst_offset); } -reg: OP_LDADDR (OP_REGOFFSET) { +reg: OP_LDADDR (OP_REGOFFSET) "2" { /* use LEA */ tree->opcode = OP_MOVE; tree->sreg1 = state->left->tree->inst_basereg; @@ -338,7 +391,7 @@ reg: OP_LDADDR (OP_REGOFFSET) { } } -reg: CEE_LDOBJ (OP_REGOFFSET) { +reg: CEE_LDOBJ (OP_REGOFFSET) "2" { /* use LEA */ /* FIXME: this is just an hack */ tree->opcode = OP_MOVE; @@ -350,39 +403,42 @@ reg: CEE_LDOBJ (OP_REGOFFSET) { } } -reg: OP_OBJADDR (reg) { +reg: CEE_LDOBJ (reg) { tree->opcode = OP_MOVE; tree->sreg1 = state->left->reg1; tree->dreg = state->reg1; mono_bblock_add_inst (s->cbb, tree); } -reg: OP_VTADDR (reg) { +reg: OP_OBJADDR (reg) { tree->opcode = OP_MOVE; tree->sreg1 = state->left->reg1; tree->dreg = state->reg1; mono_bblock_add_inst (s->cbb, tree); } -reg: CEE_LDIND_REF (OP_REGVAR) { +reg: OP_VTADDR (reg) { tree->opcode = OP_MOVE; - tree->sreg1 = state->left->tree->dreg; + tree->sreg1 = state->left->reg1; tree->dreg = state->reg1; mono_bblock_add_inst (s->cbb, tree); } -reg: CEE_LDIND_I4 (OP_REGVAR) { +reg: CEE_LDIND_REF (OP_REGVAR), +reg: CEE_LDIND_I4 (OP_REGVAR), +reg: CEE_LDIND_U4 (OP_REGVAR) { tree->opcode = OP_MOVE; tree->sreg1 = state->left->tree->dreg; tree->dreg = state->reg1; mono_bblock_add_inst (s->cbb, tree); } -reg: CEE_LDIND_U4 (OP_REGVAR) { - tree->opcode = OP_MOVE; - tree->sreg1 = state->left->tree->dreg; - tree->dreg = state->reg1; - mono_bblock_add_inst (s->cbb, tree); +reg: CEE_LDIND_U1 (OP_REGVAR) { + MONO_EMIT_BIALU_IMM (s, tree, OP_AND_IMM, state->reg1, state->left->tree->dreg, 0xff); +} + +reg: CEE_LDIND_U2 (OP_REGVAR) { + MONO_EMIT_BIALU_IMM (s, tree, OP_AND_IMM, state->reg1, state->left->tree->dreg, 0xffff); } stmt: CEE_STIND_REF (base, reg) { @@ -452,8 +508,6 @@ stmt: CEE_STIND_I4 (base, OP_ICONST) { state->left->tree->inst_offset, state->right->tree->inst_c0); } - - stmt: CEE_STIND_I1 (base, reg) { MONO_EMIT_STORE_MEMBASE (s, tree, OP_STOREI1_MEMBASE_REG, state->left->tree->inst_basereg, state->left->tree->inst_offset, state->right->reg1); @@ -479,11 +533,27 @@ stmt: CEE_STIND_I4 (OP_REGVAR, reg) { } stmt: CEE_STIND_I2 (OP_REGVAR, reg) { - MONO_EMIT_UNALU (s, tree, OP_MOVE, state->left->tree->dreg, state->right->reg1); + MONO_EMIT_BIALU_IMM (s, tree, OP_AND_IMM, state->left->tree->dreg, state->right->reg1, 0xffff); } stmt: CEE_STIND_I1 (OP_REGVAR, reg) { - MONO_EMIT_UNALU (s, tree, OP_MOVE, state->left->tree->dreg, state->right->reg1); + MONO_EMIT_BIALU_IMM (s, tree, OP_AND_IMM, state->left->tree->dreg, state->right->reg1, 0xff); +} + +stmt: CEE_STIND_I1 (OP_REGVAR, CEE_LDIND_U1 (OP_REGVAR)) { + MONO_EMIT_BIALU_IMM (s, tree, OP_AND_IMM, state->left->tree->dreg, state->right->left->tree->dreg, 0xff); +} + +stmt: CEE_STIND_I1 (OP_REGVAR, CEE_LDIND_I1 (OP_REGVAR)) { + MONO_EMIT_BIALU_IMM (s, tree, OP_AND_IMM, state->left->tree->dreg, state->right->left->tree->dreg, 0xff); +} + +stmt: CEE_STIND_I2 (OP_REGVAR, CEE_LDIND_U2 (OP_REGVAR)) { + MONO_EMIT_BIALU_IMM (s, tree, OP_AND_IMM, state->left->tree->dreg, state->right->left->tree->dreg, 0xffff); +} + +stmt: CEE_STIND_I2 (OP_REGVAR, CEE_LDIND_I2 (OP_REGVAR)) { + MONO_EMIT_BIALU_IMM (s, tree, OP_AND_IMM, state->left->tree->dreg, state->right->left->tree->dreg, 0xffff); } stmt: CEE_STIND_I4 (OP_REGVAR, CEE_LDIND_I4 (OP_REGVAR)) { @@ -496,10 +566,19 @@ stmt: CEE_STIND_I4 (OP_REGVAR, CEE_LDIND_I4 (base)) { state->right->left->tree->inst_offset); } -stmt: CEE_STIND_I4 (OP_REGVAR, OP_ICONST) { +stmt: CEE_STIND_I4 (OP_REGVAR, OP_ICONST), +stmt: CEE_STIND_I2 (OP_REGVAR, OP_ICONST), +stmt: CEE_STIND_I1 (OP_REGVAR, OP_ICONST), +stmt: CEE_STIND_REF (OP_REGVAR, OP_ICONST), +stmt: CEE_STIND_I (OP_REGVAR, OP_ICONST) { + tree->inst_c0 = state->right->tree->inst_c0; + if (tree->opcode == CEE_STIND_I2) + tree->inst_c0 &= 0xffff; + if (tree->opcode == CEE_STIND_I1) + tree->inst_c0 &= 0xff; + tree->opcode = OP_ICONST; tree->dreg = state->left->tree->dreg; - tree->inst_c0 = state->right->tree->inst_c0; mono_bblock_add_inst (s->cbb, tree); } @@ -507,17 +586,74 @@ stmt: CEE_STIND_REF (OP_REGVAR, reg) { MONO_EMIT_UNALU (s, tree, OP_MOVE, state->left->tree->dreg, state->right->reg1); } -stmt: CEE_STIND_REF (OP_REGVAR, OP_ICONST) { - tree->opcode = OP_ICONST; - tree->dreg = state->left->tree->dreg; - tree->inst_c0 = state->right->tree->inst_c0; - mono_bblock_add_inst (s->cbb, tree); -} - stmt: CEE_STIND_I (OP_REGVAR, reg) { MONO_EMIT_UNALU (s, tree, OP_MOVE, state->left->tree->dreg, state->right->reg1); } +stmt: CEE_STELEM_REF (OP_GROUP (reg, reg), reg) { + + g_assert_not_reached (); +} + +reg: OP_GROUP (reg, reg) { + g_assert_not_reached (); +} + +stmt: OP_MEMCPY (reg, reg) { + int size = tree->unused; + mini_emit_memcpy (s, state->left->reg1, 0, state->right->reg1, 0, size, 0); +} + +stmt: OP_MEMSET (reg) { + int size = tree->unused; + mini_emit_memset (s, state->left->reg1, 0, size, tree->inst_imm, 0); +} + +reg: OP_LDELEMA2D (reg, OP_GROUP (reg, reg)) "20" { + int bounds_reg = mono_regstate_next_int (s->rs); + int add_reg = mono_regstate_next_int (s->rs); + int mult_reg = mono_regstate_next_int (s->rs); + int mult2_reg = mono_regstate_next_int (s->rs); + int low1_reg = mono_regstate_next_int (s->rs); + int low2_reg = mono_regstate_next_int (s->rs); + int high1_reg = mono_regstate_next_int (s->rs); + int high2_reg = mono_regstate_next_int (s->rs); + int realidx1_reg = mono_regstate_next_int (s->rs); + int realidx2_reg = mono_regstate_next_int (s->rs); + int sum_reg = mono_regstate_next_int (s->rs); + int index1, index2; + guint32 size = mono_array_element_size (tree->klass); + + index1 = state->right->left->reg1; + index2 = state->right->right->reg1; + + /* range checking */ + MONO_EMIT_NEW_LOAD_MEMBASE_OP (s, OP_LOADI4_MEMBASE, bounds_reg, + state->left->reg1, G_STRUCT_OFFSET (MonoArray, bounds)); + + MONO_EMIT_NEW_LOAD_MEMBASE_OP (s, OP_LOADI4_MEMBASE, low1_reg, + bounds_reg, G_STRUCT_OFFSET (MonoArrayBounds, lower_bound)); + MONO_EMIT_NEW_BIALU (s, CEE_SUB, realidx1_reg, index1, low1_reg); + MONO_EMIT_NEW_LOAD_MEMBASE_OP (s, OP_LOADI4_MEMBASE, high1_reg, + bounds_reg, G_STRUCT_OFFSET (MonoArrayBounds, length)); + MONO_EMIT_NEW_BIALU (s, OP_COMPARE, -1, high1_reg, realidx1_reg); + MONO_EMIT_NEW_COND_EXC (s, LE_UN, "IndexOutOfRangeException"); + + MONO_EMIT_NEW_LOAD_MEMBASE_OP (s, OP_LOADI4_MEMBASE, low2_reg, + bounds_reg, sizeof (MonoArrayBounds) + G_STRUCT_OFFSET (MonoArrayBounds, lower_bound)); + MONO_EMIT_NEW_BIALU (s, CEE_SUB, realidx2_reg, index2, low2_reg); + MONO_EMIT_NEW_LOAD_MEMBASE_OP (s, OP_LOADI4_MEMBASE, high2_reg, + bounds_reg, sizeof (MonoArrayBounds) + G_STRUCT_OFFSET (MonoArrayBounds, length)); + MONO_EMIT_NEW_BIALU (s, OP_COMPARE, -1, high2_reg, realidx2_reg); + MONO_EMIT_NEW_COND_EXC (s, LE_UN, "IndexOutOfRangeException"); + + MONO_EMIT_NEW_BIALU (s, CEE_MUL, mult_reg, high2_reg, realidx1_reg); + MONO_EMIT_NEW_BIALU (s, CEE_ADD, sum_reg, mult_reg, realidx2_reg); + MONO_EMIT_NEW_BIALU_IMM (s, OP_MUL_IMM, mult2_reg, sum_reg, size); + MONO_EMIT_NEW_BIALU (s, CEE_ADD, add_reg, mult2_reg, state->left->reg1); + MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, state->reg1, add_reg, G_STRUCT_OFFSET (MonoArray, vector)); +} + # # conversions: conv_u can be implemented with AND, also all _ovf conversions? # @@ -713,6 +849,10 @@ reg: CEE_SUB (reg, reg) { MONO_EMIT_BIALU (s, tree, tree->opcode, state->reg1, state->left->reg1, state->right->reg1); } +reg: CEE_SUB (reg, CEE_LDIND_I4 (OP_REGVAR)) { + MONO_EMIT_BIALU (s, tree, tree->opcode, state->reg1, state->left->reg1, state->right->left->tree->dreg); +} + reg: CEE_SUB (reg, OP_ICONST) { MONO_EMIT_BIALU_IMM (s, tree, OP_SUB_IMM, state->reg1, state->left->reg1, state->right->tree->inst_c0); } @@ -875,6 +1015,11 @@ stmt: CEE_BR "0" { mono_bblock_add_inst (s->cbb, tree); } +stmt: OP_ARGLIST (reg) { + tree->sreg1 = state->left->reg1; + mono_bblock_add_inst (s->cbb, tree); +} + reg: CEE_CALL { tree->dreg = state->reg1; mono_bblock_add_inst (s->cbb, tree); @@ -938,30 +1083,48 @@ lreg: OP_LCALL_REG (reg) { } stmt: OP_VCALL (reg) { - MonoInst *vtarg; - /* FIXME: this is actually arch-specific... */ - MONO_INST_NEW (s, vtarg, OP_OUTARG); - vtarg->inst_left = state->left->tree; - vtarg->type = STACK_MP; - vtarg->sreg1 = state->left->reg1; - mono_bblock_add_inst (s->cbb, vtarg); - + mono_arch_emit_this_vret_args (s, (MonoCallInst*)tree, -1, -1, state->left->reg1); mono_bblock_add_inst (s->cbb, tree); } stmt: OP_VCALL_REG (reg, reg) { - MonoInst *vtarg; - /* FIXME: this is actually arch-specific... */ - MONO_INST_NEW (s, vtarg, OP_OUTARG); - vtarg->inst_left = state->right->tree; - vtarg->type = STACK_MP; - vtarg->sreg1 = state->right->reg1; - mono_bblock_add_inst (s->cbb, vtarg); + mono_arch_emit_this_vret_args (s, (MonoCallInst*)tree, -1, -1, state->right->reg1); tree->sreg1 = state->left->reg1; mono_bblock_add_inst (s->cbb, tree); } +# +# Optimized call instructions +# + +reg: OP_CALL_REG (OP_ICONST) { + tree->opcode = CEE_CALL; + ((MonoCallInst*)tree)->fptr = state->left->tree->inst_p0; + tree->dreg = state->reg1; + mono_bblock_add_inst (s->cbb, tree); +} + +stmt: OP_VOIDCALL_REG (OP_ICONST) { + tree->opcode = OP_VOIDCALL; + ((MonoCallInst*)tree)->fptr = state->left->tree->inst_p0; + mono_bblock_add_inst (s->cbb, tree); +} + +freg: OP_FCALL_REG (OP_ICONST) { + tree->opcode = OP_FCALL; + ((MonoCallInst*)tree)->fptr = state->left->tree->inst_p0; + tree->dreg = state->reg1; + mono_bblock_add_inst (s->cbb, tree); +} + +lreg: OP_LCALL_REG (OP_ICONST) { + tree->opcode = OP_LCALL; + ((MonoCallInst*)tree)->fptr = state->left->tree->inst_p0; + tree->dreg = state->reg1; + mono_bblock_add_inst (s->cbb, tree); +} + stmt: CEE_RET "0" { mono_bblock_add_inst (s->cbb, tree); } @@ -978,6 +1141,12 @@ cflags: OP_COMPARE (CEE_LDIND_I4 (OP_REGVAR), reg) { mono_bblock_add_inst (s->cbb, tree); } +cflags: OP_COMPARE (CEE_LDIND_I (OP_REGVAR), CEE_LDIND_I (OP_REGVAR)) { + tree->sreg1 = state->left->left->tree->dreg; + tree->sreg2 = state->right->left->tree->dreg; + mono_bblock_add_inst (s->cbb, tree); +} + cflags: OP_COMPARE (CEE_LDIND_I4 (OP_REGVAR), OP_ICONST) { tree->opcode = OP_COMPARE_IMM; tree->sreg1 = state->left->left->tree->dreg; @@ -1034,6 +1203,12 @@ stmt: CEE_BLE_UN (cflags) { stmt: CEE_POP (reg) +# remove some common pops without side effects +stmt: CEE_POP (OP_ICONST) +stmt: CEE_POP (CEE_LDIND_REF (base)) +stmt: CEE_POP (CEE_LDIND_I4 (base)) +stmt: CEE_POP (CEE_LDIND_U1 (base)) + stmt: CEE_JMP "0" { mono_bblock_add_inst (s->cbb, tree); } @@ -1044,23 +1219,40 @@ stmt: CEE_THROW (reg) { MONO_EMIT_UNALU (s, tree, CEE_THROW, -1, state->left->reg1); } +stmt: OP_THROW_OR_NULL (reg) { + MonoInst *object_is_null; + + MONO_NEW_LABEL (s, object_is_null); + + MONO_EMIT_NEW_BIALU_IMM (s, OP_COMPARE_IMM, 0, state->left->reg1, 0); + MONO_EMIT_NEW_BRANCH_LABEL (s, CEE_BEQ, object_is_null); + MONO_EMIT_UNALU (s, tree, CEE_THROW, -1, state->left->reg1); + mono_bblock_add_inst (s->cbb, object_is_null); +} + stmt: CEE_THROW (CEE_LDIND_REF (OP_REGVAR)) { MONO_EMIT_UNALU (s, tree, CEE_THROW, -1, state->left->left->tree->dreg); } -stmt: OP_HANDLER { +stmt: OP_CALL_HANDLER { mono_bblock_add_inst (s->cbb, tree); } -stmt: CEE_ENDFINALLY { +stmt: OP_START_HANDLER "2" { mono_bblock_add_inst (s->cbb, tree); } -stmt: OP_ENDFILTER (reg) "0" { +stmt: CEE_ENDFINALLY "2" { + mono_bblock_add_inst (s->cbb, tree); +} + +stmt: OP_ENDFILTER (reg) "2" { MONO_EMIT_UNALU (s, tree, OP_ENDFILTER, -1, state->left->reg1); } stmt: OP_CHECK_THIS (reg) { + tree->sreg1 = state->left->reg1; + tree->dreg = state->reg1; mono_bblock_add_inst (s->cbb, tree); } @@ -1149,28 +1341,18 @@ reg: CEE_ISINST (reg) { } else if (klass->cast_class->flags & TYPE_ATTRIBUTE_INTERFACE) { mini_emit_isninst_iface_class_cast (s, eclass_reg, klass->cast_class, false_label, object_is_null); } else { + if ((klass->rank == 1) && (klass->byval_arg.type == MONO_TYPE_SZARRAY)) { + /* Check that the object is a vector too */ + int bounds_reg = mono_regstate_next_int (s->rs); + MONO_EMIT_NEW_LOAD_MEMBASE (s, bounds_reg, obj_reg, G_STRUCT_OFFSET (MonoArray, bounds)); + MONO_EMIT_NEW_BIALU_IMM (s, OP_COMPARE_IMM, -1, bounds_reg, 0); + MONO_EMIT_NEW_BRANCH_LABEL (s, CEE_BNE_UN, false_label); + } + /* the object_is_null target simply copies the input register to the output */ mini_emit_isninst_cast (s, eclass_reg, klass->cast_class, false_label, object_is_null); } } else { - - if (klass->marshalbyref) { - MonoInst *no_proxy; - - MONO_NEW_LABEL (s, no_proxy); - - if (mono_compile_aot) { - int tproxy_reg = mono_regstate_next_int (s->rs); - MONO_EMIT_NEW_CLASSCONST (s, tproxy_reg, mono_defaults.transparent_proxy_class); - MONO_EMIT_NEW_BIALU (s, OP_COMPARE, -1, klass_reg, tproxy_reg); - } else { - MONO_EMIT_NEW_BIALU_IMM (s, OP_COMPARE_IMM, -1, klass_reg, mono_defaults.transparent_proxy_class); - } - MONO_EMIT_NEW_BRANCH_LABEL (s, CEE_BNE_UN, no_proxy); - MONO_EMIT_NEW_LOAD_MEMBASE (s, klass_reg, obj_reg, G_STRUCT_OFFSET (MonoTransparentProxy, klass)); - mono_bblock_add_inst (s->cbb, no_proxy); - } - /* the object_is_null target simply copies the input register to the output */ mini_emit_isninst_cast (s, klass_reg, klass, false_label, object_is_null); } @@ -1184,6 +1366,120 @@ reg: CEE_ISINST (reg) { mono_bblock_add_inst (s->cbb, end_label); } +reg: OP_CISINST (reg) { + /* 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 */ + + MonoClass *klass = tree->inst_newa_class; + MonoInst *end_label, *true_label, *false_label, *false2_label; + MonoInst *no_proxy_label, *interface_fail_label; + int obj_reg = state->left->reg1; + int tmp_reg = mono_regstate_next_int (s->rs); + int klass_reg = mono_regstate_next_int (s->rs); + + MONO_NEW_LABEL (s, end_label); + MONO_NEW_LABEL (s, true_label); + MONO_NEW_LABEL (s, false_label); + MONO_NEW_LABEL (s, false2_label); + + MONO_EMIT_NEW_BIALU_IMM (s, OP_COMPARE_IMM, -1, obj_reg, 0); + MONO_EMIT_NEW_BRANCH_LABEL (s, CEE_BEQ, false_label); + + if (klass->flags & TYPE_ATTRIBUTE_INTERFACE) { + MONO_NEW_LABEL (s, interface_fail_label); + MONO_EMIT_NEW_LOAD_MEMBASE (s, tmp_reg, obj_reg, G_STRUCT_OFFSET (MonoObject, vtable)); + mini_emit_isninst_iface_cast (s, tmp_reg, klass, interface_fail_label, true_label); + + mono_bblock_add_inst (s->cbb, interface_fail_label); + MONO_EMIT_NEW_LOAD_MEMBASE (s, klass_reg, tmp_reg, G_STRUCT_OFFSET (MonoVTable, klass)); + + if (mono_compile_aot) { + int tproxy_reg = mono_regstate_next_int (s->rs); + MONO_EMIT_NEW_CLASSCONST (s, tproxy_reg, mono_defaults.transparent_proxy_class); + MONO_EMIT_NEW_BIALU (s, OP_COMPARE, -1, klass_reg, tproxy_reg); + } else { + MONO_EMIT_NEW_BIALU_IMM (s, OP_COMPARE_IMM, -1, klass_reg, mono_defaults.transparent_proxy_class); + } + MONO_EMIT_NEW_BRANCH_LABEL (s, CEE_BNE_UN, false_label); + + MONO_EMIT_NEW_LOAD_MEMBASE (s, tmp_reg, obj_reg, G_STRUCT_OFFSET (MonoTransparentProxy, custom_type_info)); + MONO_EMIT_NEW_BIALU_IMM (s, OP_COMPARE_IMM, -1, tmp_reg, 0); + MONO_EMIT_NEW_BRANCH_LABEL (s, CEE_BNE_UN, false2_label); + + } else { + MONO_EMIT_NEW_LOAD_MEMBASE (s, tmp_reg, obj_reg, G_STRUCT_OFFSET (MonoObject, vtable)); + MONO_EMIT_NEW_LOAD_MEMBASE (s, klass_reg, tmp_reg, G_STRUCT_OFFSET (MonoVTable, klass)); + + MONO_NEW_LABEL (s, no_proxy_label); + + if (mono_compile_aot) { + int tproxy_reg = mono_regstate_next_int (s->rs); + MONO_EMIT_NEW_CLASSCONST (s, tproxy_reg, mono_defaults.transparent_proxy_class); + MONO_EMIT_NEW_BIALU (s, OP_COMPARE, -1, klass_reg, tproxy_reg); + } else { + MONO_EMIT_NEW_BIALU_IMM (s, OP_COMPARE_IMM, -1, klass_reg, mono_defaults.transparent_proxy_class); + } + MONO_EMIT_NEW_BRANCH_LABEL (s, CEE_BNE_UN, no_proxy_label); + MONO_EMIT_NEW_LOAD_MEMBASE (s, tmp_reg, obj_reg, G_STRUCT_OFFSET (MonoTransparentProxy, remote_class)); + MONO_EMIT_NEW_LOAD_MEMBASE (s, klass_reg, tmp_reg, G_STRUCT_OFFSET (MonoRemoteClass, proxy_class)); + + MONO_EMIT_NEW_LOAD_MEMBASE (s, tmp_reg, obj_reg, G_STRUCT_OFFSET (MonoTransparentProxy, custom_type_info)); + MONO_EMIT_NEW_BIALU_IMM (s, OP_COMPARE_IMM, -1, tmp_reg, 0); + MONO_EMIT_NEW_BRANCH_LABEL (s, CEE_BEQ, no_proxy_label); + + mini_emit_isninst_cast (s, klass_reg, klass, false2_label, true_label); + MONO_EMIT_NEW_BRANCH_LABEL (s, CEE_BR, false2_label); + + mono_bblock_add_inst (s->cbb, no_proxy_label); + mini_emit_isninst_cast (s, klass_reg, klass, false_label, true_label); + } + + mono_bblock_add_inst (s->cbb, false_label); + MONO_EMIT_NEW_ICONST (s, state->reg1, 1); + MONO_EMIT_NEW_BRANCH_LABEL (s, CEE_BR, end_label); + mono_bblock_add_inst (s->cbb, false2_label); + MONO_EMIT_NEW_ICONST (s, state->reg1, 2); + MONO_EMIT_NEW_BRANCH_LABEL (s, CEE_BR, end_label); + mono_bblock_add_inst (s->cbb, true_label); + MONO_EMIT_NEW_ICONST (s, state->reg1, 0); + mono_bblock_add_inst (s->cbb, end_label); +} + +reg: OP_UNBOXCAST (reg) { + MonoClass *klass = tree->inst_newa_class; + int obj_reg = state->left->reg1; + int vtable_reg = mono_regstate_next_int (s->rs); + int klass_reg = mono_regstate_next_int (s->rs); + int eclass_reg = mono_regstate_next_int (s->rs); + int rank_reg = mono_regstate_next_int (s->rs); + + MONO_EMIT_NEW_LOAD_MEMBASE (s, vtable_reg, obj_reg, G_STRUCT_OFFSET (MonoObject, vtable)); + MONO_EMIT_NEW_LOAD_MEMBASE (s, klass_reg, vtable_reg, G_STRUCT_OFFSET (MonoVTable, klass)); + MONO_EMIT_NEW_LOAD_MEMBASE (s, rank_reg, klass_reg, G_STRUCT_OFFSET (MonoClass, rank)); + MONO_EMIT_NEW_LOAD_MEMBASE (s, eclass_reg, klass_reg, G_STRUCT_OFFSET (MonoClass, element_class)); + + /* FIXME: generics */ + g_assert (klass->rank == 0); + + // Check rank == 0 + MONO_EMIT_NEW_BIALU_IMM (s, OP_COMPARE_IMM, -1, rank_reg, 0); + MONO_EMIT_NEW_COND_EXC (s, NE_UN, "InvalidCastException"); + + if (mono_compile_aot) { + int const_reg = mono_regstate_next_int (s->rs); + MONO_EMIT_NEW_CLASSCONST (s, const_reg, klass->element_class); + MONO_EMIT_NEW_BIALU (s, OP_COMPARE, -1, eclass_reg, const_reg); + } + else { + MONO_EMIT_NEW_BIALU_IMM (s, OP_COMPARE_IMM, -1, eclass_reg, klass->element_class); + } + + MONO_EMIT_NEW_COND_EXC (s, NE_UN, "InvalidCastException"); + MONO_EMIT_UNALU (s, tree, OP_MOVE, state->reg1, obj_reg); +} + reg: CEE_CASTCLASS (reg) { MonoClass *klass = tree->inst_newa_class; MonoInst *object_is_null; @@ -1261,25 +1557,15 @@ reg: CEE_CASTCLASS (reg) { } else { mini_emit_castclass (s, eclass_reg, klass->cast_class); } - } else { - - if (klass->marshalbyref) { - MonoInst *no_proxy; - - MONO_NEW_LABEL (s, no_proxy); - if (mono_compile_aot) { - int tproxy_reg = mono_regstate_next_int (s->rs); - MONO_EMIT_NEW_CLASSCONST (s, tproxy_reg, mono_defaults.transparent_proxy_class); - MONO_EMIT_NEW_BIALU (s, OP_COMPARE, -1, klass_reg, tproxy_reg); - } else { - MONO_EMIT_NEW_BIALU_IMM (s, OP_COMPARE_IMM, -1, klass_reg, mono_defaults.transparent_proxy_class); - } - MONO_EMIT_NEW_BRANCH_LABEL (s, CEE_BNE_UN, no_proxy); - MONO_EMIT_NEW_LOAD_MEMBASE (s, klass_reg, obj_reg, G_STRUCT_OFFSET (MonoTransparentProxy, klass)); - mono_bblock_add_inst (s->cbb, no_proxy); + if ((klass->rank == 1) && (klass->byval_arg.type == MONO_TYPE_SZARRAY)) { + /* Check that the object is a vector too */ + int bounds_reg = mono_regstate_next_int (s->rs); + MONO_EMIT_NEW_LOAD_MEMBASE (s, bounds_reg, obj_reg, G_STRUCT_OFFSET (MonoArray, bounds)); + MONO_EMIT_NEW_BIALU_IMM (s, OP_COMPARE_IMM, -1, bounds_reg, 0); + MONO_EMIT_NEW_COND_EXC (s, NE_UN, "InvalidCastException"); } - + } else { mini_emit_castclass (s, klass_reg, klass); } } @@ -1288,100 +1574,136 @@ reg: CEE_CASTCLASS (reg) { MONO_EMIT_UNALU (s, tree, OP_MOVE, state->reg1, obj_reg); } -reg: CEE_NEWARR (reg) { - g_assert_not_reached (); -} - -lreg: OP_LMUL (lreg, lreg) { - g_assert_not_reached (); -} - -lreg: OP_LMUL_OVF (lreg, lreg) { - g_assert_not_reached (); -} +reg: OP_CCASTCLASS (reg) { + /* 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*/ + + MonoClass *klass = tree->inst_newa_class; + MonoInst *end_label, *fail_label, *no_proxy_label, *ok_result_label; + int obj_reg = state->left->reg1; + int tmp_reg = mono_regstate_next_int (s->rs); + int klass_reg = mono_regstate_next_int (s->rs); -lreg: OP_LMUL_OVF_UN (lreg, lreg) { - g_assert_not_reached (); -} + MONO_NEW_LABEL (s, end_label); + MONO_NEW_LABEL (s, ok_result_label); -lreg: OP_LDIV (lreg, lreg) { - g_assert_not_reached (); -} + MONO_EMIT_NEW_BIALU_IMM (s, OP_COMPARE_IMM, -1, obj_reg, 0); + MONO_EMIT_NEW_BRANCH_LABEL (s, CEE_BEQ, ok_result_label); -lreg: OP_LDIV_UN (lreg, lreg) { - g_assert_not_reached (); -} + if (klass->flags & TYPE_ATTRIBUTE_INTERFACE) { + + MONO_NEW_LABEL (s, fail_label); + + MONO_EMIT_NEW_LOAD_MEMBASE (s, tmp_reg, obj_reg, G_STRUCT_OFFSET (MonoObject, vtable)); + mini_emit_isninst_iface_cast (s, tmp_reg, klass, fail_label, ok_result_label); + + mono_bblock_add_inst (s->cbb, fail_label); + MONO_EMIT_NEW_LOAD_MEMBASE (s, klass_reg, tmp_reg, G_STRUCT_OFFSET (MonoVTable, klass)); -lreg: OP_LREM (lreg, lreg) { - g_assert_not_reached (); -} + if (mono_compile_aot) { + int tproxy_reg = mono_regstate_next_int (s->rs); + MONO_EMIT_NEW_CLASSCONST (s, tproxy_reg, mono_defaults.transparent_proxy_class); + MONO_EMIT_NEW_BIALU (s, OP_COMPARE, -1, klass_reg, tproxy_reg); + } else { + MONO_EMIT_NEW_BIALU_IMM (s, OP_COMPARE_IMM, -1, klass_reg, mono_defaults.transparent_proxy_class); + } + + MONO_EMIT_NEW_COND_EXC (s, NE_UN, "InvalidCastException"); + + MONO_EMIT_NEW_LOAD_MEMBASE (s, tmp_reg, obj_reg, G_STRUCT_OFFSET (MonoTransparentProxy, remote_class)); + MONO_EMIT_NEW_LOAD_MEMBASE (s, klass_reg, tmp_reg, G_STRUCT_OFFSET (MonoRemoteClass, proxy_class)); + + MONO_EMIT_NEW_LOAD_MEMBASE (s, tmp_reg, obj_reg, G_STRUCT_OFFSET (MonoTransparentProxy, custom_type_info)); + MONO_EMIT_NEW_BIALU_IMM (s, OP_COMPARE_IMM, -1, tmp_reg, 0); + MONO_EMIT_NEW_COND_EXC (s, EQ, "InvalidCastException"); + + MONO_EMIT_NEW_ICONST (s, state->reg1, 1); + MONO_EMIT_NEW_BRANCH_LABEL (s, CEE_BR, end_label); + + } else { -lreg: OP_LREM_UN (lreg, lreg) { - g_assert_not_reached (); -} + MONO_NEW_LABEL (s, no_proxy_label); + MONO_NEW_LABEL (s, fail_label); + + MONO_EMIT_NEW_LOAD_MEMBASE (s, tmp_reg, obj_reg, G_STRUCT_OFFSET (MonoObject, vtable)); + MONO_EMIT_NEW_LOAD_MEMBASE (s, klass_reg, tmp_reg, G_STRUCT_OFFSET (MonoVTable, klass)); -lreg: OP_LSHL (lreg, reg) { - g_assert_not_reached (); -} + if (mono_compile_aot) { + int tproxy_reg = mono_regstate_next_int (s->rs); + MONO_EMIT_NEW_CLASSCONST (s, tproxy_reg, mono_defaults.transparent_proxy_class); + MONO_EMIT_NEW_BIALU (s, OP_COMPARE, -1, klass_reg, tproxy_reg); + } else { + MONO_EMIT_NEW_BIALU_IMM (s, OP_COMPARE_IMM, -1, klass_reg, mono_defaults.transparent_proxy_class); + } + MONO_EMIT_NEW_BRANCH_LABEL (s, CEE_BNE_UN, no_proxy_label); + + MONO_EMIT_NEW_LOAD_MEMBASE (s, tmp_reg, obj_reg, G_STRUCT_OFFSET (MonoTransparentProxy, remote_class)); + MONO_EMIT_NEW_LOAD_MEMBASE (s, klass_reg, tmp_reg, G_STRUCT_OFFSET (MonoRemoteClass, proxy_class)); + + MONO_EMIT_NEW_LOAD_MEMBASE (s, tmp_reg, obj_reg, G_STRUCT_OFFSET (MonoTransparentProxy, custom_type_info)); + MONO_EMIT_NEW_BIALU_IMM (s, OP_COMPARE_IMM, -1, tmp_reg, 0); + MONO_EMIT_NEW_BRANCH_LABEL (s, CEE_BEQ, no_proxy_label); + + mini_emit_isninst_cast (s, klass_reg, klass, fail_label, ok_result_label); + mono_bblock_add_inst (s->cbb, fail_label); + MONO_EMIT_NEW_ICONST (s, state->reg1, 1); + MONO_EMIT_NEW_BRANCH_LABEL (s, CEE_BR, end_label); + + mono_bblock_add_inst (s->cbb, no_proxy_label); + mini_emit_castclass (s, klass_reg, klass); + } -lreg: OP_LSHR (lreg, reg) { - g_assert_not_reached (); + mono_bblock_add_inst (s->cbb, ok_result_label); + MONO_EMIT_NEW_ICONST (s, state->reg1, 0); + mono_bblock_add_inst (s->cbb, end_label); } +reg: CEE_NEWARR (reg), +lreg: OP_LMUL (lreg, lreg), +lreg: OP_LMUL_OVF (lreg, lreg), +lreg: OP_LMUL_OVF_UN (lreg, lreg), +lreg: OP_LDIV (lreg, lreg), +lreg: OP_LDIV_UN (lreg, lreg), +lreg: OP_LREM (lreg, lreg), +lreg: OP_LREM_UN (lreg, lreg), +lreg: OP_LSHL (lreg, reg), +lreg: OP_LSHR (lreg, reg), lreg: OP_LSHR_UN (lreg, reg) { g_assert_not_reached (); } -reg: CEE_UNBOX (reg) { - int vtable_reg = mono_regstate_next_int (s->rs); - int class_reg = mono_regstate_next_int (s->rs); - int element_class_reg = mono_regstate_next_int (s->rs); - - MONO_EMIT_NEW_LOAD_MEMBASE (s, vtable_reg, state->left->reg1, G_STRUCT_OFFSET (MonoObject, vtable)); - MONO_EMIT_NEW_LOAD_MEMBASE (s, class_reg, vtable_reg, G_STRUCT_OFFSET (MonoVTable, klass)); - MONO_EMIT_NEW_LOAD_MEMBASE (s, element_class_reg, class_reg, G_STRUCT_OFFSET (MonoClass, element_class)); - - if (mono_compile_aot) { - /* fixme: make it work with the AOT compiler */ - g_assert_not_reached (); - } else { - MONO_EMIT_NEW_BIALU_IMM (s, OP_COMPARE_IMM, -1, element_class_reg, tree->inst_newa_class); - } - - MONO_EMIT_NEW_COND_EXC (s, NE_UN, "InvalidCastException"); - MONO_EMIT_BIALU_IMM (s, tree, CEE_ADD, state->reg1, state->left->reg1, sizeof (MonoObject)); - g_warning ("untested code!!"); -} - # # string support # reg: OP_GETCHR (reg, reg) { - int length_reg = mono_regstate_next_int (s->rs); int mult_reg = mono_regstate_next_int (s->rs); int add_reg = mono_regstate_next_int (s->rs); - MONO_EMIT_NEW_LOAD_MEMBASE_OP (s, OP_LOADI4_MEMBASE, length_reg, - state->left->reg1, G_STRUCT_OFFSET (MonoString, length)); - MONO_EMIT_NEW_BIALU (s, OP_COMPARE, -1, length_reg, state->right->reg1); - MONO_EMIT_NEW_COND_EXC (s, LE_UN, "IndexOutOfRangeException"); - + MONO_EMIT_BOUNDS_CHECK (s, state->left->reg1, MonoString, length, state->right->reg1); MONO_EMIT_NEW_BIALU_IMM (s, OP_SHL_IMM, mult_reg, state->right->reg1, 1); MONO_EMIT_NEW_BIALU (s, CEE_ADD, add_reg, mult_reg, state->left->reg1); - MONO_EMIT_LOAD_MEMBASE_OP (s, tree, OP_LOADI2_MEMBASE, state->reg1, + MONO_EMIT_LOAD_MEMBASE_OP (s, tree, OP_LOADU2_MEMBASE, state->reg1, add_reg, G_STRUCT_OFFSET (MonoString, chars)); } reg: OP_GETCHR (reg, OP_ICONST) { - int length_reg = mono_regstate_next_int (s->rs); - int ind; + int ind = 2 * state->right->tree->inst_c0 + G_STRUCT_OFFSET (MonoString, chars); - MONO_EMIT_NEW_LOAD_MEMBASE (s, length_reg, state->left->reg1, G_STRUCT_OFFSET (MonoString, length)); - MONO_EMIT_NEW_BIALU_IMM (s, OP_COMPARE_IMM, -1, length_reg, state->right->tree->inst_c0); - MONO_EMIT_NEW_COND_EXC (s, LE_UN, "IndexOutOfRangeException"); - - ind = 2 * state->right->tree->inst_c0 + G_STRUCT_OFFSET (MonoString, chars); - MONO_EMIT_LOAD_MEMBASE_OP (s, tree, OP_LOADI2_MEMBASE, state->reg1, state->left->reg1, ind); + MONO_EMIT_BOUNDS_CHECK_IMM (s, state->left->reg1, MonoString, length, state->right->tree->inst_c0); + MONO_EMIT_LOAD_MEMBASE_OP (s, tree, OP_LOADU2_MEMBASE, state->reg1, state->left->reg1, ind); +} + +reg: OP_STRLEN (reg) { + MONO_EMIT_LOAD_MEMBASE_OP (s, tree, OP_LOADI4_MEMBASE, state->reg1, + state->left->reg1, G_STRUCT_OFFSET (MonoString, length)); +} + +reg: OP_GETTYPE (reg) { + int vt_reg = mono_regstate_next_int (s->rs); + MONO_EMIT_NEW_LOAD_MEMBASE (s, vt_reg, state->left->reg1, G_STRUCT_OFFSET (MonoObject, vtable)); + MONO_EMIT_LOAD_MEMBASE_OP (s, tree, OP_LOAD_MEMBASE, state->reg1, vt_reg, G_STRUCT_OFFSET (MonoVTable, type)); } # @@ -1392,62 +1714,181 @@ reg: CEE_LDLEN (reg) { state->left->reg1, G_STRUCT_OFFSET (MonoArray, max_length)); } +reg: OP_ARRAY_RANK (reg) { + int vtable_reg = mono_regstate_next_int (s->rs); + int class_reg = mono_regstate_next_int (s->rs); + MONO_EMIT_NEW_LOAD_MEMBASE_OP (s, OP_LOAD_MEMBASE, vtable_reg, + state->left->reg1, G_STRUCT_OFFSET (MonoObject, vtable)); + MONO_EMIT_NEW_LOAD_MEMBASE_OP (s, OP_LOAD_MEMBASE, class_reg, + vtable_reg, G_STRUCT_OFFSET (MonoVTable, klass)); + MONO_EMIT_NEW_LOAD_MEMBASE_OP (s, OP_LOADI4_MEMBASE, state->reg1, + class_reg, G_STRUCT_OFFSET (MonoClass, rank)); +} + +reg: OP_CHECK_ARRAY_TYPE (reg) { + int vtable_reg = mono_regstate_next_int (s->rs); + int class_reg = mono_regstate_next_int (s->rs); + int elclass_reg = mono_regstate_next_int (s->rs); + + MONO_EMIT_NEW_LOAD_MEMBASE_OP (s, OP_LOAD_MEMBASE, vtable_reg, + state->left->reg1, G_STRUCT_OFFSET (MonoObject, vtable)); + MONO_EMIT_NEW_LOAD_MEMBASE_OP (s, OP_LOAD_MEMBASE, class_reg, + vtable_reg, G_STRUCT_OFFSET (MonoVTable, klass)); + MONO_EMIT_NEW_LOAD_MEMBASE_OP (s, OP_LOAD_MEMBASE, elclass_reg, + class_reg, G_STRUCT_OFFSET (MonoClass, element_class)); + MONO_EMIT_NEW_BIALU_IMM (s, OP_COMPARE_IMM, -1, elclass_reg, tree->klass); + MONO_EMIT_NEW_COND_EXC (s, NE_UN, "ArrayTypeMismatchException"); + MONO_EMIT_UNALU (s, tree, OP_MOVE, state->reg1, state->left->reg1); +} + reg: CEE_LDELEMA (reg, OP_ICONST) "15" { - int length_reg = mono_regstate_next_int (s->rs); guint32 size = mono_class_array_element_size (tree->klass); - int ind; - MONO_EMIT_NEW_LOAD_MEMBASE_OP (s, OP_LOADI4_MEMBASE, length_reg, - state->left->reg1, G_STRUCT_OFFSET (MonoArray, max_length)); - MONO_EMIT_NEW_BIALU_IMM (s, OP_COMPARE_IMM, -1, length_reg, state->right->tree->inst_c0); - MONO_EMIT_NEW_COND_EXC (s, LE_UN, "IndexOutOfRangeException"); - - ind = size * state->right->tree->inst_c0 + G_STRUCT_OFFSET (MonoArray, vector); - + int ind = size * state->right->tree->inst_c0 + G_STRUCT_OFFSET (MonoArray, vector); + + MONO_EMIT_BOUNDS_CHECK_IMM (s, state->left->reg1, MonoArray, max_length, state->right->tree->inst_c0); MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, state->reg1, state->left->reg1, ind); } reg: CEE_LDELEMA (reg, reg) "20" { - int length_reg = mono_regstate_next_int (s->rs); int mult_reg = mono_regstate_next_int (s->rs); int add_reg = mono_regstate_next_int (s->rs); guint32 size = mono_class_array_element_size (tree->klass); - - MONO_EMIT_NEW_LOAD_MEMBASE_OP (s, OP_LOADI4_MEMBASE, length_reg, - state->left->reg1, G_STRUCT_OFFSET (MonoArray, max_length)); - MONO_EMIT_NEW_BIALU (s, OP_COMPARE, -1, length_reg, state->right->reg1); - MONO_EMIT_NEW_COND_EXC (s, LE_UN, "IndexOutOfRangeException"); + MONO_EMIT_BOUNDS_CHECK (s, state->left->reg1, MonoArray, max_length, state->right->reg1); MONO_EMIT_NEW_BIALU_IMM (s, OP_MUL_IMM, mult_reg, state->right->reg1, size); MONO_EMIT_NEW_BIALU (s, CEE_ADD, add_reg, mult_reg, state->left->reg1); MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, state->reg1, add_reg, G_STRUCT_OFFSET (MonoArray, vector)); } +reg: CEE_REFANYVAL (reg) { + int klass_reg = mono_regstate_next_int (s->rs); + MONO_EMIT_NEW_LOAD_MEMBASE (s, klass_reg, state->left->reg1, G_STRUCT_OFFSET (MonoTypedRef, klass)); + if (mono_compile_aot) { + int const_reg = mono_regstate_next_int (s->rs); + MONO_EMIT_NEW_CLASSCONST (s, const_reg, tree->inst_newa_class); + MONO_EMIT_NEW_BIALU (s, OP_COMPARE, -1, klass_reg, const_reg); + } else { + MONO_EMIT_NEW_BIALU_IMM (s, OP_COMPARE_IMM, -1, klass_reg, tree->inst_newa_class); + } + MONO_EMIT_NEW_COND_EXC (s, NE_UN, "InvalidCastException"); + MONO_EMIT_NEW_LOAD_MEMBASE (s, state->reg1, state->left->reg1, G_STRUCT_OFFSET (MonoTypedRef, value)); +} + +reg: OP_REFANYTYPE (reg) { + MONO_EMIT_NEW_LOAD_MEMBASE (s, state->reg1, state->left->reg1, G_STRUCT_OFFSET (MonoTypedRef, type)); +} + +stmt: CEE_MKREFANY (OP_GROUP (reg, OP_ICONST), reg) { + MonoClass *klass = (MonoClass*)(tree->inst_left->inst_right->inst_p0); + if (mono_compile_aot) { + int const_reg = mono_regstate_next_int (s->rs); + int type_reg = mono_regstate_next_int (s->rs); + MONO_EMIT_NEW_CLASSCONST (s, const_reg, klass); + MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STOREI4_MEMBASE_REG, state->right->reg1, G_STRUCT_OFFSET (MonoTypedRef, klass), const_reg); + MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, type_reg, const_reg, G_STRUCT_OFFSET (MonoClass, byval_arg)); + MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STOREI4_MEMBASE_REG, state->right->reg1, G_STRUCT_OFFSET (MonoTypedRef, type), type_reg); + } + else { + MONO_EMIT_NEW_STORE_MEMBASE_IMM (s, OP_STOREI4_MEMBASE_IMM, state->right->reg1, G_STRUCT_OFFSET (MonoTypedRef, type), &klass->byval_arg); + MONO_EMIT_NEW_STORE_MEMBASE_IMM (s, OP_STOREI4_MEMBASE_IMM, state->right->reg1, G_STRUCT_OFFSET (MonoTypedRef, klass), klass); + } + MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STOREI4_MEMBASE_REG, state->right->reg1, G_STRUCT_OFFSET (MonoTypedRef, value), state->left->left->reg1); +} + %% +/* + * 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 *s, int max_iid_reg, MonoClass *klass, + MonoInst *false_target) +{ + if (mono_compile_aot) { + int iid_reg = mono_regstate_next_int (s->rs); + MONO_EMIT_NEW_AOTCONST (s, iid_reg, klass, MONO_PATCH_INFO_IID); + MONO_EMIT_NEW_BIALU (s, OP_COMPARE, -1, max_iid_reg, iid_reg); + } + else + MONO_EMIT_NEW_BIALU_IMM (s, OP_COMPARE_IMM, -1, max_iid_reg, klass->interface_id); + if (false_target) + MONO_EMIT_NEW_BRANCH_LABEL (s, CEE_BLT_UN, false_target); + else + MONO_EMIT_NEW_COND_EXC (s, LT_UN, "InvalidCastException"); +} + +/* Same as above, but obtains max_iid from a vtable */ +static void +mini_emit_max_iid_check_vtable (MonoCompile *s, int vtable_reg, MonoClass *klass, + MonoInst *false_target) +{ + int max_iid_reg = mono_regstate_next_int (s->rs); + + MONO_EMIT_NEW_LOAD_MEMBASE (s, max_iid_reg, vtable_reg, G_STRUCT_OFFSET (MonoVTable, max_interface_id)); + mini_emit_max_iid_check (s, 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 *s, int klass_reg, MonoClass *klass, + MonoInst *false_target) +{ + int max_iid_reg = mono_regstate_next_int (s->rs); + + MONO_EMIT_NEW_LOAD_MEMBASE (s, max_iid_reg, klass_reg, G_STRUCT_OFFSET (MonoClass, max_interface_id)); + mini_emit_max_iid_check (s, max_iid_reg, klass, false_target); +} + +static void +mini_emit_load_intf_reg (MonoCompile *s, int intf_reg, int ioffset_reg, MonoClass *klass) +{ + if (mono_compile_aot) { + int iid_reg = mono_regstate_next_int (s->rs); + MONO_EMIT_NEW_AOTCONST (s, iid_reg, klass, MONO_PATCH_INFO_IID); + /* FIXME: Do a shift instead */ +#if SIZEOF_VOID_P == 8 + MONO_EMIT_NEW_BIALU_IMM (s, OP_SHL_IMM, iid_reg, iid_reg, 3); +#else + MONO_EMIT_NEW_BIALU_IMM (s, OP_SHL_IMM, iid_reg, iid_reg, 2); +#endif + MONO_EMIT_NEW_BIALU (s, CEE_ADD, ioffset_reg, ioffset_reg, iid_reg); + MONO_EMIT_NEW_LOAD_MEMBASE (s, intf_reg, ioffset_reg, 0); + } + else + MONO_EMIT_NEW_LOAD_MEMBASE (s, intf_reg, ioffset_reg, klass->interface_id * SIZEOF_VOID_P); +} + +/* Emit code which loads ->interface_offsets [klass->interface_id] */ +static void +mini_emit_load_intf_reg_vtable (MonoCompile *s, int intf_reg, int vtable_reg, MonoClass *klass) +{ + int ioffset_reg = mono_regstate_next_int (s->rs); + + MONO_EMIT_NEW_LOAD_MEMBASE (s, ioffset_reg, vtable_reg, G_STRUCT_OFFSET (MonoVTable, interface_offsets)); + mini_emit_load_intf_reg (s, intf_reg, ioffset_reg, klass); +} + +/* Emit code which loads ->interface_offsets [klass->interface_id] */ +static void +mini_emit_load_intf_reg_class (MonoCompile *s, int intf_reg, int klass_reg, MonoClass *klass) +{ + int ioffset_reg = mono_regstate_next_int (s->rs); + + MONO_EMIT_NEW_LOAD_MEMBASE (s, ioffset_reg, klass_reg, G_STRUCT_OFFSET (MonoClass, interface_offsets)); + mini_emit_load_intf_reg (s, intf_reg, ioffset_reg, klass); +} + void mini_emit_virtual_call (MonoCompile *cfg, void *st, MonoInst *tree, int novirtop, int virtop) { - MonoInst *this, *vtarg; MonoMethod *method = ((MonoCallInst*)tree)->method; - int vtable_reg, slot_reg; + int vtable_reg, slot_reg, this_reg; MBState *state = st; - /* add the this argument */ - MONO_INST_NEW (cfg, this, OP_OUTARG); - this->inst_left = state->left->tree; - this->type = this->inst_left->type; - this->sreg1 = state->left->reg1; - mono_bblock_add_inst (cfg->cbb, this); - - if (novirtop == OP_VCALL) { - /* FIXME: this is actually arch-specific... */ - MONO_INST_NEW (cfg, vtarg, OP_OUTARG); - vtarg->inst_left = state->right->tree; - vtarg->type = STACK_MP; - vtarg->sreg1 = state->right->reg1; - mono_bblock_add_inst (cfg->cbb, vtarg); - } + this_reg = state->left->reg1; + mono_arch_emit_this_vret_args (cfg, (MonoCallInst*)tree, this_reg, state->left->tree->type, novirtop == OP_VCALL? state->right->reg1: -1); if (!(method->flags & METHOD_ATTRIBUTE_VIRTUAL) || ((method->flags & METHOD_ATTRIBUTE_FINAL) && @@ -1461,7 +1902,7 @@ mini_emit_virtual_call (MonoCompile *cfg, void *st, MonoInst *tree, int novirtop } if (!method->string_ctor) - MONO_EMIT_NEW_UNALU (cfg, OP_CHECK_THIS, -1, this->sreg1); + MONO_EMIT_NEW_UNALU (cfg, OP_CHECK_THIS, -1, this_reg); tree->dreg = state->reg1; tree->opcode = novirtop; @@ -1470,22 +1911,20 @@ mini_emit_virtual_call (MonoCompile *cfg, void *st, MonoInst *tree, int novirtop } vtable_reg = mono_regstate_next_int (cfg->rs); - MONO_EMIT_NEW_LOAD_MEMBASE (cfg, vtable_reg, this->sreg1, G_STRUCT_OFFSET (MonoObject, vtable)); + MONO_EMIT_NEW_LOAD_MEMBASE (cfg, vtable_reg, this_reg, G_STRUCT_OFFSET (MonoObject, vtable)); if (method->klass->flags & TYPE_ATTRIBUTE_INTERFACE) { - int ifoffset_reg = mono_regstate_next_int (cfg->rs); slot_reg = mono_regstate_next_int (cfg->rs); - MONO_EMIT_NEW_LOAD_MEMBASE (cfg, ifoffset_reg, vtable_reg, G_STRUCT_OFFSET (MonoVTable, interface_offsets)); - MONO_EMIT_NEW_LOAD_MEMBASE (cfg, slot_reg, ifoffset_reg, method->klass->interface_id << 2); - tree->inst_offset = method->slot << 2; - cfg->disable_aot = TRUE; + mini_emit_load_intf_reg_vtable (cfg, slot_reg, vtable_reg, method->klass); + tree->inst_offset = method->slot * SIZEOF_VOID_P; } else { slot_reg = vtable_reg; - tree->inst_offset = G_STRUCT_OFFSET (MonoVTable, vtable) + (method->slot << 2); + tree->inst_offset = G_STRUCT_OFFSET (MonoVTable, vtable) + (method->slot * SIZEOF_VOID_P); } tree->dreg = state->reg1; tree->opcode = virtop; tree->sreg1 = slot_reg; + ((MonoCallInst*)tree)->virtual = TRUE; mono_bblock_add_inst (cfg->cbb, tree); } @@ -1502,7 +1941,7 @@ mini_emit_isninst_cast (MonoCompile *s, int klass_reg, MonoClass *klass, MonoIns MONO_EMIT_NEW_BRANCH_LABEL (s, CEE_BLT_UN, false_target); } MONO_EMIT_NEW_LOAD_MEMBASE (s, stypes_reg, klass_reg, G_STRUCT_OFFSET (MonoClass, supertypes)); - MONO_EMIT_NEW_LOAD_MEMBASE (s, stype, stypes_reg, ((klass->idepth - 1) << 2)); + MONO_EMIT_NEW_LOAD_MEMBASE (s, stype, stypes_reg, ((klass->idepth - 1) * SIZEOF_VOID_P)); if (mono_compile_aot) { int const_reg = mono_regstate_next_int (s->rs); MONO_EMIT_NEW_CLASSCONST (s, const_reg, klass); @@ -1516,41 +1955,27 @@ mini_emit_isninst_cast (MonoCompile *s, int klass_reg, MonoClass *klass, MonoIns void mini_emit_isninst_iface_cast (MonoCompile *s, int vtable_reg, MonoClass *klass, MonoInst *false_target, MonoInst *true_target) { - int max_iid_reg = mono_regstate_next_int (s->rs); - int ioffset_reg = mono_regstate_next_int (s->rs); int intf_reg = mono_regstate_next_int (s->rs); - - s->disable_aot = TRUE; - MONO_EMIT_NEW_LOAD_MEMBASE (s, max_iid_reg, vtable_reg, G_STRUCT_OFFSET (MonoVTable, max_interface_id)); - MONO_EMIT_NEW_BIALU_IMM (s, OP_COMPARE_IMM, -1, max_iid_reg, klass->interface_id); - MONO_EMIT_NEW_BRANCH_LABEL (s, CEE_BLT_UN, false_target); - MONO_EMIT_NEW_LOAD_MEMBASE (s, ioffset_reg, vtable_reg, G_STRUCT_OFFSET (MonoVTable, interface_offsets)); - MONO_EMIT_NEW_LOAD_MEMBASE (s, intf_reg, ioffset_reg, klass->interface_id << 2); + mini_emit_max_iid_check_vtable (s, vtable_reg, klass, false_target); + mini_emit_load_intf_reg_vtable (s, intf_reg, vtable_reg, klass); MONO_EMIT_NEW_BIALU_IMM (s, OP_COMPARE_IMM, -1, intf_reg, 0); /* the object_is_null target simply copies the input register to the output */ MONO_EMIT_NEW_BRANCH_LABEL (s, CEE_BNE_UN, true_target); } /* - * Variant of the aboce that takes a register to the class, not the vtable. + * Variant of the above that takes a register to the class, not the vtable. * Note that inside interfaces_offsets the empty value is -1, not NULL, in this case. */ void mini_emit_isninst_iface_class_cast (MonoCompile *s, int klass_reg, MonoClass *klass, MonoInst *false_target, MonoInst *true_target) { - int max_iid_reg = mono_regstate_next_int (s->rs); - int ioffset_reg = mono_regstate_next_int (s->rs); int intf_reg = mono_regstate_next_int (s->rs); - - s->disable_aot = TRUE; - MONO_EMIT_NEW_LOAD_MEMBASE (s, max_iid_reg, klass_reg, G_STRUCT_OFFSET (MonoClass, max_interface_id)); - MONO_EMIT_NEW_BIALU_IMM (s, OP_COMPARE_IMM, -1, max_iid_reg, klass->interface_id); - MONO_EMIT_NEW_BRANCH_LABEL (s, CEE_BLT_UN, false_target); - MONO_EMIT_NEW_LOAD_MEMBASE (s, ioffset_reg, klass_reg, G_STRUCT_OFFSET (MonoClass, interface_offsets)); - MONO_EMIT_NEW_LOAD_MEMBASE (s, intf_reg, ioffset_reg, klass->interface_id << 2); - MONO_EMIT_NEW_BIALU_IMM (s, OP_COMPARE_IMM, -1, intf_reg, 0); + mini_emit_max_iid_check_class (s, klass_reg, klass, false_target); + mini_emit_load_intf_reg_class (s, intf_reg, klass_reg, klass); + MONO_EMIT_NEW_BIALU_IMM (s, OP_COMPARE_IMM, -1, intf_reg, -1); /* the object_is_null target simply copies the input register to the output */ MONO_EMIT_NEW_BRANCH_LABEL (s, CEE_BGE, true_target); } @@ -1568,7 +1993,7 @@ mini_emit_castclass (MonoCompile *s, int klass_reg, MonoClass *klass) MONO_EMIT_NEW_COND_EXC (s, LT_UN, "InvalidCastException"); } MONO_EMIT_NEW_LOAD_MEMBASE (s, stypes_reg, klass_reg, G_STRUCT_OFFSET (MonoClass, supertypes)); - MONO_EMIT_NEW_LOAD_MEMBASE (s, stype, stypes_reg, ((klass->idepth - 1) << 2)); + MONO_EMIT_NEW_LOAD_MEMBASE (s, stype, stypes_reg, ((klass->idepth - 1) * SIZEOF_VOID_P)); if (mono_compile_aot) { int const_reg = mono_regstate_next_int (s->rs); MONO_EMIT_NEW_CLASSCONST (s, const_reg, klass); @@ -1582,17 +2007,10 @@ mini_emit_castclass (MonoCompile *s, int klass_reg, MonoClass *klass) void mini_emit_castclass_iface (MonoCompile *s, int vtable_reg, MonoClass *klass) { - int max_iid_reg = mono_regstate_next_int (s->rs); - int ioffset_reg = mono_regstate_next_int (s->rs); int intf_reg = mono_regstate_next_int (s->rs); - - s->disable_aot = TRUE; - MONO_EMIT_NEW_LOAD_MEMBASE (s, max_iid_reg, vtable_reg, G_STRUCT_OFFSET (MonoVTable, max_interface_id)); - MONO_EMIT_NEW_BIALU_IMM (s, OP_COMPARE_IMM, -1, max_iid_reg, klass->interface_id); - MONO_EMIT_NEW_COND_EXC (s, LT_UN, "InvalidCastException"); - MONO_EMIT_NEW_LOAD_MEMBASE (s, ioffset_reg, vtable_reg, G_STRUCT_OFFSET (MonoVTable, interface_offsets)); - MONO_EMIT_NEW_LOAD_MEMBASE (s, intf_reg, ioffset_reg, klass->interface_id << 2); + mini_emit_max_iid_check_vtable (s, vtable_reg, klass, NULL); + mini_emit_load_intf_reg_vtable (s, intf_reg, vtable_reg, klass); MONO_EMIT_NEW_BIALU_IMM (s, OP_COMPARE_IMM, -1, intf_reg, 0); MONO_EMIT_NEW_COND_EXC (s, EQ, "InvalidCastException"); } @@ -1604,18 +2022,67 @@ mini_emit_castclass_iface (MonoCompile *s, int vtable_reg, MonoClass *klass) void mini_emit_castclass_iface_class (MonoCompile *s, int klass_reg, MonoClass *klass) { - int max_iid_reg = mono_regstate_next_int (s->rs); - int ioffset_reg = mono_regstate_next_int (s->rs); int intf_reg = mono_regstate_next_int (s->rs); - - s->disable_aot = TRUE; - MONO_EMIT_NEW_LOAD_MEMBASE (s, max_iid_reg, klass_reg, G_STRUCT_OFFSET (MonoClass, max_interface_id)); - MONO_EMIT_NEW_BIALU_IMM (s, OP_COMPARE_IMM, -1, max_iid_reg, klass->interface_id); - MONO_EMIT_NEW_COND_EXC (s, LT_UN, "InvalidCastException"); - MONO_EMIT_NEW_LOAD_MEMBASE (s, ioffset_reg, klass_reg, G_STRUCT_OFFSET (MonoClass, interface_offsets)); - MONO_EMIT_NEW_LOAD_MEMBASE (s, intf_reg, ioffset_reg, klass->interface_id << 2); - MONO_EMIT_NEW_BIALU_IMM (s, OP_COMPARE_IMM, -1, intf_reg, 0); + mini_emit_max_iid_check_class (s, klass_reg, klass, NULL); + mini_emit_load_intf_reg_class (s, intf_reg, klass_reg, klass); + MONO_EMIT_NEW_BIALU_IMM (s, OP_COMPARE_IMM, -1, intf_reg, -1); MONO_EMIT_NEW_COND_EXC (s, EQ, "InvalidCastException"); } +void +mini_emit_memcpy (MonoCompile *s, int destreg, int doffset, int srcreg, int soffset, int size, int align) +{ + int cur_reg; + + /* FIXME: consider alignment for archs that need it. */ + while (size >= 4) { + cur_reg = mono_regstate_next_int (s->rs); + MONO_EMIT_NEW_LOAD_MEMBASE_OP (s, OP_LOADI4_MEMBASE, cur_reg, srcreg, soffset); + MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STOREI4_MEMBASE_REG, destreg, doffset, cur_reg); + doffset += 4; + soffset += 4; + size -= 4; + } + while (size >= 2) { + cur_reg = mono_regstate_next_int (s->rs); + MONO_EMIT_NEW_LOAD_MEMBASE_OP (s, OP_LOADI2_MEMBASE, cur_reg, srcreg, soffset); + MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STOREI2_MEMBASE_REG, destreg, doffset, cur_reg); + doffset += 2; + soffset += 2; + size -= 2; + } + while (size >= 1) { + cur_reg = mono_regstate_next_int (s->rs); + MONO_EMIT_NEW_LOAD_MEMBASE_OP (s, OP_LOADI1_MEMBASE, cur_reg, srcreg, soffset); + MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STOREI1_MEMBASE_REG, destreg, doffset, cur_reg); + doffset += 1; + soffset += 1; + size -= 1; + } +} + +void +mini_emit_memset (MonoCompile *s, int destreg, int offset, int size, int val, int alignl) +{ + int val_reg = mono_regstate_next_int (s->rs); + + MONO_EMIT_NEW_ICONST (s, val_reg, val); + + while (size >= 4) { + MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STOREI4_MEMBASE_REG, destreg, offset, val_reg); + offset += 4; + size -= 4; + } + while (size >= 2) { + MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STOREI2_MEMBASE_REG, destreg, offset, val_reg); + offset += 2; + size -= 2; + } + while (size >= 1) { + MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STOREI1_MEMBASE_REG, destreg, offset, val_reg); + offset += 1; + size -= 1; + } +} +