Author: zoltan
Date: 2008-02-07 18:44:52 -0500 (Thu, 07 Feb 2008)
New Revision: 95209
Modified:
trunk/mono/mono/mini/ChangeLog
trunk/mono/mono/mini/cpu-arm.md
trunk/mono/mono/mini/cpu-s390.md
trunk/mono/mono/mini/cpu-s390x.md
trunk/mono/mono/mini/mini-arm.c
trunk/mono/mono/mini/mini-ops.h
trunk/mono/mono/mini/mini-s390.c
trunk/mono/mono/mini/mini-s390x.c
trunk/mono/mono/mini/mini.c
Log:
2008-02-08 Zoltan Varga <[EMAIL PROTECTED]>
* mini-ops.h: Add OP_ICONV_TO_R_UN opcode.
* mini.c (mono_normalize_opcodes): Remap CEE_CONV_R_UN too.
* cpu-s390x.md cpu-s390.md mini-s390x.c mini-arm.c cpu-arm.md
mini-s390.c: Get
rid of CEE_CONV_R_UN.
Modified: trunk/mono/mono/mini/ChangeLog
===================================================================
--- trunk/mono/mono/mini/ChangeLog 2008-02-07 23:37:46 UTC (rev 95208)
+++ trunk/mono/mono/mini/ChangeLog 2008-02-07 23:44:52 UTC (rev 95209)
@@ -1,5 +1,12 @@
2008-02-08 Zoltan Varga <[EMAIL PROTECTED]>
+ * mini-ops.h: Add OP_ICONV_TO_R_UN opcode.
+
+ * mini.c (mono_normalize_opcodes): Remap CEE_CONV_R_UN too.
+
+ * cpu-s390x.md cpu-s390.md mini-s390x.c mini-arm.c cpu-arm.md
mini-s390.c: Get
+ rid of CEE_CONV_R_UN.
+
* mini-s390x.c mini-s390x.h cpu-s390x.md inssel-s390x.brg: Get rid of
CEE_ opcodes.
2008-02-07 Zoltan Varga <[EMAIL PROTECTED]>
Modified: trunk/mono/mono/mini/cpu-arm.md
===================================================================
--- trunk/mono/mono/mini/cpu-arm.md 2008-02-07 23:37:46 UTC (rev 95208)
+++ trunk/mono/mono/mini/cpu-arm.md 2008-02-07 23:44:52 UTC (rev 95209)
@@ -230,7 +230,7 @@
int_conv_to_r4: dest:f src1:i len:36
int_conv_to_r8: dest:f src1:i len:36
int_conv_to_u4: dest:i src1:i
-conv.r.un: dest:f src1:i len:56
+int_conv_to_r_un: dest:f src1:i len:56
int_conv_to_u2: dest:i src1:i len:8
int_conv_to_u1: dest:i src1:i len:4
int_beq: len:8
Modified: trunk/mono/mono/mini/cpu-s390.md
===================================================================
--- trunk/mono/mono/mini/cpu-s390.md 2008-02-07 23:37:46 UTC (rev 95208)
+++ trunk/mono/mono/mini/cpu-s390.md 2008-02-07 23:44:52 UTC (rev 95209)
@@ -231,8 +231,7 @@
int_conv_to_u2: dest:i src1:i len:16
int_conv_to_u4: dest:i src1:i
-conv.r.un: dest:f src1:i len:30
-conv.u: dest:i src1:i len:4
+int_conv_to_r_un: dest:f src1:i len:30
int_beq: len:8
int_bge_un: len:8
Modified: trunk/mono/mono/mini/cpu-s390x.md
===================================================================
--- trunk/mono/mono/mini/cpu-s390x.md 2008-02-07 23:37:46 UTC (rev 95208)
+++ trunk/mono/mono/mini/cpu-s390x.md 2008-02-07 23:44:52 UTC (rev 95209)
@@ -326,9 +326,8 @@
long_conv_to_u4: dest:i src1:i len:4
long_conv_to_u8: dest:i src1:i len:4
long_conv_to_u: dest:i src1:i len:4
+long_conv_to_r_un: dest:f src1:i src2:i len:37
-conv.r.un: dest:f src1:i src2:i len:37
-
long_beq: len:8
long_bge_un: len:8
long_bge: len:8
Modified: trunk/mono/mono/mini/mini-arm.c
===================================================================
--- trunk/mono/mono/mini/mini-arm.c 2008-02-07 23:37:46 UTC (rev 95208)
+++ trunk/mono/mono/mini/mini-arm.c 2008-02-07 23:44:52 UTC (rev 95209)
@@ -2696,7 +2696,7 @@
g_assert (arm_is_fpimm8 (ins->inst_offset));
ARM_LDFS (code, ins->dreg, ins->inst_basereg,
ins->inst_offset);
break;
- case CEE_CONV_R_UN: {
+ case OP_ICONV_TO_R_UN: {
int tmpreg;
tmpreg = ins->dreg == 0? 1: 0;
ARM_CMP_REG_IMM8 (code, ins->sreg1, 0);
Modified: trunk/mono/mono/mini/mini-ops.h
===================================================================
--- trunk/mono/mono/mini/mini-ops.h 2008-02-07 23:37:46 UTC (rev 95208)
+++ trunk/mono/mono/mini/mini-ops.h 2008-02-07 23:44:52 UTC (rev 95209)
@@ -338,6 +338,7 @@
MINI_OP(OP_ISHL_IMM, "int_shl_imm")
MINI_OP(OP_ISHR_IMM, "int_shr_imm")
MINI_OP(OP_ISHR_UN_IMM, "int_shr_un_imm")
+MINI_OP(OP_ICONV_TO_R_UN,"int_conv_to_r_un")
MINI_OP(OP_ICEQ, "int_ceq")
MINI_OP(OP_ICGT, "int_cgt")
Modified: trunk/mono/mono/mini/mini-s390.c
===================================================================
--- trunk/mono/mono/mini/mini-s390.c 2008-02-07 23:37:46 UTC (rev 95208)
+++ trunk/mono/mono/mini/mini-s390.c 2008-02-07 23:44:52 UTC (rev 95209)
@@ -3708,7 +3708,7 @@
}
}
break;
- case CEE_CONV_R_UN: {
+ case OP_ICONV_TO_R_UN: {
s390_cdfbr (code, ins->dreg, ins->sreg1);
s390_ltr (code, ins->sreg1, ins->sreg1);
s390_jnl (code, 12);
Modified: trunk/mono/mono/mini/mini-s390x.c
===================================================================
--- trunk/mono/mono/mini/mini-s390x.c 2008-02-07 23:37:46 UTC (rev 95208)
+++ trunk/mono/mono/mini/mini-s390x.c 2008-02-07 23:44:52 UTC (rev 95209)
@@ -3829,7 +3829,7 @@
s390_ldebr (code, ins->dreg, s390_f15);
}
break;
- case CEE_CONV_R_UN: {
+ case OP_LCONV_TO_R_UN: {
s390_cdgbr (code, ins->dreg, ins->sreg1);
s390_ltgr (code, ins->sreg1, ins->sreg1);
s390_jnl (code, 12);
Modified: trunk/mono/mono/mini/mini.c
===================================================================
--- trunk/mono/mono/mini/mini.c 2008-02-07 23:37:46 UTC (rev 95208)
+++ trunk/mono/mono/mini/mini.c 2008-02-07 23:44:52 UTC (rev 95209)
@@ -10907,6 +10907,7 @@
remap_table [CEE_CONV_I2] = REMAP_OPCODE (CONV_TO_I2);
remap_table [CEE_CONV_U1] = REMAP_OPCODE (CONV_TO_U1);
remap_table [CEE_CONV_U2] = REMAP_OPCODE (CONV_TO_U2);
+ remap_table [CEE_CONV_R_UN] = REMAP_OPCODE (CONV_TO_R_UN);
remap_table [CEE_ADD] = REMAP_OPCODE (ADD);
remap_table [CEE_SUB] = REMAP_OPCODE (SUB);
remap_table [CEE_MUL] = REMAP_OPCODE (MUL);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
