}
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);
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);
}
} 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);
}
} 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);
}
}
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));
+}
+
#
# array support
#
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, type), const_reg);
+ 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);
}
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) &&
}
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;
}
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) {
slot_reg = mono_regstate_next_int (cfg->rs);
mini_emit_load_intf_reg_vtable (cfg, slot_reg, vtable_reg, method->klass);
projects / mono.git / blobdiff