fixed bug in irgopt -- optimize_cf

[libfirm] / testprograms / memory_example.c

diff --git a/testprograms/memory_example.c b/testprograms/memory_example.c
index d14437d..c56ef8f 100644 (file)
--- a/testprograms/memory_example.c
+++ b/testprograms/memory_example.c
@@ -6,6 +6,11 @@
 ** testprogram.
 */
 
+
+# include <stdio.h>
+# include <string.h>
+
+# include "irvrfy.h"
 # include "irdump.h"
 # include "firm.h"
 
@@ -53,54 +58,61 @@ 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_Iu);
+
   /* 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);
 
   /* generate two constant pointers to string constants */
   /* this simulates two global variables, a and b point to these variables */
-  a = new_Const (mode_p, tarval_p_from_str ("VAR_A"));
-  b = new_Const (mode_p, tarval_p_from_str ("VAR_B"));
+  a = new_Const (mode_P, tarval_P_from_str ("VAR_A"));
+  b = new_Const (mode_P, tarval_P_from_str ("VAR_B"));
 
   /* set VAR_A and VAR_B to constant values */
   set_store (new_Proj (new_Store (get_store (), a,
-                                 new_Const (mode_I, tarval_from_long (mode_i, 0))),
+                                 new_Const (mode_Iu, tarval_from_long (mode_Is, 0))),
                        mode_M, 0));
 
   set_store (new_Proj (new_Store (get_store (), b,
-                                 new_Const (mode_I, tarval_from_long (mode_i, 1))),
+                                 new_Const (mode_Iu, tarval_from_long (mode_Is, 1))),
                        mode_M, 0));
 
   /* 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. */
   /* load the value and make it's effects visible. */
   x = new_Load (get_store (), a);
     set_store (new_Proj (x, mode_M, 0));
-    x = new_Proj(x, mode_I, 2);
+    x = new_Proj(x, mode_Iu, 2);
   /* the same again: load the value and make it's effects visible. */
   y = new_Load (get_store (), b);
     set_store (new_Proj (y, mode_M, 0));
-    y = new_Proj(y, mode_I, 2);
+    y = new_Proj(y, mode_Iu, 2);
   /* store the exchanged values. */
   set_store (new_Proj (new_Store (get_store (), a, y), mode_M, 0));
   set_store (new_Proj (new_Store (get_store (), b, x), mode_M, 0));
@@ -109,40 +121,43 @@ main(void)
   x = new_Cond (
         new_Proj (
           new_Cmp (
-            new_Const (mode_I, tarval_from_long (mode_i, 0)),
+            new_Const (mode_Iu, tarval_from_long (mode_Is, 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 */
   {
      ir_node *in[1];
      x = new_Load (get_store (), a);
-     in[0] = new_Proj (x, mode_I, 2);
+     in[0] = new_Proj (x, mode_Iu, 2);
 
      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);
 }