X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=testprograms%2Fif_else_example.c;h=686d9a3479e6bb86805c749aa5b3d2ce9f6a9484;hb=95730664ee5ec63be34b1142222b6704300666f5;hp=1b4c70bc821b6e58185fc009732256ee313929cb;hpb=df83e37827032795585d3b25776c465870672901;p=libfirm

diff --git a/testprograms/if_else_example.c b/testprograms/if_else_example.c
index 1b4c70bc8..686d9a347 100644
--- a/testprograms/if_else_example.c
+++ b/testprograms/if_else_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/if_else_example.c
+ * Purpose:     Shows construction of if ... else control flow.
+ *              Tests Phi construction.
+ * 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>
@@ -41,10 +46,10 @@ int main(int argc, char **argv)
   entity   *ent;       /* represents this method as entity of owner */
   ir_node  *x, *x_then, *x_else, *c0, *c1, *c2, *cmpGt, *f, *t, *b;
 
-  printf("\ncreating an IR graph: IF_ELSE_EXAMPLE...\n");
+  printf("\nCreating an IR graph: IF_ELSE_EXAMPLE...\n");
 
   /* init library */
-  init_firm ();
+  init_firm (NULL);
 
   /*** Make basic type information for primitive type int. ***/
   prim_t_int = new_type_primitive(id_from_str ("int", 3), mode_Is);
@@ -55,10 +60,10 @@ int main(int argc, char **argv)
    * Therefore we define a class "IF_ELSE_EXAMPLE" with a method main as an
    * entity.
    */
-#define ENTITYNAME "main"
+#define ENTITYNAME "IF_ELSE_EXAMPLE_main"
 
   owner = get_glob_type();
-  method = new_type_method (id_from_str("main", 4), 0, 2);
+  method = new_type_method (id_from_str(ENTITYNAME, strlen(ENTITYNAME)), 0, 2);
   set_method_res_type(method, 0, prim_t_int);
   set_method_res_type(method, 1, prim_t_int);
 
@@ -74,15 +79,15 @@ int main(int argc, char **argv)
   irg = new_ir_graph (ent, NUM_OF_LOCAL_VARS);
 
   /* Generate two constants */
-  c0 = new_Const (mode_Is, tarval_from_long (mode_Is, 0));
-  c1 = new_Const (mode_Is, tarval_from_long (mode_Is, 1));
+  c0 = new_Const (mode_Is, new_tarval_from_long (0, mode_Is));
+  c1 = new_Const (mode_Is, new_tarval_from_long (1, mode_Is));
 
   /* set a and b to constants */
   set_value (0, c0);  /* this (0) is variable a */
   set_value (1, c1);  /* this (1) is variable b */
 
   /* the expression that evaluates the condition */
-  c2 = new_Const (mode_Is, tarval_from_long (mode_Is, 2));
+  c2 = new_Const (mode_Is, new_tarval_from_long (2, mode_Is));
   cmpGt = new_Proj(new_Cmp(get_value(0, mode_Is), c2), mode_b, Gt);
 
   /* the conditional branch */
@@ -102,7 +107,7 @@ int main(int argc, char **argv)
   /* generate and fill the else block */
   b = new_immBlock ();
   add_in_edge (b, f);
-  set_value (1, new_Const (mode_Is, tarval_from_long (mode_Is, 2)));
+  set_value (1, new_Const (mode_Is, new_tarval_from_long (2, mode_Is)));
   mature_block (b);
   x_else = new_Jmp ();
 
@@ -131,7 +136,7 @@ int main(int argc, char **argv)
 
   finalize_cons (irg);
 
-  printf("\nOptimizing ...\n");
+  printf("Optimizing ...\n");
   local_optimize_graph(irg);
   dead_node_elimination(irg);