Correct comment: xvcg wants LF, not CR.

[libfirm] / ir / ir / irargs.c

diff --git a/ir/ir/irargs.c b/ir/ir/irargs.c
index 17b320a..40bdfbb 100644 (file)
--- a/ir/ir/irargs.c
+++ b/ir/ir/irargs.c
@@ -21,7 +21,6 @@
  * @file
  * @brief    Support for libcore IR object output.
  * @author   Sebastian Hack
- * @version  $Id$
  */
 #include "config.h"
 
@@ -37,6 +36,7 @@
 #include "irloop_t.h"
 #include "tv_t.h"
 #include "dbginfo_t.h"
+#include "util.h"
 
 /**
  * identify a firm object type
@@ -140,7 +140,7 @@ static int firm_emit(lc_appendable_t *app,
        case k_entity: {
                ir_entity *entity = (ir_entity*)X;
                snprintf(buf, sizeof(buf), "%s%s", A("ent"),
-                       isupper(occ->conversion) ? get_entity_ld_name_ex(entity): get_entity_name(entity));
+                       isupper((unsigned char)occ->conversion) ? get_entity_ld_name_ex(entity): get_entity_name(entity));
                snprintf(add, sizeof(add), "[%ld]", get_entity_nr(entity));
                break;
        }
@@ -189,6 +189,9 @@ static int firm_emit(lc_appendable_t *app,
                        } else if (is_Sel(node)) {
                                snprintf(buf, sizeof(buf), "%s%s %s[%s]", A("irn"), get_irn_opname(node),
                                get_mode_name(get_irn_mode(node)), get_entity_name(get_Sel_entity(node)));
+                       } else if (is_Cmp(node)) {
+                               ir_relation relation = get_Cmp_relation(node);
+                               snprintf(buf, sizeof(buf), "%s%s %s", A("irn"), get_irn_opname(node), get_relation_string(relation));
                        } else {
                                snprintf(buf, sizeof(buf), "%s%s %s", A("irn"), get_irn_opname(node),
                                get_mode_name(get_irn_mode(node)));
@@ -290,7 +293,7 @@ static int firm_emit_pnc(lc_appendable_t *app,
     const lc_arg_occ_t *occ, const lc_arg_value_t *arg)
 {
        int value = arg->v_int;
-       const char *p = get_pnc_string(value);
+       const char *p = get_relation_string(value);
 
        return lc_arg_append(app, occ, p, strlen(p));
 }
@@ -330,7 +333,7 @@ lc_arg_env_t *firm_get_arg_env(void)
                lc_arg_add_std(env);
 
                lc_arg_register(env, "firm", 'F', &firm_handler);
-               for (i = 0; i < sizeof(args)/sizeof(args[0]); ++i)
+               for (i = 0; i != ARRAY_SIZE(args); ++i)
                        lc_arg_register(env, args[i].name, args[i].letter, &firm_handler);
 
                lc_arg_register(env, "firm:ident",    'I', &ident_handler);