X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=testprograms%2Firr_cf_example.c;h=9b59afb4bdd27d330f7cb9c66add1f8b170ba8a5;hb=e09239ef2a54d46ebac3f24e2afe811c7ead727f;hp=c1eac063305abb654b417d0742873d4f96b759ee;hpb=fea2a862b08a06f74d199881ce9aed7753d15da9;p=libfirm

diff --git a/testprograms/irr_cf_example.c b/testprograms/irr_cf_example.c
index c1eac0633..9b59afb4b 100644
--- a/testprograms/irr_cf_example.c
+++ b/testprograms/irr_cf_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_cf_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,9 +17,6 @@
 # include "irdump.h"
 # include "firm.h"
 
-/*
- *  irregular control flow
- */
 
 /**
 *  This file constructs a control flow of following shape:
@@ -70,11 +71,11 @@ int main(int argc, char **argv)
 #define NRARGS 0
 #define NRES 0
 
-  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 ((type *)owner,
-                    id_from_str (METHODNAME, strlen(METHODNAME)),
+                    new_id_from_chars (METHODNAME, strlen(METHODNAME)),
                     (type *)proc_main);
   get_entity_ld_name(ent);
 #define NUM_OF_LOCAL_VARS 0
@@ -86,46 +87,46 @@ int main(int argc, char **argv)
   c1 = new_Const (mode_Is, new_tarval_from_long (1, mode_Is));
   c2 = new_Const (mode_Is, new_tarval_from_long (2, mode_Is));
 
-  cond = new_Cond(new_Proj(new_Cmp(expr, c1), mode_b, Eq));
+  cond = new_Cond(new_Proj(new_Cmp(expr, c1), mode_b, pn_Cmp_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));
 
   new_immBlock();
-  add_in_edge(get_irg_current_block(irg), t);
+  add_immBlock_pred(get_irg_current_block(irg), t);
   jmp = new_Jmp();
-  mature_block(get_irg_current_block(irg));
+  mature_immBlock(get_irg_current_block(irg));
 
   new_immBlock();
-  add_in_edge(get_irg_current_block(irg), f);
-  cond = new_Cond(new_Proj(new_Cmp(expr, c2), mode_b, Eq));
+  add_immBlock_pred(get_irg_current_block(irg), f);
+  cond = new_Cond(new_Proj(new_Cmp(expr, c2), mode_b, pn_Cmp_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));
 
   new_immBlock();
-  add_in_edge(get_irg_current_block(irg), t);
-  add_in_edge(get_irg_current_block(irg), jmp);
+  add_immBlock_pred(get_irg_current_block(irg), t);
+  add_immBlock_pred(get_irg_current_block(irg), jmp);
   jmp = new_Jmp();
-  mature_block(get_irg_current_block(irg));
+  mature_immBlock(get_irg_current_block(irg));
 
   new_immBlock();
-  add_in_edge(get_irg_current_block(irg), f);
+  add_immBlock_pred(get_irg_current_block(irg), f);
   t = new_Jmp();
-  mature_block(get_irg_current_block(irg));
+  mature_immBlock(get_irg_current_block(irg));
 
   new_immBlock();
-  add_in_edge(get_irg_current_block(irg), t);
-  add_in_edge(get_irg_current_block(irg), jmp);
+  add_immBlock_pred(get_irg_current_block(irg), t);
+  add_immBlock_pred(get_irg_current_block(irg), jmp);
 
   x = new_Return (get_store(), 0, NULL);
 
-  mature_block (get_irg_current_block(irg));
+  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);
+  irg_finalize_cons (irg);
 
   printf("Optimizing ...\n");
   dead_node_elimination(irg);
@@ -134,8 +135,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");