X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=testprograms%2Fthree_cfpred_example.c;h=177c2d7923ace5d90a7cc96c378c2cf65f4e65fb;hb=478dcb4a03eec4c6fe63b5aa9e4ee70f11bdd93e;hp=c4618d718641b1d9e4163b05ec03387ba7798c14;hpb=df83e37827032795585d3b25776c465870672901;p=libfirm

diff --git a/testprograms/three_cfpred_example.c b/testprograms/three_cfpred_example.c
index c4618d718..177c2d792 100644
--- a/testprograms/three_cfpred_example.c
+++ b/testprograms/three_cfpred_example.c
@@ -1,10 +1,15 @@
-/* Copyright (C) 1998 - 2000 by Universitaet Karlsruhe
-* All rights reserved.
-*
-* Authors: Christian Schaefer, Goetz Lindenmaier
-*
-* testprogram.
-*/
+/*
+ * Project:     libFIRM
+ * File name:   testprograms/three_cfpred_example.c
+ * Purpose:     Construct a block with more than two predecessors.
+ * 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,40 +18,36 @@
 # include "irdump.h"
 # include "firm.h"
 
-/*
- *   a dead block / unreachable code.
- */
-
 /**
-*  This file constructs a control flow of following shape:
-*
-*
-*       firstCondBlock
-*          /     \
-*         /       \
-*       |/_       _\|
-*     Block1    scnCondBlock
-*        |       |        |
-* 	   |       |        |
-* 	   |      \ /      \ /
-*        |     Block2   Block3
-*         \      |       /
-*      \     |      /
-*      _\|  \ /   |/_
-*            nextBlock
-*
-*
-*   This is a program as, e.g.,
-*
-*   if () then
-*     { Jmp label1; } // happens anyways
-*   else
-*     { Jmp label1; } // happens anyways
-* label1:
-*   return();
-*   Jmp label1;
-*
-**/
+ *  This file constructs a control flow of following shape:
+ *
+ *
+ *       firstCondBlock
+ *          /     \
+ *         /       \
+ *       |/_       _\|
+ *     Block1    scnCondBlock
+ *        |       |        |
+ *        |       |        |
+ *    |      \ /      \ /
+ *        |     Block2   Block3
+ *         \      |       /
+ *          \     |      /
+ *          _\|  \ /   |/_
+ *            nextBlock
+ *
+ *
+ *   This is a program as, e.g.,
+ *
+ *   if () then
+ *     { Jmp label1; } /*  happens anyways  *
+ *   else
+ *     { Jmp label1; } /*  happens anyways  *
+ * label1:
+ *   return();
+ *   Jmp label1;
+ *
+ **/
 
 int main(int argc, char **argv)
 {
@@ -59,7 +60,7 @@ int main(int argc, char **argv)
           *scndCondBlock, *Block2, *Block3, *x;
 
   /* init library */
-  init_firm ();
+  init_firm (NULL);
 
   set_optimize(1);
 
@@ -71,14 +72,14 @@ int main(int argc, char **argv)
    * all functions as methods in this file.
    * This class now is automatically generated.
    */
-#define METHODNAME "main"
+#define METHODNAME "THREE_CFPRED_EXAMPLE_main"
 #define NRARGS 1
 #define NRES 1
-  printf("\nCreating an IR graph: ...\n");
+  printf("\nCreating an IR graph: THREE_CFPRED_EXAMPLE ...\n");
 
   owner = get_glob_type();
   proc_main = new_type_method(id_from_str(METHODNAME, strlen(METHODNAME)),
-			      NRARGS, NRES);
+                  NRARGS, NRES);
   set_method_param_type(proc_main, 0, prim_t_int);
   set_method_res_type(proc_main, 0, prim_t_int);
 
@@ -91,12 +92,12 @@ int main(int argc, char **argv)
   irg = new_ir_graph (ent, NUM_OF_LOCAL_VARS);
 
   /* to make a condition  */
-  c1 = new_Const (mode_Is, tarval_from_long (mode_Is, 1));
+  c1 = new_Const (mode_Is, new_tarval_from_long (1, mode_Is));
   c2 = new_Proj (get_irg_args(irg), mode_Is, 0);
   set_value(1, c2);
 
   cond = new_Cond(new_Proj(new_Cmp(c1, c2), mode_b, Eq));
-  set_value(0, new_Const (mode_Is, tarval_from_long (mode_Is, 6)));
+  set_value(0, new_Const (mode_Is, new_tarval_from_long (6, mode_Is)));
   f = new_Proj(cond, mode_X, 0);
   t = new_Proj(cond, mode_X, 1);
   mature_block(get_irg_current_block(irg));
@@ -108,7 +109,7 @@ int main(int argc, char **argv)
   Block1 = new_immBlock();
   add_in_edge(Block1, t);
   mature_block(Block1);
-  set_value(0, new_Const (mode_Is, tarval_from_long (mode_Is, 5)));
+  set_value(0, new_Const (mode_Is, new_tarval_from_long (5, mode_Is)));
   jmp = new_Jmp();
   add_in_edge(endBlock, jmp);
 
@@ -116,7 +117,7 @@ int main(int argc, char **argv)
   scndCondBlock = new_immBlock();
   add_in_edge(scndCondBlock, f);
   mature_block(scndCondBlock);
-  c1 = new_Const (mode_Is, tarval_from_long (mode_Is, 3));
+  c1 = new_Const (mode_Is, new_tarval_from_long (3, mode_Is));
   cond = new_Cond(new_Proj(new_Cmp(c1, get_value(1, mode_Is)), mode_b, Eq));
   f = new_Proj(cond, mode_X, 0);
   t = new_Proj(cond, mode_X, 1);