Author: zoltan
Date: 2007-12-04 16:06:53 -0500 (Tue, 04 Dec 2007)
New Revision: 90713
Modified:
branches/vargaz/mini-linear-il/mono/mono/mini/local-propagation.c
branches/vargaz/mini-linear-il/mono/mono/mini/mini-amd64.h
branches/vargaz/mini-linear-il/mono/mono/mini/mini-x86.h
branches/vargaz/mini-linear-il/mono/mono/mini/mini.c
branches/vargaz/mini-linear-il/mono/mono/mini/mini.h
branches/vargaz/mini-linear-il/mono/mono/mini/ssa2.c
Log:
2007-12-04 Zoltan Varga <[EMAIL PROTECTED]>
* local-propagation.c (mono_branch_to_cmov): Only run this if
MONO_ARCH_HAVE_CMOV_OPTS is defined.
* mini-amd64.h mini-x86.h: Define the cmov define.
* mini-ops.h: Add OP_SWITCH opcode.
* mini.h: Move the IS_JUMP_INFO defines here from mini.c.
* ssa2.c (visit_inst): Handle OP_SWITCH.
Modified: branches/vargaz/mini-linear-il/mono/mono/mini/local-propagation.c
===================================================================
--- branches/vargaz/mini-linear-il/mono/mono/mini/local-propagation.c
2007-12-04 20:38:25 UTC (rev 90712)
+++ branches/vargaz/mini-linear-il/mono/mono/mini/local-propagation.c
2007-12-04 21:06:53 UTC (rev 90713)
@@ -1813,6 +1813,7 @@
void
mono_branch_to_cmov (MonoCompile *cfg)
{
+#ifdef MONO_ARCH_HAVE_CMOV_OPTS
MonoBasicBlock *bb;
gboolean changed = FALSE;
@@ -2149,4 +2150,5 @@
/* Merging bblocks could make some variables local */
mono_handle_global_vregs (cfg);
}
+#endif
}
Modified: branches/vargaz/mini-linear-il/mono/mono/mini/mini-amd64.h
===================================================================
--- branches/vargaz/mini-linear-il/mono/mono/mini/mini-amd64.h 2007-12-04
20:38:25 UTC (rev 90712)
+++ branches/vargaz/mini-linear-il/mono/mono/mini/mini-amd64.h 2007-12-04
21:06:53 UTC (rev 90713)
@@ -271,6 +271,7 @@
#define MONO_ARCH_HAVE_IMT 1
#define MONO_ARCH_IMT_REG AMD64_R11
#define MONO_ARCH_COMMON_VTABLE_TRAMPOLINE 1
+#define MONO_ARCH_HAVE_CMOV_OPS 1
#define MONO_ARCH_AOT_SUPPORTED 1
Modified: branches/vargaz/mini-linear-il/mono/mono/mini/mini-x86.h
===================================================================
--- branches/vargaz/mini-linear-il/mono/mono/mini/mini-x86.h 2007-12-04
20:38:25 UTC (rev 90712)
+++ branches/vargaz/mini-linear-il/mono/mono/mini/mini-x86.h 2007-12-04
21:06:53 UTC (rev 90713)
@@ -279,6 +279,7 @@
#define MONO_ARCH_HAVE_IMT 1
#define MONO_ARCH_IMT_REG X86_EDX
#define MONO_ARCH_COMMON_VTABLE_TRAMPOLINE 1
+#define MONO_ARCH_HAVE_CMOV_OPS 1
#define MONO_ARCH_AOT_SUPPORTED 1
Modified: branches/vargaz/mini-linear-il/mono/mono/mini/mini.c
===================================================================
--- branches/vargaz/mini-linear-il/mono/mono/mini/mini.c 2007-12-04
20:38:25 UTC (rev 90712)
+++ branches/vargaz/mini-linear-il/mono/mono/mini/mini.c 2007-12-04
21:06:53 UTC (rev 90713)
@@ -123,15 +123,10 @@
*/
#define MONO_IS_COND_BRANCH_NOFP(ins) (MONO_IS_COND_BRANCH_OP(ins) &&
!(((ins)->opcode >= OP_FBEQ) && ((ins)->opcode <= OP_FBLT_UN)) &&
(!(ins)->inst_left || (ins)->inst_left->inst_left->type != STACK_R8))
-#define MONO_IS_BRANCH_OP(ins) (MONO_IS_COND_BRANCH_OP(ins) || ((ins)->opcode
== OP_BR) || ((ins)->opcode == OP_BR_REG) || ((ins)->opcode == CEE_SWITCH))
+#define MONO_IS_BRANCH_OP(ins) (MONO_IS_COND_BRANCH_OP(ins) || ((ins)->opcode
== OP_BR) || ((ins)->opcode == OP_BR_REG) || ((ins)->opcode == CEE_SWITCH) ||
((ins)->opcode == OP_SWITCH))
#define MONO_CHECK_THIS(ins) (mono_method_signature (cfg->method)->hasthis &&
(ins)->ssa_op == MONO_SSA_LOAD && (ins)->inst_left->inst_c0 == 0)
-/* FIXME: Handle OP_GOT_ENTRY too */
-#define MONO_IS_JUMP_TABLE(ins) (((ins)->opcode == OP_JUMP_TABLE) ? TRUE :
((((ins)->opcode == OP_AOTCONST) && (ins->inst_i1 ==
(gpointer)MONO_PATCH_INFO_SWITCH)) ? TRUE : FALSE))
-
-#define MONO_JUMP_TABLE_FROM_INS(ins) (((ins)->opcode == OP_JUMP_TABLE) ?
(ins)->inst_p0 : (((ins)->opcode == OP_AOTCONST) && (ins->inst_i1 ==
(gpointer)MONO_PATCH_INFO_SWITCH) ? (ins)->inst_p0 : NULL))
-
static void setup_stat_profiler (void);
gboolean mono_arch_print_tree(MonoInst *tree, int arity);
static gpointer mono_jit_compile_method_with_opt (MonoMethod *method, guint32
opt);
@@ -2074,6 +2069,7 @@
case CEE_BLE_UN:
case CEE_BLT_UN:
case CEE_SWITCH:
+ case OP_SWITCH:
prev = bb->code;
while (prev->next && prev->next != bb->last_ins)
prev = prev->next;
@@ -10601,7 +10597,8 @@
bb->last_ins->inst_target_bb = repl;
}
break;
- case CEE_SWITCH: {
+ case CEE_SWITCH:
+ case OP_SWITCH: {
int i;
int n = GPOINTER_TO_INT (bb->last_ins->klass);
for (i = 0; i < n; i++ ) {
Modified: branches/vargaz/mini-linear-il/mono/mono/mini/mini.h
===================================================================
--- branches/vargaz/mini-linear-il/mono/mono/mini/mini.h 2007-12-04
20:38:25 UTC (rev 90712)
+++ branches/vargaz/mini-linear-il/mono/mono/mini/mini.h 2007-12-04
21:06:53 UTC (rev 90713)
@@ -142,6 +142,11 @@
#define MONO_IS_CALL(ins) (((ins->opcode >= OP_VOIDCALL) && (ins->opcode <=
OP_VOIDCALL_MEMBASE)) || ((ins->opcode >= OP_FCALL) && (ins->opcode <=
OP_FCALL_MEMBASE)) || ((ins->opcode >= OP_LCALL) && (ins->opcode <=
OP_LCALL_MEMBASE)) || ((ins->opcode >= OP_VCALL) && (ins->opcode <=
OP_VCALL_MEMBASE)) || ((ins->opcode >= OP_CALL) && (ins->opcode <=
OP_CALL_MEMBASE)) || ((ins->opcode >= OP_VCALL2) && (ins->opcode <=
OP_VCALL2_MEMBASE)))
+/* FIXME: Handle OP_GOT_ENTRY too */
+#define MONO_IS_JUMP_TABLE(ins) (((ins)->opcode == OP_JUMP_TABLE) ? TRUE :
((((ins)->opcode == OP_AOTCONST) && (ins->inst_i1 ==
(gpointer)MONO_PATCH_INFO_SWITCH)) ? TRUE : ((ins)->opcode == OP_SWITCH) ? TRUE
: FALSE))
+
+#define MONO_JUMP_TABLE_FROM_INS(ins) (((ins)->opcode == OP_JUMP_TABLE) ?
(ins)->inst_p0 : (((ins)->opcode == OP_AOTCONST) && (ins->inst_i1 ==
(gpointer)MONO_PATCH_INFO_SWITCH) ? (ins)->inst_p0 : (((ins)->opcode ==
OP_SWITCH) ? (ins)->inst_p0 : NULL)))
+
typedef struct MonoInst MonoInst;
typedef struct MonoCallInst MonoCallInst;
typedef struct MonoCallArgParm MonoCallArgParm;
Modified: branches/vargaz/mini-linear-il/mono/mono/mini/ssa2.c
===================================================================
--- branches/vargaz/mini-linear-il/mono/mono/mini/ssa2.c 2007-12-04
20:38:25 UTC (rev 90712)
+++ branches/vargaz/mini-linear-il/mono/mono/mini/ssa2.c 2007-12-04
21:06:53 UTC (rev 90713)
@@ -1113,12 +1113,21 @@
add_cprop_bb (cfg, table->table
[idx], bblist);
}
else {
- for (i = 0; i < table->table_size; i++ )
+ for (i = 0; i < table->table_size; i++)
if (table->table [i])
add_cprop_bb (cfg, table->table
[i], bblist);
}
}
+ if (ins->opcode == OP_SWITCH) {
+ int i;
+ MonoJumpInfoBBTable *table = ins->inst_p0;
+
+ for (i = 0; i < table->table_size; i++)
+ if (table->table [i])
+ add_cprop_bb (cfg, table->table [i],
bblist);
+ }
+
/* Handle COMPARE+BRCOND pairs */
if (ins->next && MONO_IS_COND_BRANCH_OP (ins->next)) {
if (c0) {
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches