X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=testprograms%2Fendless_loop.c;h=92e43538b38f78a617d628ca479f7162010ce4b9;hb=edbfa5108fb77e85068f0f9d1aba275d7b43419b;hp=0c9c7f8f4ac80f59afab2f4ad33bc062295292b2;hpb=76572961989e62cef01b295c6c8af7460f6080dd;p=libfirm

diff --git a/testprograms/endless_loop.c b/testprograms/endless_loop.c
index 0c9c7f8f4..92e43538b 100644
--- a/testprograms/endless_loop.c
+++ b/testprograms/endless_loop.c
@@ -24,9 +24,9 @@
 *
 *  VAR_A is some extern variable.
 *
-*  main(int a) {        // pos 0
-*    int b = 1;         // pos 1
-*    int h;             // pos 2
+*  main(int a) {        //  pos 0
+*    int b = 1;         //  pos 1
+*    int h;             //  pos 2
 *
 *    while (0 == 0) loop {
 *      h = a;
@@ -59,20 +59,21 @@ main(void)
   set_opt_global_cse(0);
   set_opt_dead_node_elimination (1);
 
-  prim_t_int = new_type_primitive(id_from_str ("int", 3), mode_Is);
+  prim_t_int = new_type_primitive(new_id_from_chars ("int", 3), mode_Is);
 
 #define METHODNAME "main_tp"
 #define NRARGS 1
 #define NRES 1
 
-  proc_main = new_type_method(id_from_str(METHODNAME, strlen(METHODNAME)),
+  proc_main = new_type_method(new_id_from_chars(METHODNAME, strlen(METHODNAME)),
                               NRARGS, NRES);
   set_method_param_type(proc_main, 0, prim_t_int);
   set_method_res_type(proc_main, 0, prim_t_int);
 
 
-  owner = new_type_class (id_from_str ("ENDLESS_LOOP_EXAMPLE", 20));
-  ent = new_entity (owner, id_from_str ("main", strlen("main")), proc_main);
+  owner = new_type_class (new_id_from_chars ("ENDLESS_LOOP_EXAMPLE", 20));
+  ent = new_entity (owner, new_id_from_chars ("main", strlen("main")), proc_main);
+  get_entity_ld_name(ent); /* force name mangling */
 
   /* Generates start and end blocks and nodes and a first, initial block */
   irg = new_ir_graph (ent, 4);
@@ -82,22 +83,22 @@ main(void)
   set_value (1, new_Const (mode_Is, new_tarval_from_long (1, mode_Is)));
 
   x = new_Jmp();
-  mature_block (get_irg_current_block(irg));
+  mature_immBlock (get_irg_current_block(irg));
 
   /* generate a block for the loop header and the conditional branch */
   r = new_immBlock ();
-  add_in_edge (r, x);
+  add_immBlock_pred (r, x);
   x = new_Cond (new_Proj(new_Cmp(new_Const (mode_Is, new_tarval_from_long (0, mode_Is)),
-				 new_Const (mode_Is, new_tarval_from_long (0, mode_Is))),
-			 mode_b, Eq));
+                 new_Const (mode_Is, new_tarval_from_long (0, mode_Is))),
+             mode_b, pn_Cmp_Eq));
   f = new_Proj (x, mode_X, 0);
   t = new_Proj (x, mode_X, 1);
 
   /* generate the block for the loop body */
   b = new_immBlock ();
-  add_in_edge (b, t);
+  add_immBlock_pred (b, t);
   x = new_Jmp ();
-  add_in_edge (r, x);
+  add_immBlock_pred (r, x);
 
   /* The code in the loop body,
      as we are dealing with local variables only the dataflow edges
@@ -111,17 +112,17 @@ main(void)
                                   new_simpleSel(
                                     get_store(),
                                     get_irg_globals(irg),
-                                    new_entity(get_glob_type(),id_from_str("VAR_A",6),prim_t_int)),
+                                    new_entity(get_glob_type(),new_id_from_chars("VAR_A",6),prim_t_int)),
                                   get_value(1, mode_Is)),
                        mode_M, 0));
 
-  mature_block (b);
-  mature_block (r);
+  mature_immBlock (b);
+  mature_immBlock (r);
 
   /* generate the return block */
   r = new_immBlock ();
-  add_in_edge (r, f);
-  mature_block (r);
+  add_immBlock_pred (r, f);
+  mature_immBlock (r);
 
   {
      ir_node *in[1];
@@ -131,10 +132,10 @@ main(void)
   }
 
   /* finalize the end block generated in new_ir_graph() */
-  add_in_edge (get_irg_end_block(irg), x);
-  mature_block (get_irg_end_block(irg));
+  add_immBlock_pred (get_irg_end_block(irg), x);
+  mature_immBlock (get_irg_end_block(irg));
 
-  finalize_cons (irg);
+  irg_finalize_cons (irg);
 
   printf("Optimizing ...\n");
 
@@ -146,10 +147,11 @@ main(void)
 
   /* output the vcg file */
   printf("Done building the graph.  Dumping it.\n");
-  //turn_of_edge_labels();
+  /* turn_of_edge_labels(); */
   dump_keepalive_edges(true);
-  dump_all_types();
-  dump_ir_block_graph (irg);
+  char *dump_file_suffix = "";
+  dump_all_types(dump_file_suffix);
+  dump_ir_block_graph (irg, dump_file_suffix);
   printf("Use xvcg to view this graph:\n");
   printf("/ben/goetz/bin/xvcg GRAPHNAME\n\n");