X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=testprograms%2Fif_while_example.c;h=20ffc26357251c910c84ccf585b1b0c04813d5a9;hb=2508da0337ca1dc0576daeb1b2cf5165dec483fa;hp=a7020bfd1516fbbc82df4e3b17cc6dac76334544;hpb=4433514e4b01cb3c566d24d671e689f02682f59f;p=libfirm

diff --git a/testprograms/if_while_example.c b/testprograms/if_while_example.c
index a7020bfd1..20ffc2635 100644
--- a/testprograms/if_while_example.c
+++ b/testprograms/if_while_example.c
@@ -34,16 +34,19 @@ int
 main(void)
 {
   ir_graph *irg;
-  type_class *owner;
-  type_method *proc_main;
+  type *owner;
+  type *proc_main;
   entity *ent;
   ir_node *b, *x, *r, *t, *f;
 
   printf("\nCreating an IR graph: IF_WHILE_EXAMPLE...\n");
 
   init_firm ();
+  turn_of_edge_labels();
 
+  set_optimize(1);
   set_opt_constant_folding(0);  /* so that the stupid tests are not optimized. */
+                                /* if optimized no path to End remains!! */
   set_opt_cse(1);
   set_opt_dead_node_elimination (1);
 
@@ -54,7 +57,7 @@ main(void)
   proc_main = new_type_method(id_from_str(METHODNAME, strlen(METHODNAME)),
                               NRARGS, NRES);
   owner = new_type_class (id_from_str ("IF_WHILE_EXAMPLE", 16));
-  ent = new_entity ((type *)owner, id_from_str ("main", 4), (type *)proc_main);
+  ent = new_entity (owner, id_from_str ("main", 4), proc_main);
 
   /* Generates start and end blocks and nodes and a first, initial block */
   irg = new_ir_graph (ent, 4);
@@ -62,31 +65,19 @@ main(void)
   /* Generate two constants */
   set_value (0, new_Const (mode_I, tarval_from_long (mode_i, 0)));
   set_value (1, new_Const (mode_I, tarval_from_long (mode_i, 1)));
-  mature_block (irg->current_block);
+  mature_block (get_irg_current_block(irg));
 
   /* Generate a conditional branch */
-  x = new_Cond (new_Proj(new_Cmp(new_Const (mode_I, tarval_from_long (mode_i, 0)),
-                                 new_Const (mode_I, tarval_from_long (mode_i, 0))),
-                         mode_b, Eq));
-  f = new_Proj (x, mode_X, 0);
-  t = new_Proj (x, mode_X, 1);
-
-  /* generate and fill the then block */
-  r = new_Block ();
-  add_in_edge (r, t);
-  set_value (0, new_Const (mode_I, tarval_from_long (mode_i, 2)));
-  mature_block (r);
-  x = new_Jmp ();
+  x = new_Jmp();
 
   /* generate the fall through block and add all cfg edges */
-  r = new_Block ();
-  add_in_edge (r, f);
+  r = new_immBlock ();
   add_in_edge (r, x);
   mature_block (r);
   x = new_Jmp ();
 
   /* generate a block for the loop header and the conditional branch */
-  r = new_Block ();
+  r = new_immBlock ();
   add_in_edge (r, x);
   x = new_Cond (new_Proj(new_Cmp(new_Const (mode_I, tarval_from_long (mode_i, 0)),
                                  new_Const (mode_I, tarval_from_long (mode_i, 0))),
@@ -95,7 +86,7 @@ main(void)
   t = new_Proj (x, mode_X, 1);
 
   /* generate the block for the loop body */
-  b = new_Block ();
+  b = new_immBlock ();
   add_in_edge (b,t);
   x = new_Jmp ();
   add_in_edge (r, x);
@@ -110,7 +101,7 @@ main(void)
   mature_block (b);
 
   /* generate the return block */
-  r = new_Block ();
+  r = new_immBlock ();
   add_in_edge (r, f);
   mature_block (r);
 
@@ -122,10 +113,12 @@ main(void)
   }
 
   /* finalize the end block generated in new_ir_graph() */
-  add_in_edge (irg->end_block, x);
-  mature_block (irg->end_block);
+  add_in_edge (get_irg_end_block(irg), x);
+  mature_block (get_irg_end_block(irg));
 
   printf("Optimizing ...\n");
+
+  local_optimize_graph(irg),
   dead_node_elimination(irg);
 
   /* verify the graph */