- for (i = 0; i < get_irn_arity(node); i++) {
- pred = get_irn_n(node, i);
- if (get_nodes_Block(pred) == from_bl)
- move(pred, from_bl, to_bl);
- }
+ assert(get_Block_MacroBlock(curr) == mbh);
+
+ for (;;) {
+ if (curr == old_block) {
+ /* old_block dominates the block, so old_block will be
+ the new macro block header */
+ set_Block_MacroBlock(block, old_block);
+ set_irn_link(block, list);
+ list = block;
+ break;
+ }
+ if (curr == mbh) {
+ /* leave it in the mbh */
+ set_irn_link(block, get_irn_link(mbh));
+ set_irn_link(mbh, block);
+ break;
+ }
+
+ assert(get_Block_n_cfgpreds(curr) == 1);
+ curr = get_Block_cfgpred_block(curr, 0);
+ }
+ }
+ /* beware: do NOT directly manipulate old_block's list, as old_block is
+ in mbh's list and this would destroy the list! */
+ set_irn_link(old_block, list);
+
+ /* finally add new_block to mbh's list */
+ set_irn_link(new_block, get_irn_link(mbh));
+ set_irn_link(mbh, new_block);
+ } else {
+ /* move blocks from mbh to new_block */
+ block = get_irn_link(mbh);
+
+ set_irn_link(mbh, NULL);
+ set_irn_link(new_block, NULL);
+
+ for (; block != NULL; block = next) {
+ next = get_irn_link(block);
+
+ set_Block_MacroBlock(block, new_block);
+ set_irn_link(block, get_irn_link(new_block));
+ set_irn_link(new_block, block);
+ }
+ }
+
+ set_optimize(rem_opt);