X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=testprograms%2Firr_loop_example.c;h=441e2d55fc2790a64382faab266d1d7c53931383;hb=d27790655951f728087008ba6bf5efc6e8b13f2d;hp=8509c37f8f763d0db3540446c6f5d796e53dfc0c;hpb=df83e37827032795585d3b25776c465870672901;p=libfirm

diff --git a/testprograms/irr_loop_example.c b/testprograms/irr_loop_example.c
index 8509c37f8..441e2d55f 100644
--- a/testprograms/irr_loop_example.c
+++ b/testprograms/irr_loop_example.c
@@ -1,10 +1,14 @@
-/* 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>
@@ -13,28 +17,24 @@
 # 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)
 {
@@ -47,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);
@@ -64,56 +64,54 @@ int main(int argc, char **argv)
 #define NRES 0
   printf("\nCreating an IR graph: %s...\n", CLASSNAME);
 
-  owner = new_type_class (id_from_str (CLASSNAME, strlen(CLASSNAME)));
-  proc_main = new_type_method(id_from_str(METHODNAME, strlen(METHODNAME)),
+  owner = new_type_class (new_id_from_chars (CLASSNAME, strlen(CLASSNAME)));
+  proc_main = new_type_method(new_id_from_chars(METHODNAME, strlen(METHODNAME)),
                               NRARGS, NRES);
   ent = new_entity (owner,
-                    id_from_str (METHODNAME, strlen(METHODNAME)),
+                    new_id_from_chars (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_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));
+  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);
   t = new_Proj(cond, mode_X, 1);
-  mature_block(get_irg_current_block(irg));
+  mature_immBlock(get_irg_current_block(irg));
 
   loopBlock1 = new_immBlock();
-  add_in_edge(loopBlock1, t);
+  add_immBlock_pred(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_immBlock();
-  add_in_edge(loopBlock2, f);
+  add_immBlock_pred(loopBlock2, f);
   cond = new_Cond(new_Proj(new_Cmp(expr, c3), mode_b, Eq));
   f_l2 = new_Proj(cond, mode_X, 0);
   t_l2 = new_Proj(cond, mode_X, 1);
 
-  add_in_edge(loopBlock1, t_l2);
-  add_in_edge(loopBlock2, t_l1);
-  mature_block(loopBlock1);
-  mature_block(loopBlock2);
+  add_immBlock_pred(loopBlock1, t_l2);
+  add_immBlock_pred(loopBlock2, t_l1);
+  mature_immBlock(loopBlock1);
+  mature_immBlock(loopBlock2);
 
   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);
-  }
-  mature_block (get_irg_current_block(irg));
+  add_immBlock_pred(get_irg_current_block(irg), f_l2);
+  add_immBlock_pred(get_irg_current_block(irg), f_l1);
+  x = new_Return (get_store(), 0, NULL);
+  mature_immBlock (get_irg_current_block(irg));
 
-  add_in_edge (get_irg_end_block(irg), x);
-  mature_block (get_irg_end_block(irg));
+  add_immBlock_pred (get_irg_end_block(irg), x);
+  mature_immBlock (get_irg_end_block(irg));
 
   finalize_cons (irg);
 
@@ -124,8 +122,9 @@ int main(int argc, char **argv)
   irg_vrfy(irg);
 
   printf("Dumping the graph and a control flow graph.\n");
-  dump_ir_block_graph (irg);
-  dump_cfg (irg);
+  char *dump_file_suffix = "";
+  dump_ir_block_graph (irg, dump_file_suffix);
+  dump_cfg (irg, dump_file_suffix);
   printf("Use xvcg to view these graphs:\n");
   printf("/ben/goetz/bin/xvcg GRAPHNAME\n\n");