mono_bblock_add_inst ((cfg)->cbb, inst); \
} while (0)
+#define MONO_EMIT_NEW_ICOMPARE_IMM(cfg,sr1,imm) do { \
+ MonoInst *inst; \
+ inst = mono_mempool_alloc0 ((cfg)->mempool, sizeof (MonoInst)); \
+ inst->opcode = sizeof (void*) == 8 ? OP_ICOMPARE_IMM : OP_COMPARE_IMM; \
+ inst->sreg1 = sr1; \
+ inst->inst_p1 = (gpointer)imm; \
+ mono_bblock_add_inst ((cfg)->cbb, inst); \
+ } while (0)
+
#define MONO_EMIT_NEW_COND_EXC(cfg,cond,name) do { \
MonoInst *inst; \
inst = mono_mempool_alloc0 ((cfg)->mempool, sizeof (MonoInst)); \
g_assert_not_reached ();
}
-stmt: OP_MEMCPY (reg, reg) {
+stmt: OP_MEMCPY (base, base) {
int size = tree->unused;
if (size > 0)
- mini_emit_memcpy (s, state->left->reg1, 0, state->right->reg1, 0, size, 0);
+ mini_emit_memcpy (s, state->left->tree->inst_basereg, state->left->tree->inst_offset,
+ state->right->tree->inst_basereg, state->right->tree->inst_offset, size, 0);
}
-stmt: OP_MEMSET (reg) {
+stmt: OP_MEMSET (base) {
int size = tree->unused;
if (size > 0)
- mini_emit_memset (s, state->left->reg1, 0, size, tree->inst_imm, 0);
+ mini_emit_memset (s, state->left->tree->inst_basereg, state->left->tree->inst_offset, size, tree->inst_imm, 0);
}
reg: OP_LDELEMA2D (reg, OP_GROUP (reg, reg)) "20" {
}
reg: CEE_CONV_OVF_I1 (reg) {
- MONO_EMIT_NEW_COMPARE_IMM (s, state->left->reg1, 127);
+ MONO_EMIT_NEW_ICOMPARE_IMM (s, state->left->reg1, 127);
MONO_EMIT_NEW_COND_EXC (s, GT, "OverflowException");
- MONO_EMIT_NEW_COMPARE_IMM (s, state->left->reg1, -128);
+ MONO_EMIT_NEW_ICOMPARE_IMM (s, state->left->reg1, -128);
MONO_EMIT_NEW_COND_EXC (s, LT, "OverflowException");
MONO_EMIT_UNALU (s, tree, CEE_CONV_I1, state->reg1, state->left->reg1);
}
reg: CEE_CONV_OVF_I1_UN (reg) {
/* probe values between 0 to 127 */
- MONO_EMIT_NEW_COMPARE_IMM (s, state->left->reg1, 127);
+ MONO_EMIT_NEW_ICOMPARE_IMM (s, state->left->reg1, 127);
MONO_EMIT_NEW_COND_EXC (s, GT_UN, "OverflowException");
MONO_EMIT_UNALU (s, tree, CEE_CONV_I1, state->reg1, state->left->reg1);
}
reg: CEE_CONV_OVF_U1_UN (reg) {
/* probe value to be within 0 to 255 */
- MONO_EMIT_NEW_COMPARE_IMM (s, state->left->reg1, 255);
+ MONO_EMIT_NEW_ICOMPARE_IMM (s, state->left->reg1, 255);
MONO_EMIT_NEW_COND_EXC (s, GT_UN, "OverflowException");
MONO_EMIT_BIALU_IMM (s, tree, OP_AND_IMM, state->reg1, state->left->reg1, 0xff);
}
reg: CEE_CONV_OVF_I2 (reg) {
/* Probe value to be within -32768 and 32767 */
- MONO_EMIT_NEW_COMPARE_IMM (s, state->left->reg1, 32767);
+ MONO_EMIT_NEW_ICOMPARE_IMM (s, state->left->reg1, 32767);
MONO_EMIT_NEW_COND_EXC (s, GT, "OverflowException");
- MONO_EMIT_NEW_COMPARE_IMM (s, state->left->reg1, -32768);
+ MONO_EMIT_NEW_ICOMPARE_IMM (s, state->left->reg1, -32768);
MONO_EMIT_NEW_COND_EXC (s, LT, "OverflowException");
MONO_EMIT_UNALU (s, tree, CEE_CONV_I2, state->reg1, state->left->reg1);
}
reg: CEE_CONV_OVF_I2_UN (reg) {
/* Convert uint value into short, value within 0 and 32767 */
- MONO_EMIT_NEW_COMPARE_IMM (s, state->left->reg1, 32767);
+ MONO_EMIT_NEW_ICOMPARE_IMM (s, state->left->reg1, 32767);
MONO_EMIT_NEW_COND_EXC (s, GT_UN, "OverflowException");
MONO_EMIT_UNALU (s, tree, CEE_CONV_I2, state->reg1, state->left->reg1);
}
reg: CEE_CONV_OVF_U2 (reg) {
/* Probe value to be within 0 and 65535 */
- MONO_EMIT_NEW_COMPARE_IMM (s, state->left->reg1, 0xffff);
+ MONO_EMIT_NEW_ICOMPARE_IMM (s, state->left->reg1, 0xffff);
MONO_EMIT_NEW_COND_EXC (s, GT_UN, "OverflowException");
MONO_EMIT_BIALU_IMM (s, tree, OP_AND_IMM, state->reg1, state->left->reg1, 0xffff);
}
reg: CEE_CONV_OVF_U2_UN (reg) {
/* Probe value to be within 0 and 65535 */
- MONO_EMIT_NEW_COMPARE_IMM (s, state->left->reg1, 0xffff);
+ MONO_EMIT_NEW_ICOMPARE_IMM (s, state->left->reg1, 0xffff);
MONO_EMIT_NEW_COND_EXC (s, GT_UN, "OverflowException");
MONO_EMIT_BIALU_IMM (s, tree, OP_AND_IMM, state->reg1, state->left->reg1, 0xffff);
}
mono_bblock_add_inst (s->cbb, tree);
}
+# 64 bit versions
+reg: OP_CALL_REG (OP_I8CONST) {
+ 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_I8CONST) {
+ tree->opcode = OP_VOIDCALL;
+ ((MonoCallInst*)tree)->fptr = state->left->tree->inst_p0;
+ mono_bblock_add_inst (s->cbb, tree);
+}
+
+freg: OP_FCALL_REG (OP_I8CONST) {
+ tree->opcode = OP_FCALL;
+ ((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);
}
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) {
+stmt: CEE_MKREFANY (OP_GROUP (reg, OP_ICONST), reg),
+stmt: CEE_MKREFANY (OP_GROUP (reg, OP_I8CONST), 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_STORE_MEMBASE (s, OP_STOREP_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);
+ MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STOREP_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_IMM (s, OP_STOREP_MEMBASE_IMM, state->right->reg1, G_STRUCT_OFFSET (MonoTypedRef, type), &klass->byval_arg);
+ MONO_EMIT_NEW_STORE_MEMBASE_IMM (s, OP_STOREP_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);
+ MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STOREP_MEMBASE_REG, state->right->reg1, G_STRUCT_OFFSET (MonoTypedRef, value), state->left->left->reg1);
}
%%
{
int val_reg = mono_regstate_next_int (s->rs);
- MONO_EMIT_NEW_ICONST (s, val_reg, val);
+ if (sizeof (gpointer) == 8)
+ MONO_EMIT_NEW_I8CONST (s, val_reg, val);
+ else
+ MONO_EMIT_NEW_ICONST (s, val_reg, val);
+
+ if (sizeof (gpointer) == 8) {
+ while (size >= 8) {
+ MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STOREI8_MEMBASE_REG, destreg, offset, val_reg);
+ offset += 8;
+ size -= 8;
+ }
+ }
while (size >= 4) {
MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STOREI4_MEMBASE_REG, destreg, offset, val_reg);