added missing include, removed warning

[libfirm] / ir / ir / irargs.c

diff --git a/ir/ir/irargs.c b/ir/ir/irargs.c
index 80d9404..541f6f6 100644 (file)
--- a/ir/ir/irargs.c
+++ b/ir/ir/irargs.c
@@ -14,6 +14,8 @@
 # include "config.h"
 #endif
 
+#ifdef WITH_LIBCORE
+
 #include "bitset.h"
 
 #include <ctype.h>
@@ -53,7 +55,7 @@ static int bitset_emit(lc_appendable_t *app,
   const char *prefix = "";
 
   lc_arg_append(app, occ, "[", 1);
-  for(p = bitset_next_set(b, 0); p != -1; p = bitset_next_set(b, p)) {
+  bitset_foreach(b, p) {
     int n;
 
     n = snprintf(buf, sizeof(buf), "%s%d", prefix, (int) p);
@@ -84,6 +86,15 @@ static int firm_emit_dbg(lc_appendable_t *app,
   return lc_arg_append(app, occ, buf, strlen(buf));
 }
 
+/**
+ * Beware: do not set the entity ld_name
+ */
+static const char *get_entity_ld_name_ex(entity *ent) {
+  if (ent->ld_name)
+    return get_entity_ld_name(ent);
+  return get_entity_name(ent);
+}
+
 /**
  * emit a Firm object
  */
@@ -114,7 +125,7 @@ static int firm_emit(lc_appendable_t *app,
       break;
     case k_entity:
       snprintf(buf, sizeof(buf), "%s%s", A("ent"),
-          isupper(occ->conversion) ? get_entity_ld_name(X): get_entity_name(X));
+          isupper(occ->conversion) ? get_entity_ld_name_ex(X): get_entity_name(X));
       snprintf(add, sizeof(add), "[%ld]", get_entity_nr(X));
       break;
     case k_type:
@@ -275,8 +286,10 @@ lc_arg_env_t *firm_get_arg_env(void)
     lc_arg_register(env, "firm:indent", 'D', &indent_handler);
     lc_arg_register(env, "firm:pnc",      '=', &pnc_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);
   }
 
   return env;
 }
+
+#endif /* WITH_LIBCORE */