minor imporvements: comments, output

[libfirm] / testprograms / if_else_example.c

diff --git a/testprograms/if_else_example.c b/testprograms/if_else_example.c
index 129b076..77a9bb5 100644 (file)
--- a/testprograms/if_else_example.c
+++ b/testprograms/if_else_example.c
@@ -6,10 +6,10 @@
 ** testprogram.
 */
 
-#include <stdio.h>
+# include <stdio.h>
 
-# include "irdump.h"
 # include "firm.h"
+# include "irdump.h"
 
 /*
  * das leere FIRM Programm
@@ -32,12 +32,13 @@
 
 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 */
-  entity *ent;            /* represents this method as entity of owner */
-  ir_node *x, *x_then, *x_else, *c0, *c1, *c2, *cmpGt, *f, *t, *b;
+  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, *x_else, *c0, *c1, *c2, *cmpGt, *f, *t, *b;
 
-  printf("creating an IR graph: IF_ELSE_EXAMPLE...\n");
+  printf("\ncreating an IR graph: IF_ELSE_EXAMPLE...\n");
 
   /* init library */
   init_firm ();
@@ -48,12 +49,12 @@ int main(int argc, char **argv)
    * Therefore we define a class "IF_ELSE_EXAMPLE" with a method main as an
    * entity.
    */
-#define CLASSNAME "IF_ELSE_EXAMPLE"
 #define ENTITYNAME "main"
 
-  owner = new_type_class (id_from_str (CLASSNAME, strlen(CLASSNAME)));
-  ent = new_entity ((type *)owner, id_from_str (ENTITYNAME, strlen(ENTITYNAME)), NULL);
-
+  owner = get_glob_type();
+  method = new_type_method (id_from_str("main", 4), 0, 2);
+  ent = new_entity (owner, id_from_str (ENTITYNAME,
+                   strlen(ENTITYNAME)), method);
 
   /* Generates the basic graph for the method represented by entity ent, that
    * is, generates start and end blocks and nodes and a first, initial block.
@@ -80,28 +81,27 @@ 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, get_value(1, mode_i));
   mature_block (b);
   x_then = new_Jmp ();
 
   /* generate and fill the else block */
-  b = new_Block ();
+  b = new_immBlock ();
   add_in_edge (b, f);
   set_value (1, new_Const (mode_i, tarval_from_long (mode_i, 2)));
   mature_block (b);
   x_else = new_Jmp ();
 
   /* generate the join block and add all cfg edges */
-  b = new_Block ();
+  b = new_immBlock ();
   add_in_edge (b, x_then);
   add_in_edge (b, x_else);
 
-
   /* Generate the return node into current region. */
   {
     ir_node *in[2]; /* this is the array containing the return parameters */
@@ -109,24 +109,29 @@ int main(int argc, char **argv)
     in[1] = get_value(1, mode_i);
     x = new_Return (get_store(), 2, in);
   }
-  /* Now generate all instructions for this block and all its predecessor blocks
-   * so we can mature it. */
-  mature_block (irg->current_block);
-
-  /* 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);
+  /* Now generate all instructions for this block and all its predecessor
+     blocks so we can mature it. */
+  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 control flow to the
+     end block.  */
+  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));
+
+  printf("\nOptimizing ...\n");
+  local_optimize_graph(irg);
+  dead_node_elimination(irg);
 
   /* verify the graph */
   irg_vrfy(irg);
 
-  printf("\nDone building the graph.  Dumping it.\n");
+  printf("Done building the graph.  Dumping it.\n");
+  //dump_ir_graph (irg);
   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);
 }