X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=testprograms%2Fif_while_example.c;h=7cfaa96cbadf213ac2996ddf42a4e95e9083d259;hb=679646fa6698429ad5e2b295e9a0d1db1ccd1e74;hp=63ace9d60b8bb63e7c41d44a5ca91d08243db5cf;hpb=3a54957505decc179c0951298bce7e0361a79462;p=libfirm

diff --git a/testprograms/if_while_example.c b/testprograms/if_while_example.c
index 63ace9d60..7cfaa96cb 100644
--- a/testprograms/if_while_example.c
+++ b/testprograms/if_while_example.c
@@ -44,9 +44,9 @@ int
 main(void)
 {
   ir_graph *irg;
-  type *owner;
-  type *proc_main;
-  type     *prim_t_int;
+  ir_type *owner;
+  ir_type *proc_main;
+  ir_type *prim_t_int;
   entity *ent;
   ir_node *b, *x, *r, *t, *f;
 
@@ -62,17 +62,17 @@ main(void)
   set_opt_dead_node_elimination (1);
 
   /*** Make basic type information for primitive type int. ***/
-  prim_t_int = new_type_primitive(id_from_str ("int", 3), mode_Iu);
+  prim_t_int = new_type_primitive(new_id_from_chars ("int", 3), mode_Iu);
 
 #define METHODNAME "main"
 #define NRARGS 0
 #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_res_type(proc_main, 0, prim_t_int);
-  owner = new_type_class (id_from_str ("IF_WHILE_EXAMPLE", 16));
-  ent = new_entity (owner, id_from_str ("main", 4), proc_main);
+  owner = new_type_class (new_id_from_chars ("IF_WHILE_EXAMPLE", 16));
+  ent = new_entity (owner, new_id_from_chars ("main", 4), proc_main);
   get_entity_ld_name(ent);
 
   /* Generates start and end blocks and nodes and a first, initial block */
@@ -81,32 +81,32 @@ main(void)
   /* Generate two constants */
   set_value (0, new_Const (mode_Iu, new_tarval_from_long (0, mode_Iu)));
   set_value (1, new_Const (mode_Iu, new_tarval_from_long (1, mode_Iu)));
-  mature_block (get_irg_current_block(irg));
+  mature_immBlock (get_irg_current_block(irg));
 
   /* Generate a conditional branch */
   x = new_Jmp();
 
   /* generate the fall through block and add all cfg edges */
   r = new_immBlock ();
-  add_in_edge (r, x);
-  mature_block (r);
+  add_immBlock_pred (r, x);
+  mature_immBlock (r);
   x = new_Jmp ();
 
   /* generate a block for the loop header and the conditional branch */
   r = new_immBlock ();
-  add_in_edge (r, x);
-  x = new_Cond (new_Proj(new_Cmp(new_Const (mode_Iu, new_tarval_from_long (0, mode_Is)),
-                                 new_Const (mode_Iu, new_tarval_from_long (0, mode_Is))),
-                         mode_b, Eq));
+  add_immBlock_pred (r, x);
+  x = new_Cond (new_Proj(new_Cmp(new_Const (mode_Iu, new_tarval_from_long (0, mode_Iu)),
+                                 new_Const (mode_Iu, new_tarval_from_long (0, mode_Iu))),
+                         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);
-  mature_block (r);
+  add_immBlock_pred (r, x);
+  mature_immBlock (r);
 
   /* the code in the loop body,
      as we are dealing with local variables only the dataflow edges
@@ -114,12 +114,12 @@ main(void)
   set_value (2, get_value (0, mode_Iu));
   set_value (0, get_value (1, mode_Iu));
   set_value (1, get_value (2, mode_Iu));
-  mature_block (b);
+  mature_immBlock (b);
 
   /* 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];
@@ -129,25 +129,25 @@ 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");
 
   local_optimize_graph(irg);
   dead_node_elimination(irg);
 
-  compute_outs(irg);
+  compute_irg_outs(irg);
 
   /* verify the graph */
   irg_vrfy(irg);
 
   /* output the vcg file */
   printf("Done building the graph.  Dumping it with out-edges.\n");
-  dump_out_edges();
-  dump_ir_graph (irg);
+  dump_out_edges(1);
+  dump_ir_graph (irg, 0);
   printf("Use xvcg to view this graph:\n");
   printf("/ben/goetz/bin/xvcg GRAPHNAME\n\n");