X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fcommon%2Ffirmwalk.c;h=ff02992e44bf0f4178ef650a5652958eed5c280f;hb=0cc8bfc863da28d3799e9eca1d1765d564b6e573;hp=7c1f6b7f70684ba812dfaabeaca5a4e4f58f26fe;hpb=95a11ef08ff0fa615aa8fc024a3b07dd6d278620;p=libfirm

diff --git a/ir/common/firmwalk.c b/ir/common/firmwalk.c
index 7c1f6b7f7..ff02992e4 100644
--- a/ir/common/firmwalk.c
+++ b/ir/common/firmwalk.c
@@ -1,22 +1,52 @@
+/*
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ *
+ * This file is part of libFirm.
+ *
+ * This file may be distributed and/or modified under the terms of the
+ * GNU General Public License version 2 as published by the Free Software
+ * Foundation and appearing in the file LICENSE.GPL included in the
+ * packaging of this file.
+ *
+ * Licensees holding valid libFirm Professional Edition licenses may use
+ * this file in accordance with the libFirm Commercial License.
+ * Agreement provided with the Software.
+ *
+ * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+ * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE.
+ */
 
+/**
+ * @file
+ * @brief    Walker that touches all Firm data structures
+ * @author   Sebastian Felis
+ * @date     7.2003
+ * @version  $Id$
+ */
 #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 "irtools.h"
+
 #include "array.h"
 #include "obst.h"
-#include <string.h>
+#include "pmap.h"
 
 /** obstack for firm walker */
 static struct obstack fw_obst;
 
-/** This map stores all types of firm */
-static pmap *mode_map = NULL;
 /** This map stores all types of firm */
 static pmap *type_map = NULL;
 /** This map stores all entities of firm */
@@ -33,13 +63,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 +115,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 +153,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 +186,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;
@@ -188,17 +218,10 @@ void *get_firm_walk_link(void *thing)
   }
 }
 
-/** Set link field of a ir node to NULL */
-static
-void fw_clear_link(ir_node * node, void * env)
-{
-  set_irn_link(node, NULL);
-}
-
 /** Fill maps of type and entity.
  *  This function will be called by the firm walk initializer
  *  to collect all types and entities of program's firm ir.
- *  All types will be colleced in the hash table type_map
+ *  All types will be collected in the hash table type_map
  *  and all entity are stored in entity_map. The mode of an
  *  type will be collected as well.
  *
@@ -206,33 +229,26 @@ void fw_clear_link(ir_node * node, void * env)
  *  @param env Environment pointer (currently unused)
  */
 static
-void fw_collect_tore(type_or_ent *tore, void *env)
+void fw_collect_tore(type_or_ent tore, void *env)
 {
-  ir_mode *mode;
-  type *tp;
-  entity *ent;
+  ir_type *tp;
+  ir_entity *ent;
 
-  switch (get_kind(tore)) {
+  switch (get_kind(tore.ent)) {
   case k_entity:
-    ent = (entity *)tore;
-    // append entity to list
+    ent = tore.ent;
+    /*  append entity to list */
     set_entity_link(ent, NULL);
     if (!pmap_contains(entity_map, ent))
       pmap_insert(entity_map, ent, env);
     break;
   case k_type:
-    tp = (type *)tore;
-    mode = get_type_mode(tp);
-    // append type to list
+    tp = tore.typ;
+
+    /*  append type to list */
     set_type_link(tp, NULL);
     if (!pmap_contains(type_map, tp))
       pmap_insert(type_map, tp, env);
-
-    /* insert only modes (non atomic types, i.e. class, array or struct
-       have no mode. The link field will be cleared in the walk_do_mode()
-       callback function. */
-    if ((NULL != mode) && (!pmap_contains(mode_map, mode)))
-      pmap_insert(mode_map, mode, env);
     break;
   default: break;
   }
@@ -250,25 +266,18 @@ static
 void fw_collect_irn(ir_node *irn, void *env)
 {
   fw_data *data;
-  ir_mode* mode = get_irn_mode(irn);
-
-  /* The link field will be cleared in the walk_do_mode()
-    callback function. */
-  if ((NULL != mode) && (!pmap_contains(mode_map, mode)))
-    pmap_insert(mode_map, mode, env);
+  (void) env;
 
   /* block nodes. */
-  if (is_Block(irn))
-  {
+  if (is_Block(irn)) {
     /* add this block to ir graph's block list */
     data = fw_get_data(get_current_ir_graph());
     ARR_APP1(ir_node *, FW_GET_DATA_LIST(data), irn);
   }
   /* non block nodes */
-  else
-  {
+  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);
   }
@@ -278,6 +287,7 @@ void fw_collect_irn(ir_node *irn, void *env)
 static
 void fw_free_colleted_data(ir_node *irn, void *env)
 {
+  (void) env;
   /* Free node list from blocks */
   if (is_Block(irn))
   {
@@ -297,50 +307,28 @@ void firm_walk_init(firm_walk_flags flags)
   /* init obstack */
   obstack_init(&fw_obst);
 
-  /*  Init map of modes and lists of type and entity. If map or list
-      allready exists, free it. */
-  if (mode_map)
-  {
-    pmap_destroy(mode_map);
-  }
-  mode_map = pmap_create();
-
+  /*  Init map of type and entity. If map or list
+      already exists, free it. */
   if (type_map)
-  {
     pmap_destroy(type_map);
-  }
   type_map = pmap_create();
 
   if (entity_map)
-  {
     pmap_destroy(entity_map);
-  }
   entity_map = pmap_create();
 
-  /* insert internal modes to mode hash. The link field will be cleared
-     in the walk_do_mode() callback function.
-     Other used modes are added by collecting types */
-  pmap_insert(mode_map, mode_BB, NULL);
-  pmap_insert(mode_map, mode_T, NULL);
-  pmap_insert(mode_map, mode_ANY, NULL);
-  pmap_insert(mode_map, mode_BAD, NULL);
-  pmap_insert(mode_map, mode_X, NULL);
-  pmap_insert(mode_map, mode_M, NULL);
-  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 (i = 0; i < get_irp_n_irgs(); i++)
-  {
+  /*  for each ir graph */
+  for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
     ir_graph *irg = get_irp_irg(i);
     set_irg_link(irg, NULL);
 
     type_walk_irg(irg, fw_collect_tore, NULL, NULL);
 
-    irg_walk_graph(irg, fw_clear_link, fw_collect_irn, NULL);
+    irg_walk_graph(irg, firm_clear_link, fw_collect_irn, NULL);
   }
 }
 
@@ -351,14 +339,12 @@ void firm_walk_finalize(void)
   int i;
 
   /* free all used maps and lists */
-  pmap_destroy(mode_map);
-  mode_map = NULL;
   pmap_destroy(type_map);
   type_map = NULL;
   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);
@@ -373,8 +359,8 @@ void firm_walk_finalize(void)
 /** Dumps the firm ir.
  *
  *  After initializing the firm walker by calling firm_walk_init()
- *  the firm structure could be accessed by definign the firm walk interface
- *  wif. This function could be called serveral times to customize the
+ *  the firm structure could be accessed by defining the firm walk interface
+ *  wif. This function could be called several times to customize the
  *  walk order or definitions.
  *
  *  @param wif Walk interface which contains the callback function
@@ -382,11 +368,11 @@ void firm_walk_finalize(void)
  *  @see firm_walk_interface */
 void firm_walk(firm_walk_interface *wif)
 {
-  int irg_i, block_i, block_list_len, irn_i, irn_list_len;
+  int mode_i, 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!");
 
@@ -394,11 +380,8 @@ void firm_walk(firm_walk_interface *wif)
   if (wif->do_mode_init) wif->do_mode_init(wif->env);
   if (wif->do_mode)
   {
-    for (entry = pmap_first(mode_map); entry; entry = pmap_next(mode_map))
-    {
-      set_mode_link((ir_mode*)entry->key, NULL);
-      wif->do_mode(entry->key, wif->env);
-    }
+    for (mode_i = get_irp_n_modes() - 1; mode_i >= 0; --mode_i)
+      wif->do_mode(get_irp_mode(mode_i), wif->env);
   }
   if (wif->do_mode_finalize) wif->do_mode_finalize(wif->env);
 
@@ -407,7 +390,7 @@ void firm_walk(firm_walk_interface *wif)
   if (wif->do_type)
   {
     for (entry = pmap_first(type_map); entry; entry = pmap_next(type_map))
-      wif->do_type((type *)entry->key, wif->env);
+      wif->do_type((ir_type *)entry->key, wif->env);
   }
   if (wif->do_type_finalize) wif->do_type_finalize(wif->env);
 
@@ -416,7 +399,7 @@ void firm_walk(firm_walk_interface *wif)
   if (wif->do_entity)
   {
     for (entry = pmap_first(entity_map); entry; entry = pmap_next(entity_map))
-      wif->do_entity((entity *)entry->key, wif->env);
+      wif->do_entity((ir_entity *)entry->key, wif->env);
   }
   if (wif->do_entity_finalize) wif->do_entity_finalize(wif->env);
 
@@ -426,18 +409,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);
@@ -447,12 +430,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
@@ -462,26 +445,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;
 }