X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=testprograms%2Fthree_cfpred_example.c;h=46c8106d2db691fe9c88323703befbf939e8cf7a;hb=a644cbe05b6cf782f907f84701dba8faf5e995f9;hp=c6edb4dfdd9b073bba80457f8598c3dabb9146c6;hpb=76572961989e62cef01b295c6c8af7460f6080dd;p=libfirm

diff --git a/testprograms/three_cfpred_example.c b/testprograms/three_cfpred_example.c
index c6edb4dfd..46c8106d2 100644
--- a/testprograms/three_cfpred_example.c
+++ b/testprograms/three_cfpred_example.c
@@ -29,7 +29,7 @@
  *     Block1    scnCondBlock
  *        |       |        |
  *        |       |        |
- * 	  |      \ /      \ /
+ *    |      \ /      \ /
  *        |     Block2   Block3
  *         \      |       /
  *          \     |      /
@@ -40,9 +40,9 @@
  *   This is a program as, e.g.,
  *
  *   if () then
- *     { Jmp label1; } // happens anyways
+ *     { Jmp label1; } //  happens anyways
  *   else
- *     { Jmp label1; } // happens anyways
+ *     { Jmp label1; } //  happens anyways
  * label1:
  *   return();
  *   Jmp label1;
@@ -65,7 +65,7 @@ int main(int argc, char **argv)
   set_optimize(1);
 
   /*** Make basic type information for primitive type int. ***/
-  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);
 
   /* FIRM was designed for oo languages where all methods belong to a class.
    * For imperative languages like C we view a file as a large class containing
@@ -75,16 +75,16 @@ int main(int argc, char **argv)
 #define METHODNAME "THREE_CFPRED_EXAMPLE_main"
 #define NRARGS 1
 #define NRES 1
-  printf("\nCreating an IR graph: ...\n");
+  printf("\nCreating an IR graph: THREE_CFPRED_EXAMPLE ...\n");
 
   owner = get_glob_type();
-  proc_main = new_type_method(id_from_str(METHODNAME, strlen(METHODNAME)),
-			      NRARGS, NRES);
+  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);
 
   ent = new_entity (owner,
-                    id_from_str (METHODNAME, strlen(METHODNAME)),
+                    new_id_from_chars (METHODNAME, strlen(METHODNAME)),
                     proc_main);
 
 #define NUM_OF_LOCAL_VARS 2
@@ -96,70 +96,71 @@ int main(int argc, char **argv)
   c2 = new_Proj (get_irg_args(irg), mode_Is, 0);
   set_value(1, c2);
 
-  cond = new_Cond(new_Proj(new_Cmp(c1, c2), mode_b, Eq));
+  cond = new_Cond(new_Proj(new_Cmp(c1, c2), mode_b, pn_Cmp_Eq));
   set_value(0, new_Const (mode_Is, new_tarval_from_long (6, mode_Is)));
   f = new_Proj(cond, mode_X, 0);
   t = new_Proj(cond, mode_X, 1);
-  mature_block(get_irg_current_block(irg));
+  mature_immBlock(get_irg_current_block(irg));
 
   /* end block to add jmps */
   endBlock = new_immBlock();
 
   /* Block 1 */
   Block1 = new_immBlock();
-  add_in_edge(Block1, t);
-  mature_block(Block1);
+  add_immBlock_pred(Block1, t);
+  mature_immBlock(Block1);
   set_value(0, new_Const (mode_Is, new_tarval_from_long (5, mode_Is)));
   jmp = new_Jmp();
-  add_in_edge(endBlock, jmp);
+  add_immBlock_pred(endBlock, jmp);
 
   /* scndCondBlock */
   scndCondBlock = new_immBlock();
-  add_in_edge(scndCondBlock, f);
-  mature_block(scndCondBlock);
+  add_immBlock_pred(scndCondBlock, f);
+  mature_immBlock(scndCondBlock);
   c1 = new_Const (mode_Is, new_tarval_from_long (3, mode_Is));
-  cond = new_Cond(new_Proj(new_Cmp(c1, get_value(1, mode_Is)), mode_b, Eq));
+  cond = new_Cond(new_Proj(new_Cmp(c1, get_value(1, mode_Is)), mode_b, pn_Cmp_Eq));
   f = new_Proj(cond, mode_X, 0);
   t = new_Proj(cond, mode_X, 1);
-  mature_block(get_irg_current_block(irg));
+  mature_immBlock(get_irg_current_block(irg));
 
   /* Block 2 */
   Block2 = new_immBlock();
-  add_in_edge(Block2, f);
-  mature_block(Block2);
+  add_immBlock_pred(Block2, f);
+  mature_immBlock(Block2);
   jmp = new_Jmp();
-  add_in_edge(endBlock, jmp);
+  add_immBlock_pred(endBlock, jmp);
 
   /* Block 3 */
   Block3 = new_immBlock();
-  add_in_edge(Block3, t);
-  mature_block(Block3);
+  add_immBlock_pred(Block3, t);
+  mature_immBlock(Block3);
   jmp = new_Jmp();
-  add_in_edge(endBlock, jmp);
+  add_immBlock_pred(endBlock, jmp);
 
   /* finish the end Block */
-  switch_block(endBlock);
+  set_cur_block(endBlock);
   {
     ir_node *in[1];
     in[0] = get_value(0, mode_Is);
     x = new_Return (get_store(), 1, in);
   }
-  mature_block (get_irg_current_block(irg));
+  mature_immBlock (get_irg_current_block(irg));
 
   /* finish the Block with the end node */
-  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");
   dead_node_elimination(irg);
 
   printf("Dumping the graph and a control flow graph.\n");
-  dump_ir_block_graph (irg);
-  dump_cfg (irg);
+  char *suffix = "";
+  dump_ir_block_graph (irg, suffix);
+  dump_cfg (irg, suffix);
   printf("Use xvcg to view these graphs:\n");
   printf("/ben/goetz/bin/xvcg GRAPHNAME\n\n");