Author: zoltan
Date: 2008-01-24 10:36:36 -0500 (Thu, 24 Jan 2008)
New Revision: 93806
Modified:
branches/vargaz/mini-linear-il/mono/mono/mini/ChangeLog
branches/vargaz/mini-linear-il/mono/mono/mini/method-to-ir.c
Log:
2008-01-24 Zoltan Varga <[EMAIL PROTECTED]>
* method-to-ir.c: Remove some macros which are in mini.h.
Modified: branches/vargaz/mini-linear-il/mono/mono/mini/ChangeLog
===================================================================
--- branches/vargaz/mini-linear-il/mono/mono/mini/ChangeLog 2008-01-24
15:34:25 UTC (rev 93805)
+++ branches/vargaz/mini-linear-il/mono/mono/mini/ChangeLog 2008-01-24
15:36:36 UTC (rev 93806)
@@ -1,13 +1,12 @@
-<<<<<<< .working
-2008-01-02 Zoltan Varga <[EMAIL PROTECTED]>
-=======
+2008-01-24 Zoltan Varga <[EMAIL PROTECTED]>
+
+ * method-to-ir.c: Remove some macros which are in mini.h.
+
2008-01-21 Zoltan Varga <[EMAIL PROTECTED]>
->>>>>>> .merge-right.r93796
-<<<<<<< .working
* method-to-ir.c (MONO_EMIT_NEW_BRANCH_BLOCK): Don't start a new basic
block here.
(mono_op_to_op_imm): Add OP_AMD64_ICOMPARE_MEMBASE_IMM.
-=======
+
* mini-x86.h (MONO_ARCH_AOT_SUPPORTED): Disable AOT for apple x86.
2008-01-20 Zoltan Varga <[EMAIL PROTECTED]>
Modified: branches/vargaz/mini-linear-il/mono/mono/mini/method-to-ir.c
===================================================================
--- branches/vargaz/mini-linear-il/mono/mono/mini/method-to-ir.c
2008-01-24 15:34:25 UTC (rev 93805)
+++ branches/vargaz/mini-linear-il/mono/mono/mini/method-to-ir.c
2008-01-24 15:36:36 UTC (rev 93806)
@@ -97,13 +97,6 @@
} \
} while (0)
-/*
- * this is used to determine when some branch optimizations are possible: we
exclude FP compares
- * because they have weird semantics with NaNs.
- */
-#define MONO_IS_COND_BRANCH_OP(ins) (((ins)->opcode >= CEE_BEQ &&
(ins)->opcode <= CEE_BLT_UN) || ((ins)->opcode >= OP_LBEQ && (ins)->opcode <=
OP_LBLT_UN) || ((ins)->opcode >= OP_FBEQ && (ins)->opcode <= OP_FBLT_UN) ||
((ins)->opcode >= OP_IBEQ && (ins)->opcode <= OP_IBLT_UN))
-#define MONO_IS_COND_BRANCH_NOFP(ins) (MONO_IS_COND_BRANCH_OP(ins) &&
(ins)->inst_left->inst_left->type != STACK_R8)
-
/* Determine whenever 'ins' represents a load of the 'this' argument */
#define MONO_CHECK_THIS(ins) (mono_method_signature (cfg->method)->hasthis &&
((ins)->opcode == OP_MOVE) && ((ins)->sreg1 == cfg->args [0]->dreg))
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
