-#define CALLGRAPH_EDGE_ATTR "calls"
-
-
-#if DEBUG_libfirm && NODEID_AS_LABEL
-#define PRINT_NODEID(X) fprintf(F, "n%ld", get_irn_node_nr(X))
-#define PRINT_TYPEID(X) fprintf(F, "\"t%ld\"", get_type_nr(X))
-#define PRINT_ENTID(X) fprintf(F, "e%ld", get_entity_nr(X))
-#define PRINT_IRGID(X) fprintf(F, "g%ld", get_irg_graph_nr(X))
-#define PRINT_CONSTID(X,Y) fprintf(F, "\"n%ldn%ld\"", get_irn_node_nr(X),get_irn_node_nr(Y))
-#define PRINT_LOOPID(X) fprintf(F, "l%d", get_loop_loop_nr(X))
-#define PRINT_ITEMID(X,Y) fprintf(F, "i%ldT%d", get_type_nr(X), (Y))
-
-#else
-#define PRINT_NODEID(X) fprintf(F, "n%p", (void *)(X))
-#define PRINT_TYPEID(X) fprintf(F, "\"t%p\"", (void *)(X))
-#define PRINT_ENTID(X) fprintf(F, "e%p", (void *)(X))
-#define PRINT_IRGID(X) fprintf(F, "g%p",(void *)(X))
-#define PRINT_CONSTID(X,Y) fprintf(F, "\"n%pn%p\"", (void*)(X), (void*)(Y))
-#define PRINT_LOOPID(X) fprintf(F, "l%p", (void *)(X))
-#define PRINT_ITEMID(X,Y) fprintf(F, "i%pT%d", (void *) (X), (Y))
-#endif
-
+/* #define CALLGRAPH_EDGE_ATTR "calls" */
+
+#define PRINT_NODEID(X) fprintf(F, "n%ld", get_irn_node_nr(X))
+#define PRINT_TYPEID(X) fprintf(F, "\"t%ld\"", get_type_nr(X))
+#define PRINT_ENTID(X) fprintf(F, "e%ld", get_entity_nr(X))
+#define PRINT_IRGID(X) fprintf(F, "g%ld", get_irg_graph_nr(X))
+#define PRINT_CONSTID(X,Y) fprintf(F, "\"n%ldn%ld\"", get_irn_node_nr(X),get_irn_node_nr(Y))
+#define PRINT_CONSTBLKID(X,Y) fprintf(F, "n%ldb%ld", get_irn_node_nr(X),get_irn_node_nr(Y))
+#define PRINT_LOOPID(X) fprintf(F, "l%d", get_loop_loop_nr(X))
+#define PRINT_ITEMID(X,Y) fprintf(F, "i%ldT%d", get_type_nr(X), (Y))
+#define PRINT_EXTBBID(X) fprintf(F, "x%ld", get_irn_node_nr(X))