X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=testprograms%2Fif_else_example.c;h=0fea90b397690d4e5ffb2d50c38e3b693e00a91d;hb=ab61af3f38c8c2eba051fbb9b4f2e6b383b95b6c;hp=686d9a3479e6bb86805c749aa5b3d2ce9f6a9484;hpb=29fb0e6e7e0a25930279564325a39554658552e0;p=libfirm

diff --git a/testprograms/if_else_example.c b/testprograms/if_else_example.c
index 686d9a347..0fea90b39 100644
--- a/testprograms/if_else_example.c
+++ b/testprograms/if_else_example.c
@@ -1,4 +1,4 @@
-/*
+	/*
  * Project:     libFIRM
  * File name:   testprograms/if_else_example.c
  * Purpose:     Shows construction of if ... else control flow.
@@ -18,24 +18,20 @@
 # include "firm.h"
 # include "irdump.h"
 
-/*
- * das leere FIRM Programm
- */
-
 /**
-*  This file constructs the ir for the following pseudo-program:
-*
-*  main() {
-*    int a = 0;
-*    int b = 1;
-*
-*    if (a > 2)
-*      { a = b; }
-*    else
-*      { b = 2; }
-*
-*    return a, b;
-**/
+ *  This file constructs the ir for the following pseudo-program:
+ *
+ *  main() {
+ *    int a = 0;
+ *    int b = 1;
+ *
+ *    if (a > 2)
+ *      { a = b; }
+ *    else
+ *      { b = 2; }
+ *
+ *    return a, b;
+ */
 
 int main(int argc, char **argv)
 {
@@ -52,7 +48,7 @@ int main(int argc, char **argv)
   init_firm (NULL);
 
   /*** 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
@@ -63,11 +59,11 @@ int main(int argc, char **argv)
 #define ENTITYNAME "IF_ELSE_EXAMPLE_main"
 
   owner = get_glob_type();
-  method = new_type_method (id_from_str(ENTITYNAME, strlen(ENTITYNAME)), 0, 2);
+  method = new_type_method (new_id_from_chars(ENTITYNAME, strlen(ENTITYNAME)), 0, 2);
   set_method_res_type(method, 0, prim_t_int);
   set_method_res_type(method, 1, prim_t_int);
 
-  ent = new_entity (owner, id_from_str (ENTITYNAME,
+  ent = new_entity (owner, new_id_from_chars (ENTITYNAME,
 		    strlen(ENTITYNAME)), method);
 
   /* Generates the basic graph for the method represented by entity ent, that
@@ -88,33 +84,33 @@ int main(int argc, char **argv)
 
   /* the expression that evaluates the condition */
   c2 = new_Const (mode_Is, new_tarval_from_long (2, mode_Is));
-  cmpGt = new_Proj(new_Cmp(get_value(0, mode_Is), c2), mode_b, Gt);
+  cmpGt = new_Proj(new_Cmp(get_value(0, mode_Is), c2), mode_b, pn_Cmp_Gt);
 
   /* the conditional branch */
   x = new_Cond (cmpGt);
   f = new_Proj (x, mode_X, 0); /* if condition is false */
   t = new_Proj (x, mode_X, 1); /* if condition is true */
 
-  mature_block (get_irg_current_block(irg));
+  mature_immBlock (get_irg_current_block(irg));
 
   /* generate and fill the then block */
   b = new_immBlock ();
-  add_in_edge (b, t);
+  add_immBlock_pred (b, t);
   set_value (0, get_value(1, mode_Is));
-  mature_block (b);
+  mature_immBlock (b);
   x_then = new_Jmp ();
 
   /* generate and fill the else block */
   b = new_immBlock ();
-  add_in_edge (b, f);
+  add_immBlock_pred (b, f);
   set_value (1, new_Const (mode_Is, new_tarval_from_long (2, mode_Is)));
-  mature_block (b);
+  mature_immBlock (b);
   x_else = new_Jmp ();
 
   /* generate the join block and add all cfg edges */
   b = new_immBlock ();
-  add_in_edge (b, x_then);
-  add_in_edge (b, x_else);
+  add_immBlock_pred (b, x_then);
+  add_immBlock_pred (b, x_else);
 
   /* Generate the return node into current region. */
   {
@@ -125,16 +121,16 @@ int main(int argc, char **argv)
   }
   /* Now generate all instructions for this block and all its predecessor
      blocks so we can mature it. */
-  mature_block (get_irg_current_block(irg));
+  mature_immBlock (get_irg_current_block(irg));
 
   /* This adds the in edge of the end block which originates at the
      return statement.  The return node passes control flow to the
      end block.  */
-  add_in_edge (get_irg_end_block(irg), x);
+  add_immBlock_pred (get_irg_end_block(irg), x);
   /* Now we can mature the end block as all it's predecessors are known. */
-  mature_block (get_irg_end_block(irg));
+  mature_immBlock (get_irg_end_block(irg));
 
-  finalize_cons (irg);
+  irg_finalize_cons (irg);
 
   printf("Optimizing ...\n");
   local_optimize_graph(irg);
@@ -142,10 +138,10 @@ int main(int argc, char **argv)
 
   /* verify the graph */
   irg_vrfy(irg);
-  finalize_cons (irg);
+  irg_finalize_cons (irg);
 
   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");