Author: zoltan
Date: 2008-02-14 09:18:40 -0500 (Thu, 14 Feb 2008)
New Revision: 95632
Modified:
trunk/mono/mono/mini/ChangeLog
trunk/mono/mono/mini/cpu-amd64.md
trunk/mono/mono/mini/inssel-amd64.brg
trunk/mono/mono/mini/mini-amd64.c
Log:
2008-02-14 Zoltan Varga <[EMAIL PROTECTED]>
* mini-amd64.c inssel-amd64.brg cpu-amd64.md: Get rid of the confusing
_MEMBASE
opcodes, use the REG_MEMBASE opcodes instead.
Modified: trunk/mono/mono/mini/ChangeLog
===================================================================
--- trunk/mono/mono/mini/ChangeLog 2008-02-14 14:11:54 UTC (rev 95631)
+++ trunk/mono/mono/mini/ChangeLog 2008-02-14 14:18:40 UTC (rev 95632)
@@ -1,5 +1,8 @@
2008-02-14 Zoltan Varga <[EMAIL PROTECTED]>
+ * mini-amd64.c inssel-amd64.brg cpu-amd64.md: Get rid of the confusing
_MEMBASE
+ opcodes, use the REG_MEMBASE opcodes instead.
+
* mini-amd64.c (mono_arch_output_basic_block): Sync with the version on
the
linear IR branch.
Modified: trunk/mono/mono/mini/cpu-amd64.md
===================================================================
--- trunk/mono/mono/mini/cpu-amd64.md 2008-02-14 14:11:54 UTC (rev 95631)
+++ trunk/mono/mono/mini/cpu-amd64.md 2008-02-14 14:18:40 UTC (rev 95632)
@@ -281,9 +281,14 @@
x86_fp_load_i8: dest:f src1:b len:8
x86_fp_load_i4: dest:f src1:b len:8
x86_seteq_membase: src1:b len:9
-x86_add_membase: dest:i src1:i src2:b clob:1 len:13
-x86_sub_membase: dest:i src1:i src2:b clob:1 len:13
-x86_mul_membase: dest:i src1:i src2:b clob:1 len:14
+
+x86_add_reg_membase: dest:i src1:i src2:b clob:1 len:13
+x86_sub_reg_membase: dest:i src1:i src2:b clob:1 len:13
+x86_mul_reg_membase: dest:i src1:i src2:b clob:1 len:13
+x86_and_reg_membase: dest:i src1:i src2:b clob:1 len:13
+x86_or_reg_membase: dest:i src1:i src2:b clob:1 len:13
+x86_xor_reg_membase: dest:i src1:i src2:b clob:1 len:13
+
amd64_test_null: src1:i len:5
amd64_icompare_membase_reg: src1:b src2:i len:8
amd64_icompare_membase_imm: src1:b len:13
Modified: trunk/mono/mono/mini/inssel-amd64.brg
===================================================================
--- trunk/mono/mono/mini/inssel-amd64.brg 2008-02-14 14:11:54 UTC (rev
95631)
+++ trunk/mono/mono/mini/inssel-amd64.brg 2008-02-14 14:18:40 UTC (rev
95632)
@@ -606,19 +606,19 @@
reg: CEE_ADD(reg, CEE_LDIND_I4 (base)) {
MonoInst *base = state->right->left->tree;
- MONO_EMIT_BIALU_MEMBASE (cfg, tree, OP_X86_ADD_MEMBASE, state->reg1,
state->left->reg1, base->inst_basereg, base->inst_offset);
+ MONO_EMIT_BIALU_MEMBASE (cfg, tree, OP_X86_ADD_REG_MEMBASE,
state->reg1, state->left->reg1, base->inst_basereg, base->inst_offset);
}
reg: CEE_SUB(reg, CEE_LDIND_I4 (base)) {
MonoInst *base = state->right->left->tree;
- MONO_EMIT_BIALU_MEMBASE (cfg, tree, OP_X86_SUB_MEMBASE, state->reg1,
state->left->reg1, base->inst_basereg, base->inst_offset);
+ MONO_EMIT_BIALU_MEMBASE (cfg, tree, OP_X86_SUB_REG_MEMBASE,
state->reg1, state->left->reg1, base->inst_basereg, base->inst_offset);
}
reg: CEE_MUL(reg, CEE_LDIND_I4 (base)) {
MonoInst *base = state->right->left->tree;
- MONO_EMIT_BIALU_MEMBASE (cfg, tree, OP_X86_MUL_MEMBASE, state->reg1,
state->left->reg1, base->inst_basereg, base->inst_offset);
+ MONO_EMIT_BIALU_MEMBASE (cfg, tree, OP_X86_MUL_REG_MEMBASE,
state->reg1, state->left->reg1, base->inst_basereg, base->inst_offset);
}
reg: OP_LSHL (reg, reg),
Modified: trunk/mono/mono/mini/mini-amd64.c
===================================================================
--- trunk/mono/mono/mini/mini-amd64.c 2008-02-14 14:11:54 UTC (rev 95631)
+++ trunk/mono/mono/mini/mini-amd64.c 2008-02-14 14:18:40 UTC (rev 95632)
@@ -2689,12 +2689,6 @@
amd64_alu_reg_membase_size (code, X86_XOR, ins->sreg1,
ins->sreg2, ins->inst_offset, 4);
break;
- case OP_X86_ADD_MEMBASE:
- amd64_alu_reg_membase_size (code, X86_ADD, ins->sreg1,
ins->sreg2, ins->inst_offset, 4);
- break;
- case OP_X86_SUB_MEMBASE:
- amd64_alu_reg_membase_size (code, X86_SUB, ins->sreg1,
ins->sreg2, ins->inst_offset, 4);
- break;
case OP_X86_ADD_MEMBASE_IMM:
/* FIXME: Make a 64 version too */
amd64_alu_membase_imm_size (code, X86_ADD,
ins->inst_basereg, ins->inst_offset, ins->inst_imm, 4);
@@ -2742,8 +2736,7 @@
case OP_X86_DEC_REG:
amd64_dec_reg_size (code, ins->dreg, 4);
break;
- case OP_X86_MUL_MEMBASE:
- case OP_X86_MUL_MEMBASE_REG:
+ case OP_X86_MUL_REG_MEMBASE:
amd64_imul_reg_membase_size (code, ins->sreg1,
ins->sreg2, ins->inst_offset, 4);
break;
case OP_AMD64_ICOMPARE_MEMBASE_REG:
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
