X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firargs.c;h=0085968d71b7d90a8744550ded012f600bf10d7a;hb=2af743bb2ff323523cf6cf4f7dc593d4f7f95434;hp=4d49d55526e38f328798a0c08abe94b56c170b38;hpb=dd34e63771838b631b065155af27167156fd6c8f;p=libfirm

diff --git a/ir/ir/irargs.c b/ir/ir/irargs.c
index 4d49d5552..0085968d7 100644
--- a/ir/ir/irargs.c
+++ b/ir/ir/irargs.c
@@ -89,7 +89,7 @@ static int firm_emit_dbg(lc_appendable_t *app,
 /**
  * Beware: do not set the entity ld_name
  */
-static const char *get_entity_ld_name_ex(entity *ent) {
+static const char *get_entity_ld_name_ex(ir_entity *ent) {
   if (ent->ld_name)
     return get_entity_ld_name(ent);
   return get_entity_name(ent);
@@ -110,7 +110,7 @@ static int firm_emit(lc_appendable_t *app,
   char add[64];
   char buf[256];
   char tv_buf[256];
-  entity *ent;
+  ir_entity *ent;
 
   buf[0] = '\0';
   add[0] = '\0';
@@ -133,7 +133,10 @@ static int firm_emit(lc_appendable_t *app,
       snprintf(add, sizeof(add), "[%ld]", get_type_nr(X));
       break;
     case k_ir_graph:
-      snprintf(buf, sizeof(buf), "%s%s", A("irg"), get_entity_name(get_irg_entity(X)));
+      if (X == get_const_code_irg())
+        snprintf(buf, sizeof(buf), "%s<ConstCodeIrg>", A("irg"));
+      else
+        snprintf(buf, sizeof(buf), "%s%s", A("irg"), get_entity_name(get_irg_entity(X)));
       snprintf(add, sizeof(add), "[%ld]", get_irg_graph_nr(X));
       break;
     case k_ir_node:
@@ -160,7 +163,7 @@ static int firm_emit(lc_appendable_t *app,
         else
           snprintf(buf, sizeof(buf), "%s%s%s", A("irn"), get_irn_opname(X),
             get_mode_name(get_irn_mode(X)));
-        snprintf(add, sizeof(add), "[%ld]", get_irn_node_nr(X));
+        snprintf(add, sizeof(add), "[%ld:%d]", get_irn_node_nr(X), get_irn_idx(X));
       }
       break;
     case k_ir_mode:
@@ -171,7 +174,7 @@ static int firm_emit(lc_appendable_t *app,
       snprintf(buf, sizeof(buf), "%s%s", A("tv"), tv_buf);
       break;
     case k_ir_loop:
-      snprintf(buf, sizeof(buf), "ldepth[%d]", get_loop_depth(X));
+      snprintf(buf, sizeof(buf), "loop[%d:%d]", get_loop_loop_nr(X), get_loop_depth(X));
       break;
     case k_ir_op:
       snprintf(buf, sizeof(buf), "%s%s", A("op"), get_op_name(X));
@@ -276,7 +279,6 @@ lc_arg_env_t *firm_get_arg_env(void)
     X("irn_nr",    'N'),
     X("mode",      'm'),
     X("block",     'B'),
-    X("pnc",       '='),
     X("cg_path",   'P'),
   };
 
@@ -290,11 +292,11 @@ lc_arg_env_t *firm_get_arg_env(void)
     for (i = 0; i < sizeof(args)/sizeof(args[0]); ++i)
       lc_arg_register(env, args[i].name, args[i].letter, &firm_handler);
 
-    lc_arg_register(env, "firm:ident", 'I', &ident_handler);
-    lc_arg_register(env, "firm:indent", 'N', &indent_handler);
-    lc_arg_register(env, "firm:pnc",      '=', &pnc_handler);
+    lc_arg_register(env, "firm:ident",    'I', &ident_handler);
+    lc_arg_register(env, "firm:indent",   '>', &indent_handler);
     lc_arg_register(env, "firm:dbg_info", 'G', &debug_handler);
-    lc_arg_register(env, "firm:bitset", 'B', &bitset_handler);
+    lc_arg_register(env, "firm:bitset",   'B', &bitset_handler);
+    lc_arg_register(env, "firm:pnc",      '=', &pnc_handler);
   }
 
   return env;