X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=testprograms%2Firr_loop_example.c;h=23a9adaa3350d7ba2a9a8285c708af44884d739f;hb=0eb9e8a7def8f3003527c59013190344d27f38f2;hp=43c1d00fdf282729642e4347cad89f3509da0b44;hpb=a3a4f27fa76972a5aa4773b34ad83796eaf1fcfc;p=libfirm

diff --git a/testprograms/irr_loop_example.c b/testprograms/irr_loop_example.c
index 43c1d00fd..23a9adaa3 100644
--- a/testprograms/irr_loop_example.c
+++ b/testprograms/irr_loop_example.c
@@ -1,38 +1,40 @@
-/* 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)
 {
@@ -45,7 +47,7 @@ int main(int argc, char **argv)
 
 
   /* 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);
@@ -68,16 +70,17 @@ int main(int argc, char **argv)
   ent = new_entity (owner,
                     id_from_str (METHODNAME, strlen(METHODNAME)),
                     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);