Author: zoltan
Date: 2008-02-14 09:24:56 -0500 (Thu, 14 Feb 2008)
New Revision: 95634
Modified:
trunk/mono/mono/mini/ChangeLog
trunk/mono/mono/mini/cpu-x86.md
trunk/mono/mono/mini/inssel-x86.brg
trunk/mono/mono/mini/mini-ops.h
trunk/mono/mono/mini/mini-x86.c
Log:
2008-02-14 Zoltan Varga <[EMAIL PROTECTED]>
* mini-ops.h: Get rid of the OP_X86_..._MEMBASE opcodes.
* mini-x86.c inssel-x86.brg cpu-x86.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:21:56 UTC (rev 95633)
+++ trunk/mono/mono/mini/ChangeLog 2008-02-14 14:24:56 UTC (rev 95634)
@@ -1,5 +1,10 @@
2008-02-14 Zoltan Varga <[EMAIL PROTECTED]>
+ * mini-ops.h: Get rid of the OP_X86_..._MEMBASE opcodes.
+
+ * mini-x86.c inssel-x86.brg cpu-x86.md: Get rid of the confusing
_MEMBASE
+ opcodes, use the REG_MEMBASE opcodes instead.
+
* 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/cpu-x86.md
===================================================================
--- trunk/mono/mono/mini/cpu-x86.md 2008-02-14 14:21:56 UTC (rev 95633)
+++ trunk/mono/mono/mini/cpu-x86.md 2008-02-14 14:24:56 UTC (rev 95634)
@@ -274,9 +274,11 @@
x86_fp_load_i4: dest:f src1:b len:7
x86_seteq_membase: src1:b len:7
x86_setne_membase: src1:b len:7
-x86_add_membase: dest:i src1:i src2:b clob:1 len:11
-x86_sub_membase: dest:i src1:i src2:b clob:1 len:11
-x86_mul_membase: dest:i src1:i src2:b clob:1 len:13
+
+x86_add_reg_membase: dest:i src1:i src2:b clob:1 len:11
+x86_sub_reg_membase: dest:i src1:i src2:b clob:1 len:11
+x86_mul_reg_membase: dest:i src1:i src2:b clob:1 len:13
+
adc: dest:i src1:i src2:i len:2 clob:1
addcc: dest:i src1:i src2:i len:2 clob:1
subcc: dest:i src1:i src2:i len:2 clob:1
Modified: trunk/mono/mono/mini/inssel-x86.brg
===================================================================
--- trunk/mono/mono/mini/inssel-x86.brg 2008-02-14 14:21:56 UTC (rev 95633)
+++ trunk/mono/mono/mini/inssel-x86.brg 2008-02-14 14:24:56 UTC (rev 95634)
@@ -667,7 +667,7 @@
tree->sreg1 = state->left->reg1;
tree->sreg2 = base->inst_basereg;
tree->inst_offset = base->inst_offset;
- tree->opcode = OP_X86_ADD_MEMBASE;
+ tree->opcode = OP_X86_ADD_REG_MEMBASE;
mono_bblock_add_inst (s->cbb, tree);
}
@@ -678,7 +678,7 @@
tree->sreg1 = state->left->reg1;
tree->sreg2 = base->inst_basereg;
tree->inst_offset = base->inst_offset;
- tree->opcode = OP_X86_SUB_MEMBASE;
+ tree->opcode = OP_X86_SUB_REG_MEMBASE;
mono_bblock_add_inst (s->cbb, tree);
}
@@ -689,7 +689,7 @@
tree->sreg1 = state->left->reg1;
tree->sreg2 = base->inst_basereg;
tree->inst_offset = base->inst_offset;
- tree->opcode = OP_X86_MUL_MEMBASE;
+ tree->opcode = OP_X86_MUL_REG_MEMBASE;
mono_bblock_add_inst (s->cbb, tree);
}
Modified: trunk/mono/mono/mini/mini-ops.h
===================================================================
--- trunk/mono/mono/mini/mini-ops.h 2008-02-14 14:21:56 UTC (rev 95633)
+++ trunk/mono/mono/mini/mini-ops.h 2008-02-14 14:24:56 UTC (rev 95634)
@@ -601,9 +601,6 @@
MINI_OP(OP_X86_FP_LOAD_I4, "x86_fp_load_i4")
MINI_OP(OP_X86_SETEQ_MEMBASE, "x86_seteq_membase")
MINI_OP(OP_X86_SETNE_MEMBASE, "x86_setne_membase")
-MINI_OP(OP_X86_ADD_MEMBASE, "x86_add_membase")
-MINI_OP(OP_X86_SUB_MEMBASE, "x86_sub_membase")
-MINI_OP(OP_X86_MUL_MEMBASE, "x86_mul_membase")
MINI_OP(OP_X86_OUTARG_ALIGN_STACK, "x86_outarg_align_stack")
#endif
Modified: trunk/mono/mono/mini/mini-x86.c
===================================================================
--- trunk/mono/mono/mini/mini-x86.c 2008-02-14 14:21:56 UTC (rev 95633)
+++ trunk/mono/mono/mini/mini-x86.c 2008-02-14 14:24:56 UTC (rev 95634)
@@ -2225,13 +2225,13 @@
case OP_X86_ADD_MEMBASE_IMM:
x86_alu_membase_imm (code, X86_ADD, ins->inst_basereg,
ins->inst_offset, ins->inst_imm);
break;
- case OP_X86_ADD_MEMBASE:
+ case OP_X86_ADD_REG_MEMBASE:
x86_alu_reg_membase (code, X86_ADD, ins->sreg1,
ins->sreg2, ins->inst_offset);
break;
case OP_X86_SUB_MEMBASE_IMM:
x86_alu_membase_imm (code, X86_SUB, ins->inst_basereg,
ins->inst_offset, ins->inst_imm);
break;
- case OP_X86_SUB_MEMBASE:
+ case OP_X86_SUB_REG_MEMBASE:
x86_alu_reg_membase (code, X86_SUB, ins->sreg1,
ins->sreg2, ins->inst_offset);
break;
case OP_X86_AND_MEMBASE_IMM:
@@ -2255,7 +2255,7 @@
case OP_X86_DEC_REG:
x86_dec_reg (code, ins->dreg);
break;
- case OP_X86_MUL_MEMBASE:
+ case OP_X86_MUL_REG_MEMBASE:
x86_imul_reg_membase (code, ins->sreg1, ins->sreg2,
ins->inst_offset);
break;
case OP_BREAK:
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
