New

[libfirm] / testprograms / cond_example.c

diff --git a/testprograms/cond_example.c b/testprograms/cond_example.c
index 69f82c7..ce4800a 100644 (file)
--- a/testprograms/cond_example.c
+++ b/testprograms/cond_example.c
@@ -23,17 +23,21 @@
 
 int main(int argc, char **argv)
 {
-  ir_graph *irg;          /* this variable contains the irgraph */
-  type_class *owner;      /* the class in which this method is defined */
-  type_method *method;    /* the type of this method */
-  entity *ent;            /* represents this method as entity of owner */
-  ir_node *x, *x_then, *arg1, *c2, *c10, *cmpGt, *cmpLt, *and, *f, *t, *b;
+  type     *prim_t_int;
+  ir_graph *irg;       /* this variable contains the irgraph */
+  type     *owner;     /* the class in which this method is defined */
+  type     *method;    /* the type of this method */
+  entity   *ent;       /* represents this method as entity of owner */
+  ir_node  *x, *x_then, *arg1, *c2, *c10, *cmpGt, *cmpLt, *and, *f, *t, *b;
 
   printf("\nCreating an IR graph: COND_EXAMPLE...\n");
 
   /* init library */
   init_firm ();
 
+  /*** Make basic type information for primitive type int. ***/
+  prim_t_int = new_type_primitive(id_from_str ("int", 3), mode_i);
+
   /* 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
    * all functions as methods in this file.
@@ -44,8 +48,10 @@ int main(int argc, char **argv)
 #define ENTITYNAME "main"
 
   owner = new_type_class (id_from_str (CLASSNAME, strlen(CLASSNAME)));
-  method = new_type_method (id_from_str("main", 4), 0, 2);
-  ent = new_entity ((type *)owner, id_from_str (ENTITYNAME, strlen(ENTITYNAME)), (type *)method);
+  method = new_type_method (id_from_str("main", 4), 1, 1);
+  set_method_param_type(method, 0, prim_t_int);
+  set_method_res_type(method, 0, prim_t_int);
+  ent = new_entity (owner, id_from_str (ENTITYNAME, strlen(ENTITYNAME)), method);
 
 
   /* Generates the basic graph for the method represented by entity ent, that
@@ -57,7 +63,7 @@ int main(int argc, char **argv)
   irg = new_ir_graph (ent, NUM_OF_LOCAL_VARS);
 
   /* get the first argument a of method main - see irgraph.h */
-  arg1 = new_Proj(irg->args, mode_i, 0);
+  arg1 = new_Proj(get_irg_args(irg), mode_i, 0);
 
   /* arg1 as first first local variable - makes things simple */
   set_value(0, arg1);
@@ -84,17 +90,17 @@ int main(int argc, char **argv)
   f = new_Proj (x, mode_X, 0); /* if condition is false */
   t = new_Proj (x, mode_X, 1); /* if condition is true */
 
-  mature_block (irg->current_block);
+  mature_block (get_irg_current_block(irg));
 
   /* generate and fill the then block */
-  b = new_Block ();
+  b = new_immBlock ();
   add_in_edge (b, t);
   set_value (0, new_Const (mode_i, tarval_from_long (mode_i, 1)));
   mature_block (b);
   x_then = new_Jmp ();
 
   /* generate the fall through block and add all cfg edges */
-  b = new_Block ();
+  b = new_immBlock ();
   add_in_edge (b, x_then);
   add_in_edge (b, f);
 
@@ -107,13 +113,15 @@ 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 (irg->current_block);
+  mature_block (get_irg_current_block(irg));
 
   /* This adds the in edge of the end block which originates at the
      return statement. The return node passes controlflow to the end block.*/
-  add_in_edge (irg->end_block, x);
+  add_in_edge (get_irg_end_block(irg), x);
   /* Now we can mature the end block as all it's predecessors are known. */
-  mature_block (irg->end_block);
+  mature_block (get_irg_end_block(irg));
+
+  finalize_cons (irg);
 
   printf("Optimizing ...\n");
   dead_node_elimination(irg);
@@ -124,7 +132,7 @@ int main(int argc, char **argv)
   printf("Done building the graph.  Dumping it.\n");
   dump_ir_block_graph (irg);
   printf("Use xvcg to view this graph:\n");
-  printf("/ben/goetz/bin/xvcg GRAPHNAME\n");
+  printf("/ben/goetz/bin/xvcg GRAPHNAME\n\n");
 
   return (0);
 }