X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fcommon%2Ffirmwalk.c;h=30019c0e7fb282d35e4baf46be838c1d0fbb8590;hb=8a953adb0fdd8f7e8cad68baa26bb6a8e8f829b0;hp=db6f3957eb406df2e82f20a385004259acc79874;hpb=ffe001eb424b2924ec0545213ea3cf4c7408e368;p=libfirm

diff --git a/ir/common/firmwalk.c b/ir/common/firmwalk.c
index db6f3957e..30019c0e7 100644
--- a/ir/common/firmwalk.c
+++ b/ir/common/firmwalk.c
@@ -1,16 +1,33 @@
+/*
+ * Project:     libFIRM
+ * File name:   ir/common/firmwalk.c
+ * Purpose:     Walker that touches all Firm data structures
+ * Author:      Sebastian Felis
+ * Modified by:
+ * Created:     7.2003
+ * CVS-ID:      $Id$
+ * Copyright:   (c) 2003 Universität Karlsruhe
+ * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
+ */
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+# include "config.h"
+#endif
+
+#ifdef HAVE_STRING_H
+# include <string.h>
 #endif
 
 #include "firmwalk.h"
-#include "pmap.h"
-#include "entity.h"
-#include "irprog.h"
+
+#include "entity_t.h"
+#include "irnode_t.h"
+#include "irprog_t.h"
 #include "irgwalk.h"
+
 #include "array.h"
 #include "obst.h"
-#include <string.h>
+#include "pmap.h"
 
 /** obstack for firm walker */
 static struct obstack fw_obst;
@@ -33,13 +50,13 @@ typedef struct {
                        get_firm_walk_link. */
 } fw_data;
 
-//@{
+/*@{ */
 /** Access macros to fw_data structure */
 #define FW_GET_DATA_LIST(s)     ((s)->list)
 #define FW_SET_DATA_LIST(s, t)  ((s)->list = (t))
 #define FW_GET_DATA_LINK(s)     ((s)->link)
 #define FW_SET_DATA_LINK(s, t)  ((s)->link = (t))
-//@}
+/*@} */
 
 /** Returns own data struct of the firm walker.
  *
@@ -85,7 +102,7 @@ fw_data *fw_get_data(void *thing)
       }
     }
     break;
-  default: {} // other kinds of firm nodes
+  default: {} /*  other kinds of firm nodes */
   }
 
   return data;
@@ -123,11 +140,11 @@ void fw_free_data(void *thing)
       }
     }
     break;
-  default: {} // other kinds of firm nodes
+  default: {} /*  other kinds of firm nodes */
   }
 }
 
-// documentation in header file
+/*  documentation in header file */
 void set_firm_walk_link(void *thing, void *link)
 {
   fw_data *data;
@@ -156,11 +173,11 @@ void set_firm_walk_link(void *thing, void *link)
   case k_ir_mode:
     set_mode_link(thing, link);
     break;
-  default: {} // other kinds of firm nodes
+  default: {} /*  other kinds of firm nodes */
   }
 }
 
-// documentation in header file
+/*  documentation in header file */
 void *get_firm_walk_link(void *thing)
 {
   fw_data *data;
@@ -215,7 +232,7 @@ void fw_collect_tore(type_or_ent *tore, void *env)
   switch (get_kind(tore)) {
   case k_entity:
     ent = (entity *)tore;
-    // append entity to list
+    /*  append entity to list */
     set_entity_link(ent, NULL);
     if (!pmap_contains(entity_map, ent))
       pmap_insert(entity_map, ent, env);
@@ -223,7 +240,7 @@ void fw_collect_tore(type_or_ent *tore, void *env)
   case k_type:
     tp = (type *)tore;
     mode = get_type_mode(tp);
-    // append type to list
+    /*  append type to list */
     set_type_link(tp, NULL);
     if (!pmap_contains(type_map, tp))
       pmap_insert(type_map, tp, env);
@@ -250,7 +267,7 @@ static
 void fw_collect_irn(ir_node *irn, void *env)
 {
   fw_data *data;
-  ir_mode* mode = get_irn_mode(irn);
+  ir_mode *mode = get_irn_mode(irn);
 
   /* The link field will be cleared in the walk_do_mode()
     callback function. */
@@ -268,7 +285,7 @@ void fw_collect_irn(ir_node *irn, void *env)
   else
   {
     /* add this node to block's node list */
-    ir_node *block = get_nodes_Block(irn);
+    ir_node *block = get_nodes_block(irn);
     data = fw_get_data(block);
     ARR_APP1(ir_node *, FW_GET_DATA_LIST(data), irn);
   }
@@ -333,11 +350,11 @@ void firm_walk_init(firm_walk_flags flags)
      pmap_insert(mode_map, mode_b, NULL);
   */
 
-  // Collect all types (also unused types) if flag is set
+  /*  Collect all types (also unused types) if flag is set */
   if (FW_WITH_ALL_TYPES & flags)
     type_walk(fw_collect_tore, NULL, NULL);
 
-  // for each ir graph
+  /*  for each ir graph */
   for (i = 0; i < get_irp_n_irgs(); i++)
   {
     ir_graph *irg = get_irp_irg(i);
@@ -363,7 +380,7 @@ void firm_walk_finalize(void)
   pmap_destroy(entity_map);
   entity_map = NULL;
 
-  // free all collected data from ir graphs and nodes
+  /*  free all collected data from ir graphs and nodes */
   for (i = 0; i < get_irp_n_irgs(); i++)
   {
     ir_graph *irg = get_irp_irg(i);
@@ -390,8 +407,8 @@ void firm_walk(firm_walk_interface *wif)
   int irg_i, block_i, block_list_len, irn_i, irn_list_len;
   pmap_entry *entry;
   fw_data *data;
-  ir_graph *irg;
   ir_node *block, **block_list, **irn_list;
+  ir_graph *saved_irg = current_ir_graph;
 
   assert(wif && "firm_walk() in firmwalk.c: No walking interface defined!");
 
@@ -431,18 +448,18 @@ void firm_walk(firm_walk_interface *wif)
 
   for (irg_i = 0; irg_i < get_irp_n_irgs(); irg_i++)
   {
-    irg = get_irp_irg(irg_i);
+    current_ir_graph = get_irp_irg(irg_i);
 
     /* walk over all ir graph */
-    if (wif->do_graph) wif->do_graph(irg, wif->env);
+    if (wif->do_graph) wif->do_graph(current_ir_graph, wif->env);
 
     /* walk over all irg's block nested ========================== */
-    data = fw_get_data(irg);
+    data = fw_get_data(current_ir_graph);
     block_list = FW_GET_DATA_LIST(data);
     block_list_len = ARR_LEN(block_list);
     for (block_i = 0; block_i < block_list_len; block_i++)
     {
-      if (wif->do_block_init) wif->do_block_init(irg, wif->env);
+      if (wif->do_block_init) wif->do_block_init(current_ir_graph, wif->env);
 
       block = (ir_node *)block_list[block_i];
       if (wif->do_block) wif->do_block(block, wif->env);
@@ -452,12 +469,12 @@ void firm_walk(firm_walk_interface *wif)
       irn_list = FW_GET_DATA_LIST(data);
       irn_list_len = ARR_LEN(irn_list);
 
-      // call block as prefix ir node
+      /*  call block as prefix ir node */
       if ((wif->do_node) &&
-          (wif->flags & FW_DUMP_BLOCK_AS_IRN & !FW_DUMP_IRN_IN_PREFIX))
+          (wif->flags & (FW_DUMP_BLOCK_AS_IRN | FW_DUMP_IRN_IN_PREFIX)))
         wif->do_node(block, wif->env);
 
-      // do ir nodes in prefix or postfix order?
+      /*  do ir nodes in prefix or postfix order? */
       if (wif->flags & FW_DUMP_IRN_IN_PREFIX)
         irn_i = irn_list_len-1;
       else
@@ -467,26 +484,39 @@ void firm_walk(firm_walk_interface *wif)
       {
         if (wif->do_node) wif->do_node((ir_node *)irn_list[irn_i], wif->env);
 
-        // do ir nodes in prefix or postfix order?
+        /*  do ir nodes in prefix or postfix order? */
         if (wif->flags & FW_DUMP_IRN_IN_PREFIX)
           irn_i--;
         else
           irn_i++;
       }
-      // call block as postfix ir node
+      /*  call block as postfix ir node */
       if ((wif->do_node) &&
-          (wif->flags & (FW_DUMP_BLOCK_AS_IRN | FW_DUMP_IRN_IN_PREFIX)))
+          ((wif->flags & (FW_DUMP_BLOCK_AS_IRN | FW_DUMP_IRN_IN_PREFIX))
+	   == FW_DUMP_BLOCK_AS_IRN))
         wif->do_node(block, wif->env);
 
       /* wall over all block's ir nodes nested end =============== */
 
-      if (wif->do_block_finalize) wif->do_block_finalize(irg, wif->env);
-    } // for each block
+      if(wif->do_block_post)
+	wif->do_block_post(block, wif->env);
+
+    } /*  for each block */
+
+    if (wif->do_block_finalize)
+      wif->do_block_finalize(current_ir_graph, wif->env);
 
     /* walk over all irg's block nested end ====================== */
+    if(wif->do_graph_post)
+      wif->do_graph_post(current_ir_graph, wif->env);
+
+  } /*  for each ir graph irg */
+
+  if(wif->do_graph_finalize)
+    wif->do_graph_finalize(wif->env);
 
-  } // for each ir graph irg
-  if (wif->do_graph_finalize) wif->do_graph_finalize(wif->env);
+  /** ### ToDo: Dump const_code_irg ?? No! Dump const code with entities, types etc. */
 
-  /** ### ToDo: Dump const_code_irg ?? */
+  /* restore the state of current_ir_graph */
+  current_ir_graph = saved_irg;
 }