X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=testprograms%2Fglobal_cse.c;h=a9bed6d05924afd66c55d9ea9fd2793623951c9a;hb=8d4189c67b88556b13e81e6dee9178f8b1168d28;hp=3e701d9dda6fbda6bb0143142d5d370a6be511e6;hpb=76572961989e62cef01b295c6c8af7460f6080dd;p=libfirm

diff --git a/testprograms/global_cse.c b/testprograms/global_cse.c
index 3e701d9dd..a9bed6d05 100644
--- a/testprograms/global_cse.c
+++ b/testprograms/global_cse.c
@@ -62,16 +62,16 @@ main(void)
 
   owner = get_glob_type();
   /* Type information for the procedure */
-  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);
   /* The entity for the procedure */
   ent = new_entity (owner,
-                    id_from_str (METHODNAME, strlen(METHODNAME)),
+                    new_id_from_chars (METHODNAME, strlen(METHODNAME)),
                     proc_main);
   /* The type int.  This type is necessary to model the result and parameters
      the procedure. */
 #define PRIM_NAME "int"
-  typ = new_type_primitive(id_from_str(PRIM_NAME, strlen(PRIM_NAME)), mode_Is);
+  typ = new_type_primitive(new_id_from_chars(PRIM_NAME, strlen(PRIM_NAME)), mode_Is);
   /* The parameter and result types of the procedure. */
   set_method_param_type(proc_main, 0, typ);
   set_method_res_type(proc_main, 0, typ);
@@ -94,44 +94,44 @@ main(void)
   set_value (b_pos, new_Const (mode_Is, new_tarval_from_long (2, mode_Is)));
   /* We know all predecessors of the block and all set_values and set_stores are
      preformed.   We can mature the block.  */
-  mature_block (get_irg_current_block(irg));
+  mature_immBlock (get_irg_current_block(irg));
 
   /* Generate a conditional branch */
   cmp = new_Cmp(get_value(a_pos, mode_Is), get_value(b_pos, mode_Is)); /*
   cmp = new_Cmp(new_Const (mode_Is, new_tarval_from_long (2, mode_Is)),
                 new_Const (mode_Is, new_tarval_from_long (2, mode_Is)));*/
-  x = new_Cond (new_Proj(cmp, mode_b, Eq));
+  x = new_Cond (new_Proj(cmp, mode_b, pn_Cmp_Eq));
   f = new_Proj (x, mode_X, 0);
   t = new_Proj (x, mode_X, 1);
 
   /* generate and fill the then block */
   r = new_immBlock ();
-  add_in_edge (r, t);
+  add_immBlock_pred (r, t);
   a = new_Sub(get_value(a_pos, mode_Is),
               new_Const (mode_Is, new_tarval_from_long (3, mode_Is)),
   	      mode_Is);
   set_value (a_pos, a);
 
-  mature_block (r);
+  mature_immBlock (r);
   t = new_Jmp ();
 
   /* generate the else block */
   r = new_immBlock ();
-  add_in_edge (r, f);
+  add_immBlock_pred (r, f);
   a = new_Sub(get_value(a_pos, mode_Is),
               new_Const (mode_Is, new_tarval_from_long (3, mode_Is)),
   	      mode_Is);
   a = new_Add(a, new_Const (mode_Is, new_tarval_from_long (5, mode_Is)), mode_Is);
   set_value (a_pos, a);
 
-  mature_block (r);
+  mature_immBlock (r);
   f = new_Jmp ();
 
   /* generate the fall through block and add all cfg edges */
   r = new_immBlock ();
-  add_in_edge (r, f);
-  add_in_edge (r, t);
-  mature_block (r);
+  add_immBlock_pred (r, f);
+  add_immBlock_pred (r, t);
+  mature_immBlock (r);
   /* The Return statement */
   {
      ir_node *in[1], *store ;
@@ -142,20 +142,20 @@ 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));
 
   /* verify the graph */
   irg_vrfy(irg);
-  finalize_cons (irg);
+  irg_finalize_cons (irg);
 
   printf("Optimizing ...\n");
   local_optimize_graph(irg);
-  dead_node_elimination(irg);
+
 
   /* output the vcg file */
   printf("Done building the graph.  Dumping it.\n");
-  dump_ir_block_graph (irg);
+  dump_ir_block_graph (irg, 0);
   printf("use xvcg to view this graph:\n");
   printf("/ben/goetz/bin/xvcg GRAPHNAME\n\n");