Simplify x87 sim_Return().
[libfirm] / ir / be / bedump.c
index 74dc9fe..1e43f38 100644 (file)
@@ -56,11 +56,11 @@ static void dump_ifg_edges(FILE *F, const be_ifg_t *ifg)
                        if (get_irn_node_nr(node) >= get_irn_node_nr(neighbour))
                                continue;
 
-                       fprintf(F, "edge: {sourcename: \"");
-                       PRINT_NODEID(node);
-                       fprintf(F, "\" targetname: \"");
-                       PRINT_NODEID(neighbour);
-                       fprintf(F, "\" arrowstyle:none class:1}\n");
+                       fprintf(F, "edge: {sourcename: ");
+                       print_nodeid(F, node);
+                       fprintf(F, " targetname: ");
+                       print_nodeid(F, neighbour);
+                       fprintf(F, " arrowstyle:none class:1}\n");
                }
        }
 }
@@ -84,20 +84,17 @@ void be_dump_ifg(FILE *F, ir_graph *irg, const be_ifg_t *ifg)
 static void dump_affinity_edges(FILE *F, const copy_opt_t *co,
                                 bool dump_costs, bool dump_colors)
 {
-       affinity_node_t *a;
        co_gs_foreach_aff_node(co, a) {
-               neighb_t *n;
-
                co_gs_foreach_neighb(a, n) {
                        /* edges are bidirection, dumping one direction is enough */
                        if (get_irn_node_nr(a->irn) >= get_irn_node_nr(n->irn))
                                continue;
 
-                       fprintf(F, "edge: {sourcename: \"");
-                       PRINT_NODEID(a->irn);
-                       fprintf(F, "\" targetname: \"");
-                       PRINT_NODEID(n->irn);
-                       fprintf(F, "\" arrowstyle:none");
+                       fprintf(F, "edge: {sourcename: ");
+                       print_nodeid(F, a->irn);
+                       fprintf(F, " targetname: ");
+                       print_nodeid(F, n->irn);
+                       fprintf(F, " arrowstyle:none");
 
                        if (dump_costs)
                                fprintf(F, " label:\"%d\"", n->costs);
@@ -155,7 +152,7 @@ void be_dump_liveness_block(void *context, FILE *F, const ir_node *bl)
 {
        if (is_Block(bl)) {
                be_lv_t *lv = (be_lv_t*)context;
-               be_lv_info_t *info = (be_lv_info_t*)ir_nodehashmap_get(&lv->map, bl);
+               be_lv_info_t *info = ir_nodehashmap_get(be_lv_info_t, &lv->map, bl);
 
                fprintf(F, "liveness:\n");
                if (info != NULL) {