minor imporvements: comments, output

[libfirm] / testprograms / memory_example.c

diff --git a/testprograms/memory_example.c b/testprograms/memory_example.c
index e6225d9..5366b4a 100644 (file)
--- a/testprograms/memory_example.c
+++ b/testprograms/memory_example.c
@@ -53,19 +53,21 @@ int
 main(void)
 {
   ir_graph *irg;
-  type_class *owner;
-  type_method *method;    /* the type of this method */
-  entity *ent;
-  ir_node *a, *b, *x, *y, *r;
+  type     *owner;
+  type     *method;    /* the type of this method */
+  entity   *ent;
+  ir_node  *a, *b, *x, *y, *r;
 
-  printf("creating an IR graph: MEMORY_EXAMPLE...\n");
+  printf("\nCreating an IR graph: MEMORY_EXAMPLE...\n");
 
   init_firm ();
 
+  set_opt_dead_node_elimination (1);
+
   /* a class to get started with, containing the main procedure */
   owner = new_type_class (id_from_str ("MEMORY_EXAMPLE", 14));
   method = new_type_method (id_from_str("main", 4), 0, 2);
-  ent = new_entity ((type *)owner, id_from_str ("main", 4), (type *)method);
+  ent = new_entity (owner, id_from_str ("main", 4), method);
 
   /* Generates start and end blocks and nodes and a first, initial block */
   irg = new_ir_graph (ent, 4);
@@ -86,10 +88,10 @@ main(void)
 
   /* finish this first block */
   x = new_Jmp ();
-  mature_block (irg->current_block);
+  mature_block (get_irg_current_block(irg));
 
   /* a loop body */
-  r = new_Block ();
+  r = new_immBlock ();
   add_in_edge (r, x);
 
   /* exchange the content of the two variables. Exceptions not cached. */
@@ -112,13 +114,14 @@ main(void)
             new_Const (mode_I, tarval_from_long (mode_i, 0)),
             x),
           mode_b, Gt));
+
   /* build the cfg of the loop */
   add_in_edge (r, new_Proj (x, mode_X, 0));
   x = new_Proj (x, mode_X, 1);
   mature_block(r);
 
   /* generate the block the loop exits to */
-  r = new_Block ();
+  r = new_immBlock ();
   add_in_edge (r, x);
 
   /* generate the return block and return the content of VAR_A */
@@ -130,17 +133,19 @@ main(void)
      x = new_Return (new_Proj(x, mode_M, 0), 1, in);
   }
   mature_block (r);
-  add_in_edge (irg->end_block, x);
-  mature_block (irg->end_block);
+  add_in_edge (get_irg_end_block(irg), x);
+  mature_block (get_irg_end_block(irg));
+
+  printf("Optimizing ...\n");
+  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_block_graph (irg);
-
-  printf("use xvcg to view this graph:\n");
-  printf("/ben/goetz/bin/xvcg GRAPHNAME\n");
+  printf("Use xvcg to view this graph:\n");
+  printf("/ben/goetz/bin/xvcg GRAPHNAME\n\n");
 
   return (0);
 }