X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firdump.c;h=4c0af7b5b7b681e048dfaf735dfe4953813afdaf;hb=e1c33a238578342a072e1c95ff12eefe6d0acd37;hp=2f2b1dfde5f8d456e0b53101300dbe0fef0801c5;hpb=bde6becdf52638e01f5cbc5dc1fd2f24ae74cd69;p=libfirm

diff --git a/ir/ir/irdump.c b/ir/ir/irdump.c
index 2f2b1dfde..4c0af7b5b 100644
--- a/ir/ir/irdump.c
+++ b/ir/ir/irdump.c
@@ -23,6 +23,8 @@
 
 #include "firm_common_t.h"
 
+#include "list.h"
+
 #include "irnode.h"
 #include "irgraph.h"
 #include "irprog_t.h"
@@ -40,12 +42,13 @@
 #include "irloop_t.h"
 #include "callgraph.h"
 #include "irextbb_t.h"
+#include "irhooks.h"
 #include "dbginfo_t.h"
 #include "irtools.h"
 
 #include "irvrfy.h"
 
-#include "panic.h"
+#include "error.h"
 #include "array.h"
 #include "pmap.h"
 #include "eset.h"
@@ -81,11 +84,14 @@ static int dump_keepalive = 0;
 /** An option to dump ld_names instead of names. */
 static int dump_ld_name = 1;
 /** Compiler options to dump analysis information in dump_ir_graph */
-int dump_out_edge_flag = 0;
+static int dump_out_edge_flag = 0;
+static int dump_loop_information_flag = 0;
+static int dump_backedge_information_flag = 1;
+static int dump_const_local = 0;
+/** An option to dump all graph anchors */
+static int dump_anchors = 0;
+
 int dump_dominator_information_flag = 0;
-int dump_loop_information_flag = 0;
-int dump_backedge_information_flag = 1;
-int dump_const_local = 0;
 int opt_dump_analysed_type_info = 1;
 int opt_dump_pointer_values_to_info = 0;  /* default off: for test compares!! */
 
@@ -105,6 +111,19 @@ DUMP_NODE_EDGE_FUNC get_dump_node_edge_hook(void)
 }
 
 
+static DUMP_NODE_EDGE_FUNC dump_block_edge_hook = NULL;
+
+void set_dump_block_edge_hook(DUMP_NODE_EDGE_FUNC func)
+{
+  dump_block_edge_hook = func;
+}
+
+DUMP_NODE_EDGE_FUNC get_dump_block_edge_hook(void)
+{
+  return dump_node_edge_hook;
+}
+
+
 /** The vcg node attribute hook. */
 static DUMP_IR_GRAPH_FUNC dump_ir_graph_hook = NULL;
 /** The vcg node attribute hook. */
@@ -125,7 +144,7 @@ void set_dump_edge_vcgattr_hook(DUMP_EDGE_VCGATTR_FUNC hook) {
   dump_edge_vcgattr_hook = hook;
 }
 
-INLINE int get_opt_dump_const_local(void) {
+int get_opt_dump_const_local(void) {
   if (!dump_out_edge_flag && !dump_loop_information_flag)
     return dump_const_local;
   else
@@ -201,6 +220,10 @@ void dump_ld_names(int flag) {
   dump_ld_name = flag;
 }
 
+void dump_all_anchors(int flag) {
+  dump_anchors = flag;
+}
+
 /* -------------- some extended helper functions ----------------- */
 
 /**
@@ -494,6 +517,27 @@ static int node_floats(ir_node *n) {
       (get_irg_pinned(current_ir_graph) == op_pin_state_floats));
 }
 
+/**
+ *  Walker that visits the anchors
+ */
+static void ird_walk_graph(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post, void *env) {
+  irg_walk_graph(irg, pre, post, env);
+
+  if (dump_anchors) {
+    int i;
+
+    for (i = anchor_max - 1; i >= 0; --i) {
+      ir_node *n = irg->anchors[i];
+
+      if (n) {
+        /* reset the visit flag: will be increase in the walker */
+        set_irg_visited(irg, get_irg_visited(irg) - 1);
+        irg_walk(n, pre, post, env);
+      }
+    }
+  }
+}
+
 /**
  * Walker, allocates an array for all blocks and puts it's nodes non-floating nodes into this array.
  */
@@ -540,7 +584,7 @@ static ir_node **construct_block_lists(ir_graph *irg) {
   for (i = get_irp_n_irgs() - 1; i >= 0; --i)
     ird_set_irg_link(get_irp_irg(i), NULL);
 
-  irg_walk_graph(current_ir_graph, clear_link, collect_node, current_ir_graph);
+  ird_walk_graph(current_ir_graph, clear_link, collect_node, current_ir_graph);
 
   /* Collect also EndReg and EndExcept. We do not want to change the walker. */
   set_interprocedural_view(0);
@@ -561,8 +605,10 @@ typedef struct _list_tuple {
   ir_extblk **extbb_list;
 } list_tuple;
 
-/** Construct lists to walk ir extended block-wise.
+/** Construct lists to walk IR extended block-wise.
  * Free the lists in the tuple with DEL_ARR_F().
+ * Sets the irg link field to NULL in all
+ * graphs not visited.
  */
 static list_tuple *construct_extblock_lists(ir_graph *irg) {
   ir_node **blk_list = construct_block_lists(irg);
@@ -575,6 +621,7 @@ static list_tuple *construct_extblock_lists(ir_graph *irg) {
   lists->blk_list   = NEW_ARR_F(ir_node *, 0);
   lists->extbb_list = NEW_ARR_F(ir_extblk *, 0);
 
+  inc_irg_block_visited(irg);
   for (i = ARR_LEN(blk_list) - 1; i >= 0; --i) {
     ir_extblk *ext;
 
@@ -589,9 +636,9 @@ static list_tuple *construct_extblock_lists(ir_graph *irg) {
     else
       ARR_APP1(ir_node *, lists->blk_list, blk_list[i]);
   }
+  DEL_ARR_F(blk_list);
 
   current_ir_graph = rem;
-  DEL_ARR_F(blk_list);
   ird_set_irg_link(irg, lists);
   return lists;
 }
@@ -891,7 +938,6 @@ static const pns_lookup_t bound_lut[] = {
   X(M),
   X(X_except),
   X(res),
-  X(M_except)
 #undef X
 };
 
@@ -1077,6 +1123,10 @@ static void dump_node_vcgattr(FILE *F, ir_node *node, ir_node *local, int bad)
   case iro_Phi:
     print_vcg_color(F, ird_color_green);
     break;
+  case iro_Mux:
+  case iro_Psi:
+    print_vcg_color(F, ird_color_gold);
+    break;
   case iro_Const:
   case iro_Proj:
   case iro_Filter:
@@ -1088,6 +1138,25 @@ static void dump_node_vcgattr(FILE *F, ir_node *node, ir_node *local, int bad)
   }
 }
 
+/* Adds a new node info dumper callback. */
+void *dump_add_node_info_callback(dump_node_info_cb_t *cb, void *data)
+{
+  hook_entry_t *info = xmalloc(sizeof(*info));
+
+  info->hook._hook_node_info = cb;
+  info->context              = data;
+  register_hook(hook_node_info, info);
+
+  return info;
+}
+
+/* Remove a previously added info dumper callback. */
+void dump_remv_node_info_callback(void *handle)
+{
+  hook_entry_t *info = handle;
+  unregister_hook(hook_node_info, info);
+  xfree(info);
+}
 
 /**
  * Dump the node information of a node n to a file F.
@@ -1102,6 +1171,9 @@ static INLINE int dump_node_info(FILE *F, ir_node *n)
   /* call the dump_node operation if available */
   if (ops->dump_node)
     bad = ops->dump_node(n, F, dump_node_info_txt);
+
+  /* allow additional info to be added */
+  hook_node_info(F, n);
   fprintf(F, "\"\n");
 
   return bad;
@@ -1322,7 +1394,7 @@ print_edge_vcgattr(FILE *F, ir_node *from, int to) {
   case iro_Block:
     fprintf (F, CF_EDGE_ATTR);
     break;
-  case iro_Start:   break;
+  case iro_Start:  break;
   case iro_End:
     if (to >= 0) {
       if (get_irn_mode(get_End_keepalive(from, to)) == mode_BB)
@@ -1331,108 +1403,21 @@ print_edge_vcgattr(FILE *F, ir_node *from, int to) {
     fprintf (F, INTER_MEM_EDGE_ATTR);
     }
     break;
-  case iro_EndReg:
-  case iro_EndExcept:
-  case iro_Jmp:
-  case iro_Break:
-  case iro_Cond:
-    print_data_edge_vcgattr(F, from, to);
-    break;
-  case iro_Return:
-  case iro_Raise:
-    if (to == 0)
-      print_mem_edge_vcgattr(F, from, to);
-    else
-      print_data_edge_vcgattr(F, from, to);
-    break;
-  case iro_Const:
-  case iro_SymConst:
-    print_data_edge_vcgattr(F, from, to);
-    break;
-  case iro_Sel:
-  case iro_Call:
-    if (to == 0)
-      print_mem_edge_vcgattr(F, from, to);
-    else
-      print_data_edge_vcgattr(F, from, to);
-    break;
-  case iro_CallBegin:
-  case iro_Add:
-  case iro_Sub:
-  case iro_Minus:
-  case iro_Mul:
-    print_data_edge_vcgattr(F, from, to);
-    break;
-  case iro_Quot:
-  case iro_DivMod:
-  case iro_Div:
-  case iro_Mod:
-    if (to == 0)
-      print_mem_edge_vcgattr(F, from, to);
-    else
-      print_data_edge_vcgattr(F, from, to);
-    break;
-  case iro_Abs:
-  case iro_And:
-  case iro_Or:
-  case iro_Eor:
-  case iro_Shl:
-  case iro_Shr:
-  case iro_Shrs:
-  case iro_Rot:
-  case iro_Cmp:
-  case iro_Conv:
-      print_data_edge_vcgattr(F, from, to);
-    break;
-  case iro_Phi:
-    if (get_irn_modecode(from) == irm_M)
-      fprintf (F, INTER_MEM_EDGE_ATTR);
-    else
-      print_data_edge_vcgattr(F, from, to);
-    break;
-  case iro_Load:
-  case iro_Store:
-  case iro_Alloc:
-  case iro_Free:
-    if (to == 0)
-      print_mem_edge_vcgattr(F, from, to);
-    else
-      print_data_edge_vcgattr(F, from, to);
-    break;
-  case iro_Sync:
-    print_mem_edge_vcgattr(F, from, to);
-    break;
-  case iro_Tuple:  break;
-  case iro_Proj:
-  case iro_Filter:
-    switch (get_irn_modecode(from)) {
-    case irm_X:
-      fprintf (F, CF_EDGE_ATTR);
-      break;
-    case irm_M:
-      fprintf (F, INTER_MEM_EDGE_ATTR);
-      break;
-    default:
-      print_data_edge_vcgattr(F, from, to);
-      break;
+  default:
+    if (is_Proj(from)) {
+      if (get_irn_mode(from) == mode_M)
+        print_mem_edge_vcgattr(F, from, to);
+      else if (get_irn_mode(from) == mode_X)
+        fprintf(F, CF_EDGE_ATTR);
+      else
+        print_data_edge_vcgattr(F, from, to);
     }
-    break;
-  case iro_Bad:     break;
-  case iro_Unknown: break;
-  case iro_Id:
-    switch (get_irn_modecode(from)) {
-    case irm_M:
-      fprintf (F, INTRA_MEM_EDGE_ATTR);
-      break;
-    case irm_X:
+    else if (get_irn_mode(get_irn_n(from, to)) == mode_M)
+      print_mem_edge_vcgattr(F, from, to);
+    else if (get_irn_mode(get_irn_n(from, to)) == mode_X)
       fprintf (F, CF_EDGE_ATTR);
-      break;
-    default:
+    else
       print_data_edge_vcgattr(F, from, to);
-      break;
-    } break;
-  default:
-    ;
   }
 }
 
@@ -1551,6 +1536,9 @@ dump_whole_block(FILE *F, ir_node *block) {
   /* dump the blocks edges */
   dump_ir_data_edges(F, block);
 
+  if (dump_block_edge_hook)
+    dump_block_edge_hook(F, block);
+
   /* dump the nodes that go into the block */
   for (node = ird_get_irn_link(block); node; node = ird_get_irn_link(node)) {
     dump_node(F, node);
@@ -1636,7 +1624,6 @@ dump_extblock_graph(FILE *F, ir_graph *irg) {
   ir_extblk **arr = ird_get_irg_link(irg);
   current_ir_graph = irg;
 
-  compute_extbb(irg);
   for (i = ARR_LEN(arr) - 1; i >= 0; --i) {
     ir_extblk *extbb = arr[i];
     ir_node *leader = get_extbb_leader(extbb);
@@ -1688,11 +1675,8 @@ static void dump_node2type_edges(ir_node *n, void *env)
     /* @@@ some consts have an entity */
     break;
   case iro_SymConst:
-    if (   (get_SymConst_kind(n) ==symconst_type_tag)
-       || (get_SymConst_kind(n) ==symconst_size))
-      {
-        print_node_type_edge(F,n,get_SymConst_type(n),NODE2TYPE_EDGE_ATTR);
-      }
+    if (SYMCONST_HAS_TYPE(get_SymConst_kind(n)))
+      print_node_type_edge(F,n,get_SymConst_type(n),NODE2TYPE_EDGE_ATTR);
     break;
   case iro_Sel: {
       print_node_ent_edge(F,n,get_Sel_entity(n),NODE2TYPE_EDGE_ATTR);
@@ -2353,7 +2337,7 @@ dump_ir_graph (ir_graph *irg, const char *suffix )
 
   /* walk over the graph */
   /* dump_whole_node must be called in post visiting predecessors */
-  irg_walk(get_irg_end(irg), NULL, dump_whole_node, f);
+  ird_walk_graph(irg, NULL, dump_whole_node, f);
 
   /* dump the out edges in a separate walk */
   if ((dump_out_edge_flag) && (get_irg_outs_state(irg) != outs_none)) {
@@ -2409,7 +2393,8 @@ void dump_ir_extblock_graph (ir_graph *irg, const char *suffix)
   if (!is_filtered_dump_name(get_entity_ident(get_irg_entity(irg))))
     return;
 
-  compute_extbb(irg);
+  if (get_irg_extblk_state(irg) != extblk_valid)
+    compute_extbb(irg);
 
   if (get_interprocedural_view()) suffix1 = "-ip";
   else                            suffix1 = "";