X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=testprograms%2Firr_cf_example.c;h=c85b2b360f72db743b14a2bf2aa1d494ce9391eb;hb=478dcb4a03eec4c6fe63b5aa9e4ee70f11bdd93e;hp=6002f65c977e5a99c32241df88dec3eb28440ea3;hpb=c201fe69b5fcb5a8430afafe2e15946cab4e45c4;p=libfirm

diff --git a/testprograms/irr_cf_example.c b/testprograms/irr_cf_example.c
index 6002f65c9..c85b2b360 100644
--- a/testprograms/irr_cf_example.c
+++ b/testprograms/irr_cf_example.c
@@ -1,60 +1,63 @@
-/* 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 <stdio.h>
+# include <string.h>
 
+# include "irvrfy.h"
 # include "irdump.h"
 # include "firm.h"
 
-/*
- *  irregular control flow
- */
 
 /**
-***  This file constructs a control flow of following shape:
-***
-*** StartBlock
-***     |
-***    \|/
-***   Block --->  Block
-***     |           |
-***    \|/         \|/
-***   Block --->  Block
-***     |           |
-***    \|/         \|/
-***   Block --->  Block
-***                 |
-***                \|/
-***              EndBlock
-***
-***   This is a program as, e.g.,
-***
-***   switch (expr){
-***     case 1:
-***     case 2:
-***       break;
-***     default:
-***   }
-***   return
+*  This file constructs a control flow of following shape:
+*
+* StartBlock
+*     |
+*    \|/
+*   Block --->  Block
+*     |           |
+*    \|/         \|/
+*   Block --->  Block
+*     |           |
+*    \|/         \|/
+*   Block --->  Block
+*                 |
+*                \|/
+*              EndBlock
+*
+*   This is a program as, e.g.,
+*
+*   switch (expr){
+*     case 1:
+*     case 2:
+*       break;
+*     default:
+*   }
+*   return
 **/
 
 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, *cond, *f, *t, *jmp, *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, *cond, *f, *t, *jmp, *x;
 
   printf("\nCreating an IR graph: IRR_CF...\n");
 
   /* init library */
-  init_firm ();
+  init_firm (NULL);
   set_opt_constant_folding(0); /* so that stupid test are not evaluated. */
 
   /* FIRM was designed for oo languages where all methods belong to a class.
@@ -74,56 +77,57 @@ int main(int argc, char **argv)
   ent = new_entity ((type *)owner,
                     id_from_str (METHODNAME, strlen(METHODNAME)),
                     (type *)proc_main);
-
+  get_entity_ld_name(ent);
 #define NUM_OF_LOCAL_VARS 0
 
   irg = new_ir_graph (ent, NUM_OF_LOCAL_VARS);
 
   /* two make two conditionals that represent a switch */
-  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));
+  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));
 
   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));
 
-  new_Block();
+  new_immBlock();
   add_in_edge(get_irg_current_block(irg), t);
   jmp = new_Jmp();
   mature_block(get_irg_current_block(irg));
 
-  new_Block();
+  new_immBlock();
   add_in_edge(get_irg_current_block(irg), f);
   cond = new_Cond(new_Proj(new_Cmp(expr, c2), mode_b, Eq));
   f = new_Proj(cond, mode_X, 0);
   t = new_Proj(cond, mode_X, 1);
   mature_block(get_irg_current_block(irg));
 
-  new_Block();
+  new_immBlock();
   add_in_edge(get_irg_current_block(irg), t);
   add_in_edge(get_irg_current_block(irg), jmp);
   jmp = new_Jmp();
   mature_block(get_irg_current_block(irg));
 
-  new_Block();
+  new_immBlock();
   add_in_edge(get_irg_current_block(irg), f);
   t = new_Jmp();
   mature_block(get_irg_current_block(irg));
 
-  new_Block();
+  new_immBlock();
   add_in_edge(get_irg_current_block(irg), t);
   add_in_edge(get_irg_current_block(irg), jmp);
-  {
-    ir_node *in[0]; /* this is the array containing the return parameters */
-    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);