Author: zoltan
Date: 2008-02-03 12:03:46 -0500 (Sun, 03 Feb 2008)
New Revision: 94699
Modified:
branches/vargaz/mini-linear-il/mono/mono/mini/ChangeLog
branches/vargaz/mini-linear-il/mono/mono/mini/mini.c
Log:
2008-02-03 Zoltan Varga <[EMAIL PROTECTED]>
* mini.c (mini_method_compile): Disable extended bblocks for now.
(mono_replace_ins): Fix unlinking of bblocks.
Modified: branches/vargaz/mini-linear-il/mono/mono/mini/ChangeLog
===================================================================
--- branches/vargaz/mini-linear-il/mono/mono/mini/ChangeLog 2008-02-03
16:21:50 UTC (rev 94698)
+++ branches/vargaz/mini-linear-il/mono/mono/mini/ChangeLog 2008-02-03
17:03:46 UTC (rev 94699)
@@ -1,5 +1,8 @@
2008-02-03 Zoltan Varga <[EMAIL PROTECTED]>
+ * mini.c (mini_method_compile): Disable extended bblocks for now.
+ (mono_replace_ins): Fix unlinking of bblocks.
+
* local-propagation.c: Fix the div_imm strength reduction optimization.
* mini-sparc.c (mono_arch_allocate_vars): Fix build.
Modified: branches/vargaz/mini-linear-il/mono/mono/mini/mini.c
===================================================================
--- branches/vargaz/mini-linear-il/mono/mono/mini/mini.c 2008-02-03
16:21:50 UTC (rev 94698)
+++ branches/vargaz/mini-linear-il/mono/mono/mini/mini.c 2008-02-03
17:03:46 UTC (rev 94699)
@@ -2182,20 +2182,15 @@
}
if (first_bb == last_bb) {
- int i;
-
/*
* Only one replacement bb, merge the code into
* the current bb.
*/
/* Delete links between the first_bb and its successors */
- for (i = 0; i < first_bb->out_count; ++i) {
- MonoBasicBlock *out_bb = first_bb->out_bb [i];
+ while (first_bb->out_count)
+ mono_unlink_bblock (cfg, first_bb, first_bb->out_bb
[0]);
- mono_unlink_bblock (cfg, first_bb, out_bb);
- }
-
/* Head */
if (*prev)
(*prev)->next = first_bb->code;
@@ -10114,11 +10109,12 @@
code = g_strdup ("\n");
g_print ("\nBB%d (%d) (len: %d): %s", bb->block_num, i,
bb->cil_length, code);
MONO_BB_FOR_EACH_INS (bb, c) {
- if (cfg->new_ir)
+ if (cfg->new_ir) {
mono_print_ins_index (-1, c);
- else
+ } else {
mono_print_tree (c);
- g_print ("\n");
+ g_print ("\n");
+ }
}
g_print ("\tprev:");
@@ -12113,6 +12109,9 @@
if (cfg->opt & (MONO_OPT_SSA | MONO_OPT_ABCREM | MONO_OPT_SSAPRE))
cfg->disable_extended_bblocks = TRUE;
+ // FIXME:
+ cfg->disable_extended_bblocks = TRUE;
+
/*
* create MonoInst* which represents arguments and local variables
*/
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
