*** empty log message ***

[libfirm] / testprograms / irr_loop_example.c

diff --git a/testprograms/irr_loop_example.c b/testprograms/irr_loop_example.c
index dff1dfa..23a9ada 100644 (file)
--- a/testprograms/irr_loop_example.c
+++ b/testprograms/irr_loop_example.c
@@ -1,51 +1,53 @@
-/* Copyright (C) 1998 - 2000 by Universitaet Karlsruhe
-** All rights reserved.
-**
-** Authors: Christian Schaefer, Goetz Lindenmaier
-**
-** testprogram.
-*/
+/*
+ * Project:     libFIRM
+ * File name:   testprograms/irr_loop_example.c
+ * Purpose:     Test Phi construction with irregular control flow.
+ * Author:      Christian Schaefer, Goetz Lindenmaier
+ * Modified by:
+ * Created:
+ * CVS-ID:      $Id$
+ * Copyright:   (c) 1999-2003 Universität Karlsruhe
+ * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
+ */
 
 # include <stdio.h>
+# include <string.h>
 
+# include "irvrfy.h"
 # include "irdump.h"
 # include "firm.h"
 
-/*
- *   an irreducible loop.
- */
-
 /**
-***  This file constructs a control flow of following shape:
-***
-***
-***         firstBlock
-***          /      \
-***         /        \
-***       |/_        _\|
-***            ---->
-*** LoopBlock1       LoopBlock2
-***            <----
-***        \              /
-***        \            /
-***        _\|        |/_
-***           nextBlock
-***
-***
-**/
+ *  This file constructs a control flow of following shape:
+ *
+ *
+ *         firstBlock
+ *          /      \
+ *         /        \
+ *       |/_        _\|
+ *            ---->
+ * LoopBlock1       LoopBlock2
+ *            <----
+ *        \              /
+ *         \            /
+ *        _\|        |/_
+ *           nextBlock
+ *
+ *
+ **/
 
 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 */
-  init_firm ();
+  init_firm (NULL);
   set_opt_constant_folding (0);  /* so that the stupid tests are not optimized. */
   set_opt_cse(1);
   set_opt_dead_node_elimination(1);
@@ -65,19 +67,20 @@ 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);
+  get_entity_ld_name(ent); /* To enforce name mangling for vcg graph name */
 
 #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, new_tarval_from_long (0, mode_Is));
+  c1 = new_Const (mode_Is, new_tarval_from_long (1, mode_Is));
+  c2 = new_Const (mode_Is, new_tarval_from_long (2, mode_Is));
+  c3 = new_Const (mode_Is, new_tarval_from_long (2, mode_Is));
 
   cond = new_Cond(new_Proj(new_Cmp(expr, c1), mode_b, Eq));
   f = new_Proj(cond, mode_X, 0);
@@ -104,15 +107,14 @@ int main(int argc, char **argv)
   new_immBlock();
   add_in_edge(get_irg_current_block(irg), f_l2);
   add_in_edge(get_irg_current_block(irg), f_l1);
-  {
-    ir_node *in[0];
-    x = new_Return (get_store(), 0, in);
-  }
+  x = new_Return (get_store(), 0, NULL);
   mature_block (get_irg_current_block(irg));
 
   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);