X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firgmod.c;h=c4612222453e8c70f929ff9f9e0e098a15202845;hb=e570f00fb465d212dde403160e97ab45d36d1d7e;hp=c5773543a5d59fa5d241efe888b8361ceb271279;hpb=7f81cd13ab3c8eccd4eb5ea776bde145b9ff9938;p=libfirm

diff --git a/ir/ir/irgmod.c b/ir/ir/irgmod.c
index c5773543a..c46122224 100644
--- a/ir/ir/irgmod.c
+++ b/ir/ir/irgmod.c
@@ -1,18 +1,22 @@
-
-/* Copyright (C) 1998 - 2000 by Universitaet Karlsruhe
-** All rights reserved.
-**
-** Authors: Martin Trapp, Christian Schaefer
-**
-** irgmod: ir graph modification
-*/
-
-/* $Id$ */
+/*
+ * Project:     libFIRM
+ * File name:   ir/ir/irgmod.h
+ * Purpose:     Support for ir graph modification.
+ * Author:      Martin Trapp, Christian Schaefer
+ * Modified by: Goetz Lindenmaier
+ * Created:
+ * CVS-ID:      $Id$
+ * Copyright:   (c) 1998-2003 Universität Karlsruhe
+ * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
+ */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 
+# include "irvrfy.h"
+# include "irflag_t.h"
+# include "irgwalk.h"
 # include "irnode_t.h"
 # include "irgraph_t.h"
 # include "irgmod.h"
@@ -41,27 +45,31 @@ turn_into_tuple (ir_node *node, int arity)
 /* Insert irnode `new' in place of irnode `old'
    Since `new' may be bigger than `old' replace `old'
    by an op_Id which is smaller than everything */
-inline void
-exchange (ir_node *old, ir_node *new)
+INLINE void
+exchange (ir_node *old, ir_node *nw)
 {
-  ir_node *block = old->in[0];
+  ir_node *block;
+
+  assert(get_irn_op(old)->opar != oparity_dynamic);
+
+  block = old->in[0];
 
   old->op = op_Id;
   old->in = NEW_ARR_D (ir_node *, current_ir_graph->obst, 2);
   old->in[0] = block;
-  old->in[1] = new;
+  old->in[1] = nw;
 }
 
-/**********************************************************************/
-/*  Functionality for collect_phis                                     */
-/**********************************************************************/
+/*--------------------------------------------------------------------*/
+/*  Functionality for collect_phis                                    */
+/*--------------------------------------------------------------------*/
 
-void
+static void
 clear_link (ir_node *n, void *env) {
   set_irn_link(n, NULL);
 }
 
-void
+static void
 collect (ir_node *n, void *env) {
   ir_node *pred;
   if (get_irn_op(n) == op_Phi) {
@@ -90,14 +98,15 @@ void collect_phiprojs(ir_graph *irg) {
 }
 
 
-/**********************************************************************/
-/*  Funcionality for part_block                                       */
-/**********************************************************************/
-
-/* Moves node and all predecessors of node from from_bl to to_bl.
-   Does not move predecessors of Phi nodes (or block nodes). */
+/*--------------------------------------------------------------------*/
+/*  Functionality for part_block                                      */
+/*--------------------------------------------------------------------*/
 
-void move (ir_node *node, ir_node *from_bl, ir_node *to_bl) {
+/**
+ * Moves node and all predecessors of node from from_bl to to_bl.
+ * Does not move predecessors of Phi nodes (or block nodes).
+ */
+static void move (ir_node *node, ir_node *from_bl, ir_node *to_bl) {
   int i;
   ir_node *proj, *pred;
 
@@ -130,7 +139,7 @@ void part_block(ir_node *node) {
   ir_node *phi;
 
   /* Turn off optimizations so that blocks are not merged again. */
-  int rem_opt = get_optimize();
+  int rem_opt = get_opt_optimize();
   set_optimize(0);
 
   /* Transform the control flow */
@@ -142,7 +151,7 @@ void part_block(ir_node *node) {
     ir_node *in[1];
     in[0] = new_Jmp();
     set_irn_in(old_block, 1, in);
-    irn_vrfy(old_block);
+    irn_vrfy_irg(old_block, current_ir_graph);
   }
 
   /* move node and its predecessors to new_block */
@@ -153,7 +162,10 @@ void part_block(ir_node *node) {
   set_irn_link(new_block, phi);
   set_irn_link(old_block, NULL);
   while (phi) {
-    set_nodes_Block(phi, new_block);
+    if(get_nodes_Block(phi) == old_block);   /* @@@ inlinening chokes on phis that don't
+					       obey this condition.  How do they get into
+					       the list??? Example: InterfaceIII */
+      set_nodes_Block(phi, new_block);
     phi = get_irn_link(phi);
   }