Author: zoltan
Date: 2008-02-18 12:45:23 -0500 (Mon, 18 Feb 2008)
New Revision: 96085
Modified:
trunk/mono/mono/mini/ChangeLog
trunk/mono/mono/mini/mini-ops.h
trunk/mono/mono/mini/mini.c
trunk/mono/mono/mini/mini.h
Log:
2008-02-18 Zoltan Varga <[EMAIL PROTECTED]>
* mini.h mini-ops.h mini.c: Define the OP_Ccc opcodes in mini-ops.h
normally
like the other opcodes.
Modified: trunk/mono/mono/mini/ChangeLog
===================================================================
--- trunk/mono/mono/mini/ChangeLog 2008-02-18 17:39:26 UTC (rev 96084)
+++ trunk/mono/mono/mini/ChangeLog 2008-02-18 17:45:23 UTC (rev 96085)
@@ -1,3 +1,8 @@
+2008-02-18 Zoltan Varga <[EMAIL PROTECTED]>
+
+ * mini.h mini-ops.h mini.c: Define the OP_Ccc opcodes in mini-ops.h
normally
+ like the other opcodes.
+
2008-02-17 Zoltan Varga <[EMAIL PROTECTED]>
* mini-ia64.c: Use cfg->vret_addr instead of cfg->ret.
Modified: trunk/mono/mono/mini/mini-ops.h
===================================================================
--- trunk/mono/mono/mini/mini-ops.h 2008-02-18 17:39:26 UTC (rev 96084)
+++ trunk/mono/mono/mini/mini-ops.h 2008-02-18 17:45:23 UTC (rev 96085)
@@ -30,6 +30,7 @@
MINI_OP(OP_SETRET, "setret")
MINI_OP(OP_SETFRET, "setfret")
MINI_OP(OP_SETLRET, "setlret")
+MINI_OP(OP_LOCALLOC, "localloc")
MINI_OP(OP_LOCALLOC_IMM, "localloc_imm")
MINI_OP(OP_CHECK_THIS, "checkthis")
MINI_OP(OP_VOIDCALL, "voidcall")
@@ -146,6 +147,13 @@
MINI_OP(OP_BREAK, "break")
MINI_OP(OP_CKFINITE, "ckfinite")
+/* Must be in the same order as the matching CEE_ branch opcodes */
+MINI_OP(OP_CEQ, "ceq")
+MINI_OP(OP_CGT, "cgt")
+MINI_OP(OP_CGT_UN,"cgt.un")
+MINI_OP(OP_CLT, "clt")
+MINI_OP(OP_CLT_UN,"clt.un")
+
/* exceptions: must be in the same order as the matching CEE_ branch opcodes */
MINI_OP(OP_COND_EXC_EQ, "cond_exc_eq")
MINI_OP(OP_COND_EXC_GE, "cond_exc_ge")
Modified: trunk/mono/mono/mini/mini.c
===================================================================
--- trunk/mono/mono/mini/mini.c 2008-02-18 17:39:26 UTC (rev 96084)
+++ trunk/mono/mono/mini/mini.c 2008-02-18 17:45:23 UTC (rev 96085)
@@ -8097,7 +8097,7 @@
* CEE_CLT into OP_CLT
* CEE_CLT_UN into OP_CLT_UN
*/
- MONO_INST_NEW (cfg, cmp, 256 + ip [1]);
+ MONO_INST_NEW (cfg, cmp, (OP_CEQ - CEE_CEQ) +
ip [1]);
MONO_INST_NEW (cfg, ins, cmp->opcode);
sp -= 2;
Modified: trunk/mono/mono/mini/mini.h
===================================================================
--- trunk/mono/mono/mini/mini.h 2008-02-18 17:39:26 UTC (rev 96084)
+++ trunk/mono/mono/mini/mini.h 2008-02-18 17:45:23 UTC (rev 96085)
@@ -879,13 +879,6 @@
MONO_SSA_LOAD|MONO_SSA_STORE|MONO_SSA_ADDRESS_TAKEN
};
-#define OP_CEQ (256+CEE_CEQ)
-#define OP_CLT (256+CEE_CLT)
-#define OP_CLT_UN (256+CEE_CLT_UN)
-#define OP_CGT (256+CEE_CGT)
-#define OP_CGT_UN (256+CEE_CGT_UN)
-#define OP_LOCALLOC (256+CEE_LOCALLOC)
-
/* opcodes: value assigned after all the CIL opcodes */
#ifdef MINI_OP
#undef MINI_OP
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
