- remove modecode concept which is pointless nowadays

[libfirm] / ir / ir / irdump_grgen.c

diff --git a/ir/ir/irdump_grgen.c b/ir/ir/irdump_grgen.c
index f5f6371..72babd6 100644 (file)
--- a/ir/ir/irdump_grgen.c
+++ b/ir/ir/irdump_grgen.c
@@ -42,6 +42,7 @@
 #include "tv.h"
 #include "irgwalk.h"
 #include "firm_types.h"
+#include "irdump_grgen.h"
 
 
 typedef struct
@@ -114,7 +115,7 @@ static int edge_counter;
 
 irg_grgen_dumper_env_t *init_irg_grgen_dumper(char *file, int append)
 {
-       irg_grgen_dumper_env_t *const grgen_dumper_env = xmalloc(sizeof(*grgen_dumper_env));
+       irg_grgen_dumper_env_t *const grgen_dumper_env = XMALLOC(irg_grgen_dumper_env_t);
        FILE *fp;
 
        if(append)
@@ -216,9 +217,9 @@ void dump_irg_grgen(ir_graph *irg, char *suffix)
 {
   char filename[100] = "";
 
-  strncat(filename, get_entity_name(get_irg_entity(irg)), 100);
-  strncat(filename, suffix, 100);
-  strncat(filename, ".grg", 100);
+  strncat(filename, get_entity_name(get_irg_entity(irg)), sizeof(filename)-1);
+  strncat(filename, suffix, sizeof(filename)-1);
+  strncat(filename, ".grg", sizeof(filename)-1);
 
   dump_irg_grgen_file(irg, filename, 0);
 }
@@ -240,7 +241,7 @@ static int dump_pattern(grgen_dumpinfo_t *dump_info, FILE *fp)
                ir_node *n = (ir_node *) entry->key;
 
                // Dump node
-               if(get_irn_opcode(n) == iro_Proj && get_irn_modecode(n) == irm_M)
+               if(get_irn_opcode(n) == iro_Proj && get_irn_mode(n) == mode_M)
                        uses_memory = 1;
                dump_grg_node(n, dump_info, fp);
                dump_grgen_mode(n, dump_info, fp, NULL);
@@ -390,22 +391,21 @@ static void dump_grgen_mode(ir_node *n, grgen_dumpinfo_t *dump_info, FILE *fp, i
 
 static char *dump_grgen_mode_node(ir_mode *irn_mode, grgen_dumpinfo_t *dump_info, FILE *fp)
 {
-       modecode mode_code = get_mode_modecode(irn_mode);
        const char *mode_name =  get_mode_name(irn_mode);
        char *mode_node_name;
 
-       if(!pmap_contains(dump_info -> mode_name_map, (void *) mode_code))
+       if(!pmap_contains(dump_info -> mode_name_map, irn_mode))
        {
                // No, create a new mode-node
                mode_node_name = obstack_alloc(&(dump_info -> mode_names), MAX_NODENAME_LEN);
                sprintf(mode_node_name, "mode_%s_node", mode_name);
-               pmap_insert(dump_info -> mode_name_map, (void *) mode_code, mode_node_name);
+               pmap_insert(dump_info -> mode_name_map, irn_mode, mode_node_name);
                fprintf(fp, "%s%s : Mode_%s;\n", indent, mode_node_name, mode_name);
                return(mode_node_name);
        }
        else
        {
-               return((char *) pmap_get(dump_info -> mode_name_map, (void *) mode_code));
+               return((char *) pmap_get(dump_info -> mode_name_map, irn_mode));
        }
 
 }