fixed bug in irgopt -- optimize_cf

[libfirm] / testprograms / irr_loop_example.c

diff --git a/testprograms/irr_loop_example.c b/testprograms/irr_loop_example.c
index c0bdd94..485881e 100644 (file)
--- a/testprograms/irr_loop_example.c
+++ b/testprograms/irr_loop_example.c
@@ -7,7 +7,9 @@
 */
 
 # include <stdio.h>
+# include <string.h>
 
+# include "irvrfy.h"
 # include "irdump.h"
 # include "firm.h"
 
@@ -36,12 +38,12 @@
 
 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 *proc_main; /* typeinformation for the method main */
-  entity *ent;            /* represents this method as entity of owner */
-  ir_node *expr, *c1, *c2, *c3, *cond, *f, *t, *loopBlock1, *f_l1, *t_l1,
-          *loopBlock2, *f_l2, *t_l2, *x;
+  ir_graph *irg;        /* this variable contains the irgraph */
+  type     *owner;      /* the class in which this method is defined */
+  type     *proc_main;  /* typeinformation for the method main */
+  entity   *ent;        /* represents this method as entity of owner */
+  ir_node  *expr, *c1, *c2, *c3, *cond, *f, *t, *loopBlock1, *f_l1, *t_l1,
+           *loopBlock2, *f_l2, *t_l2, *x;
 
 
   /* init library */
@@ -65,32 +67,32 @@ int main(int argc, char **argv)
   owner = new_type_class (id_from_str (CLASSNAME, strlen(CLASSNAME)));
   proc_main = new_type_method(id_from_str(METHODNAME, strlen(METHODNAME)),
                               NRARGS, NRES);
-  ent = new_entity ((type *)owner,
+  ent = new_entity (owner,
                     id_from_str (METHODNAME, strlen(METHODNAME)),
-                    (type *)proc_main);
+                    proc_main);
 
 #define NUM_OF_LOCAL_VARS 0
 
   irg = new_ir_graph (ent, NUM_OF_LOCAL_VARS);
 
   /* to make three conditionals  */
-  expr = new_Const (mode_i, tarval_from_long (mode_i, 0));
-  c1 = new_Const (mode_i, tarval_from_long (mode_i, 1));
-  c2 = new_Const (mode_i, tarval_from_long (mode_i, 2));
-  c3 = new_Const (mode_i, tarval_from_long (mode_i, 2));
+  expr = new_Const (mode_Is, tarval_from_long (mode_Is, 0));
+  c1 = new_Const (mode_Is, tarval_from_long (mode_Is, 1));
+  c2 = new_Const (mode_Is, tarval_from_long (mode_Is, 2));
+  c3 = new_Const (mode_Is, tarval_from_long (mode_Is, 2));
 
   cond = new_Cond(new_Proj(new_Cmp(expr, c1), mode_b, Eq));
   f = new_Proj(cond, mode_X, 0);
   t = new_Proj(cond, mode_X, 1);
   mature_block(get_irg_current_block(irg));
 
-  loopBlock1 = new_Block();
+  loopBlock1 = new_immBlock();
   add_in_edge(loopBlock1, t);
   cond = new_Cond(new_Proj(new_Cmp(expr, c2), mode_b, Eq));
   f_l1 = new_Proj(cond, mode_X, 0);
   t_l1 = new_Proj(cond, mode_X, 1);
 
-  loopBlock2 = new_Block();
+  loopBlock2 = new_immBlock();
   add_in_edge(loopBlock2, f);
   cond = new_Cond(new_Proj(new_Cmp(expr, c3), mode_b, Eq));
   f_l2 = new_Proj(cond, mode_X, 0);
@@ -101,7 +103,7 @@ int main(int argc, char **argv)
   mature_block(loopBlock1);
   mature_block(loopBlock2);
 
-  new_Block();
+  new_immBlock();
   add_in_edge(get_irg_current_block(irg), f_l2);
   add_in_edge(get_irg_current_block(irg), f_l1);
   {
@@ -113,6 +115,8 @@ int main(int argc, char **argv)
   add_in_edge (get_irg_end_block(irg), x);
   mature_block (get_irg_end_block(irg));
 
+  finalize_cons (irg);
+
   printf("Optimizing ...\n");
   dead_node_elimination(irg);