X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firdump.c;h=ea837c2857ba406467f58a5ba155650336a3e862;hb=de8269f08de3f68e62dfc6fe7f0c29c976489fdd;hp=ee522391718af4ecae7b2f614bd7adb3f97fce27;hpb=d382d46d40faa79f071cf3eebd74fc47ad22b196;p=libfirm

diff --git a/ir/ir/irdump.c b/ir/ir/irdump.c
index ee5223917..ea837c285 100644
--- a/ir/ir/irdump.c
+++ b/ir/ir/irdump.c
@@ -45,7 +45,7 @@
 
 #include "irvrfy.h"
 
-#include "panic.h"
+#include "error.h"
 #include "array.h"
 #include "pmap.h"
 #include "eset.h"
@@ -219,7 +219,7 @@ const char *get_mode_name_ex(ir_mode *mode, int *bad)
  * returns the name of a type or <ERROR> if mode is NOT a mode object.
  * in the later case, sets bad
  */
-const char *get_type_name_ex(type *tp, int *bad)
+const char *get_type_name_ex(ir_type *tp, int *bad)
 {
   if (is_type(tp))
     return get_type_name(tp);
@@ -250,7 +250,7 @@ static void print_vcg_color(FILE *F, dumper_colors color) {
  * prints the edge from a type S to a type T with additional info fmt, ...
  * to the file F
  */
-static void print_type_type_edge(FILE *F, type *S, type *T, const char *fmt, ...)
+static void print_type_type_edge(FILE *F, ir_type *S, ir_type *T, const char *fmt, ...)
 {
   va_list ap;
 
@@ -266,7 +266,7 @@ static void print_type_type_edge(FILE *F, type *S, type *T, const char *fmt, ...
  * prints the edge from a type T to an entity E with additional info fmt, ...
  * to the file F
  */
-static void print_type_ent_edge(FILE *F, type *T, entity *E, const char *fmt, ...)
+static void print_type_ent_edge(FILE *F, ir_type *T, entity *E, const char *fmt, ...)
 {
   va_list ap;
 
@@ -302,7 +302,7 @@ static void print_ent_ent_edge(FILE *F, entity *E, entity *T, int backedge, cons
  * prints the edge from an entity E to a type T with additional info fmt, ...
  * to the file F
  */
-static void print_ent_type_edge(FILE *F, entity *E, type *T, const char *fmt, ...)
+static void print_ent_type_edge(FILE *F, entity *E, ir_type *T, const char *fmt, ...)
 {
   va_list ap;
 
@@ -318,7 +318,7 @@ static void print_ent_type_edge(FILE *F, entity *E, type *T, const char *fmt, ..
  * prints the edge from a node N to a type T with additional info fmt, ...
  * to the file F
  */
-static void print_node_type_edge(FILE *F, const ir_node *N, type *T, const char *fmt, ...)
+static void print_node_type_edge(FILE *F, const ir_node *N, ir_type *T, const char *fmt, ...)
 {
   va_list ap;
 
@@ -367,7 +367,7 @@ static void print_ent_node_edge(FILE *F, entity *E, const ir_node *N, const char
  * prints the edge from a type E to an enumeration item item with additional info fmt, ...
  * to the file F
  */
-static void print_enum_item_edge(FILE *F, type *E, int item, const char *fmt, ...)
+static void print_enum_item_edge(FILE *F, ir_type *E, int item, const char *fmt, ...)
 {
   va_list ap;
 
@@ -537,7 +537,7 @@ static ir_node **construct_block_lists(ir_graph *irg) {
   ir_graph *rem = current_ir_graph;
   current_ir_graph = irg;
 
-  for (i = 0; i < get_irp_n_irgs(); i++)
+  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);
@@ -742,7 +742,7 @@ static int dump_node_typeinfo(FILE *F, ir_node *n) {
   if (opt_dump_analysed_type_info) {
     if (get_irg_typeinfo_state(current_ir_graph) == ir_typeinfo_consistent  ||
         get_irg_typeinfo_state(current_ir_graph) == ir_typeinfo_inconsistent) {
-      type *tp = get_irn_typeinfo_type(n);
+      ir_type *tp = get_irn_typeinfo_type(n);
       if (tp != firm_none_type)
         fprintf(F, "[%s] ", get_type_name_ex(tp, &bad));
       else
@@ -858,6 +858,42 @@ static const pns_lookup_t alloc_lut[] = {
 #undef X
 };
 
+/** the lookup table for Proj(CopyB) names */
+static const pns_lookup_t copyb_lut[] = {
+#define X(a)    { pn_CopyB_##a, #a }
+  X(M),
+  X(X_except),
+  X(M_except)
+#undef X
+};
+
+/** the lookup table for Proj(InstOf) names */
+static const pns_lookup_t instof_lut[] = {
+#define X(a)    { pn_InstOf_##a, #a }
+  X(M),
+  X(X_except),
+  X(res),
+  X(M_except),
+#undef X
+};
+
+/** the lookup table for Proj(Raise) names */
+static const pns_lookup_t raise_lut[] = {
+#define X(a)    { pn_Raise_##a, #a }
+  X(M),
+  X(X),
+#undef X
+};
+
+/** the lookup table for Proj(Bound) names */
+static const pns_lookup_t bound_lut[] = {
+#define X(a)    { pn_Bound_##a, #a }
+  X(M),
+  X(X_except),
+  X(res),
+  X(M_except)
+#undef X
+};
 
 /** the Proj lookup table */
 static const proj_lookup_t proj_lut[] = {
@@ -871,7 +907,11 @@ static const proj_lookup_t proj_lut[] = {
   { iro_Mod,     E(mod_lut) },
   { iro_Load,    E(load_lut) },
   { iro_Store,   E(store_lut) },
-  { iro_Alloc,   E(alloc_lut) }
+  { iro_Alloc,   E(alloc_lut) },
+  { iro_CopyB,   E(copyb_lut) },
+  { iro_InstOf,  E(instof_lut) },
+  { iro_Raise,   E(raise_lut) },
+  { iro_Bound,   E(bound_lut) }
 #undef E
 };
 
@@ -908,6 +948,8 @@ handle_lut:
       fprintf (F, "%s ", get_pnc_string(get_Proj_proj(n)));
     else if (code == iro_Proj && get_irn_opcode(get_Proj_pred(pred)) == iro_Start)
       fprintf (F, "Arg %ld ", proj_nr);
+    else if (code == iro_Cond && get_irn_mode(get_Cond_selector(pred)) != mode_b)
+      fprintf (F, "%ld ", proj_nr);
     else {
       unsigned i, j, f = 0;
 
@@ -1280,7 +1322,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)
@@ -1289,108 +1331,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:
-    ;
   }
 }
 
@@ -1673,7 +1628,7 @@ static void dump_node2type_edges(ir_node *n, void *env)
 }
 
 #if 0
-static int print_type_info(FILE *F, type *tp) {
+static int print_type_info(FILE *F, ir_type *tp) {
   int bad = 0;
 
   if (get_type_state(tp) == layout_undefined) {
@@ -1688,7 +1643,7 @@ static int print_type_info(FILE *F, type *tp) {
   return bad;
 }
 
-static void print_typespecific_info(FILE *F, type *tp) {
+static void print_typespecific_info(FILE *F, ir_type *tp) {
   switch (get_type_tpop_code(tp)) {
   case tpo_class:
     {
@@ -1723,7 +1678,7 @@ static void print_typespecific_info(FILE *F, type *tp) {
 }
 #endif
 
-static void print_typespecific_vcgattr(FILE *F, type *tp) {
+static void print_typespecific_vcgattr(FILE *F, ir_type *tp) {
   switch (get_type_tpop_code(tp)) {
   case tpo_class:
     {
@@ -1759,7 +1714,7 @@ static void print_typespecific_vcgattr(FILE *F, type *tp) {
 }
 
 
-int dump_type_node(FILE *F, type *tp)
+int dump_type_node(FILE *F, ir_type *tp)
 {
   int bad = 0;
 
@@ -1804,7 +1759,7 @@ void dump_entity_node(FILE *F, entity *ent, int color)
 }
 #undef X
 
-static void dump_enum_item(FILE *F, type *tp, int pos)
+static void dump_enum_item(FILE *F, ir_type *tp, int pos)
 {
   char buf[1024];
   ident *id  = get_enumeration_nameid(tp, pos);
@@ -1872,7 +1827,7 @@ dump_type_info(type_or_ent *tore, void *env) {
     } break;
   case k_type:
     {
-      type *tp = (type *)tore;
+      ir_type *tp = (ir_type *)tore;
       dump_type_node(F, tp);
       /* and now the edges */
       switch (get_type_tpop_code(tp)) {
@@ -1971,7 +1926,7 @@ dump_class_hierarchy_node (type_or_ent *tore, void *ctx) {
   } break; /* case k_entity */
   case k_type:
     {
-      type *tp = (type *)tore;
+      ir_type *tp = (ir_type *)tore;
       if (tp == get_glob_type()) break;
       switch (get_type_tpop_code(tp)) {
         case tpo_class: {
@@ -2114,13 +2069,7 @@ void dump_vcg_header(FILE *F, const char *name, const char *orientation) {
        "port_sharing: no\n"
        "orientation: %s\n"
        "classname 1:  \"intrablock Data\"\n"
-       "classname 16: \"interblock Data\"\n"
        "classname 2:  \"Block\"\n"
-       "classname 13: \"Control Flow\"\n"
-       "classname 18: \"Exception Control Flow for Interval Analysis\"\n"
-       "classname 14: \"intrablock Memory\"\n"
-       "classname 17: \"interblock Memory\"\n"
-       "classname 15: \"Dominators\"\n"
        "classname 3:  \"Entity type\"\n"
        "classname 4:  \"Entity owner\"\n"
        "classname 5:  \"Method Param\"\n"
@@ -2131,6 +2080,13 @@ void dump_vcg_header(FILE *F, const char *name, const char *orientation) {
        "classname 10: \"Array Element Type\"\n"
        "classname 11: \"Overwrites\"\n"
        "classname 12: \"Member\"\n"
+       "classname 13: \"Control Flow\"\n"
+       "classname 14: \"intrablock Memory\"\n"
+       "classname 15: \"Dominators\"\n"
+       "classname 16: \"interblock Data\"\n"
+       "classname 17: \"interblock Memory\"\n"
+       "classname 18: \"Exception Control Flow for Interval Analysis\"\n"
+       "classname 19: \"Postdominators\"\n"
        "infoname 1: \"Attribute\"\n"
        "infoname 2: \"Verification errors\"\n"
        "infoname 3: \"Debug info\"\n",
@@ -2344,7 +2300,7 @@ void dump_ir_block_graph (ir_graph *irg, const char *suffix)
    * only the requested irg but also all irgs that can be reached
    * from irg.
    */
-  for (i = 0; i < get_irp_n_irgs(); i++) {
+  for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
     ir_node **arr = ird_get_irg_link(get_irp_irg(i));
     if (arr) {
       dump_graph_from_list(f, get_irp_irg(i));
@@ -2386,7 +2342,7 @@ void dump_ir_extblock_graph (ir_graph *irg, const char *suffix)
   dump_graph_info(F, irg);
   print_dbg_info(F, get_entity_dbg_info(ent));
 
-  for (i = 0; i < get_irp_n_irgs(); i++) {
+  for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
     ir_graph *irg     = get_irp_irg(i);
     list_tuple *lists = ird_get_irg_link(irg);
 
@@ -2477,7 +2433,7 @@ dump_ir_block_graph_w_types (ir_graph *irg, const char *suffix)
   /* dump common blocked ir graph */
   construct_block_lists(irg);
 
-  for (i = 0; i < get_irp_n_irgs(); i++) {
+  for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
     ir_node **arr = ird_get_irg_link(get_irp_irg(i));
     if (arr) {
       dump_graph_from_list(f, get_irp_irg(i));
@@ -2522,27 +2478,6 @@ dump_block_to_cfg(ir_node *block, void *env) {
     fprintf (F, "\" ");
     fprintf(F, "info1:\"");
 
-#if 0
-    if (dump_dominator_information_flag) {
-      fprintf(F, "dom depth %d\n", get_Block_dom_depth(block));
-      fprintf(F, "tree pre num %d\n", get_Block_dom_tree_pre_num(block));
-      fprintf(F, "max subtree pre num %d\n", get_Block_dom_max_subtree_pre_num(block));
-    }
-
-    /* show arity and possible Bad predecessors of the block */
-    fprintf(F, "arity: %d\n", get_Block_n_cfgpreds(block));
-    for (fl = i = 0; i < get_Block_n_cfgpreds(block); ++i) {
-      ir_node *pred = get_Block_cfgpred(block, i);
-      if (is_Bad(pred)) {
-        if (! fl)
-          fprintf(F, "Bad pred at pos: ");
-        fprintf(F, "%d ", i);
-        fl = 1;
-      }
-    }
-    if (fl)
-      fprintf(F, "\n");
-#else
     /* the generic version. */
     dump_irnode_to_file(F, block);
 
@@ -2550,7 +2485,6 @@ dump_block_to_cfg(ir_node *block, void *env) {
     for (i = 0; i < get_Block_n_cfgpreds(block); ++i)
       if ((fl = is_Bad(get_Block_cfgpred(block, i))))
         break;
-#endif
 
     fprintf (F, "\"");  /* closing quote of info */
 
@@ -2572,14 +2506,24 @@ dump_block_to_cfg(ir_node *block, void *env) {
         fprintf (F, "\"}\n");
       }
 
-    /* Dump dominator edge */
-    if (dump_dominator_information_flag && get_Block_idom(block)) {
-      pred = get_Block_idom(block);
-      fprintf (F, "edge: { sourcename: \"");
-      PRINT_NODEID(block);
-      fprintf (F, "\" targetname: \"");
-      PRINT_NODEID(pred);
-      fprintf (F, "\" " DOMINATOR_EDGE_ATTR "}\n");
+    /* Dump dominator/postdominator edge */
+    if (dump_dominator_information_flag) {
+      if (get_irg_dom_state(current_ir_graph) == dom_consistent && get_Block_idom(block)) {
+        pred = get_Block_idom(block);
+        fprintf (F, "edge: { sourcename: \"");
+        PRINT_NODEID(block);
+        fprintf (F, "\" targetname: \"");
+        PRINT_NODEID(pred);
+        fprintf (F, "\" " DOMINATOR_EDGE_ATTR "}\n");
+      }
+      if (get_irg_postdom_state(current_ir_graph) == dom_consistent && get_Block_ipostdom(block)) {
+        pred = get_Block_ipostdom(block);
+        fprintf (F, "edge: { sourcename: \"");
+        PRINT_NODEID(block);
+        fprintf (F, "\" targetname: \"");
+        PRINT_NODEID(pred);
+        fprintf (F, "\" " POSTDOMINATOR_EDGE_ATTR "}\n");
+      }
     }
   }
 }
@@ -2589,7 +2533,6 @@ dump_cfg (ir_graph *irg, const char *suffix)
 {
   FILE *f;
   ir_graph *rem = current_ir_graph;
-  int ddif = dump_dominator_information_flag;
   int ipv = get_interprocedural_view();
 
   /* if a filter is set, dump only the irg's that match the filter */
@@ -2606,14 +2549,10 @@ dump_cfg (ir_graph *irg, const char *suffix)
     set_interprocedural_view(0);
   }
 
-  if (get_irg_dom_state(irg) != dom_consistent)
-    dump_dominator_information_flag = 0;
-
   /* walk over the blocks in the graph */
   irg_block_walk(get_irg_end(irg), dump_block_to_cfg, NULL, f);
   dump_node(f, get_irg_bad(irg));
 
-  dump_dominator_information_flag = ddif;
   set_interprocedural_view(ipv);
   vcg_close(f);
   current_ir_graph = rem;
@@ -2696,7 +2635,7 @@ static int get_entity_color(entity *ent) {
 
 void dump_callgraph(const char *suffix) {
   FILE *F;
-  int i, n_irgs = get_irp_n_irgs();
+  int i;
   int rem = edge_label;
   edge_label = 1;
   //ident *prefix = new_id_from_str("java/");
@@ -2704,7 +2643,7 @@ void dump_callgraph(const char *suffix) {
   F = vcg_open_name("Callgraph", suffix);
   dump_vcg_header(F, "Callgraph", NULL);
 
-  for (i = 0; i < n_irgs; ++i) {
+  for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
     ir_graph *irg = get_irp_irg(i);
     entity *ent = get_irg_entity(irg);
     int j, n_callees = get_irg_n_callees(irg);
@@ -2740,13 +2679,13 @@ void dump_all_cg_block_graph(const char *suffix) {
   dump_vcg_header(f, "All_graphs", NULL);
 
   /* collect nodes in all irgs reachable in call graph*/
-  for (i = 0; i < get_irp_n_irgs(); i++)
+  for (i = get_irp_n_irgs() - 1; i >= 0; --i)
     ird_set_irg_link(get_irp_irg(i), NULL);
 
   cg_walk(clear_link, collect_node, NULL);
 
   /* dump all graphs */
-  for (i = 0; i < get_irp_n_irgs(); i++) {
+  for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
     current_ir_graph = get_irp_irg(i);
     assert(ird_get_irg_link(current_ir_graph));
     dump_graph_from_list(f, current_ir_graph);
@@ -2822,9 +2761,8 @@ dump_class_hierarchy (int entities, const char *suffix)
 
 void dump_all_ir_graphs(dump_graph_func *dmp_grph, const char *suffix) {
   int i;
-  for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
+  for (i = get_irp_n_irgs() - 1; i >= 0; --i)
     dmp_grph(get_irp_irg(i), suffix);
-  }
 }