X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=testprograms%2Fmemory_example.c;h=9b76b11a29c64bf48320e91bffdfb6957aa1b012;hb=80fadd53d5cf0feddf63f34d6306e45f8d5de717;hp=d14437df48e81d49dd64b3ceecffa36d3bb0670d;hpb=2fa17934abe60b32409bf3b797ec3aa675a1b1a0;p=libfirm

diff --git a/testprograms/memory_example.c b/testprograms/memory_example.c
index d14437df4..9b76b11a2 100644
--- a/testprograms/memory_example.c
+++ b/testprograms/memory_example.c
@@ -53,19 +53,26 @@ 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 */
+  type     *prim_t_int;
+  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);
+
+  /*** Make basic type information for primitive type int. ***/
+  prim_t_int = new_type_primitive(id_from_str ("int", 3), mode_I);
+
   /* 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);
+  method = new_type_method (id_from_str("main", 4), 0, 1);
+  set_method_res_type(method, 0, prim_t_int);
+  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 +93,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 +119,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,19 +138,21 @@ 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));
 
-  /* verify the graph */
-  irg_vrfy(irg);
+  finalize_cons (irg);
 
+  printf("Optimizing ...\n");
   dead_node_elimination(irg);
 
-  printf("\nDone building the graph.  Dumping it.\n");
-  dump_ir_block_graph (irg);
+  /* verify the graph */
+  irg_vrfy(irg);
 
-  printf("use xvcg to view this graph:\n");
-  printf("/ben/goetz/bin/xvcg GRAPHNAME\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\n");
 
   return (0);
 }