better output of testprograms, warning removed,

[libfirm] / testprograms / while_example.c

diff --git a/testprograms/while_example.c b/testprograms/while_example.c
index df02e54..8986af6 100644 (file)
--- a/testprograms/while_example.c
+++ b/testprograms/while_example.c
@@ -1,30 +1,38 @@
-/* Copyright (C) 2001 by Universitaet Karlsruhe
-** All rights reserved.
-**
-** Authors: Goetz Lindenmaier
-**
-** testprogram.
-*/
-
+/*
+ * Project:     libFIRM
+ * File name:   testprograms/while_example.c
+ * Purpose:     Construct a loop.
+ * Author:      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>
+
+# include "irvrfy.h"
 # include "irdump.h"
 # include "firm.h"
-# include "irnode.h"
 
 /**
-***  This file constructs the ir for the following pseudo-program:
-***
-***  main(int a) {        // pos 0
-***    int b = 1;         // pos 1
-***    int h;             // pos 2
-***
-***    while (0 == 2) loop {
-***      h = a;
-***      a = b;
-***      b = h;
-***    }
-***
-***    return a-b;
-***  }
+*  This file constructs the ir for the following pseudo-program:
+*
+*  main(int a) {        // pos 0
+*    int b = 1;         // pos 1
+*    int h;             // pos 2
+*
+*    while (0 == 2) loop {
+*      h = a;
+*      a = b;
+*      b = h;
+*    }
+*
+*    return a-b;
+*  }
 **/
 
 int
@@ -39,14 +47,14 @@ main(void)
 
   printf("\nCreating an IR graph: WHILE_EXAMPLE...\n");
 
-  init_firm ();
+  init_firm (NULL);
 
   set_optimize(1);
   set_opt_constant_folding(1);
   set_opt_cse(1);
   set_opt_dead_node_elimination (1);
 
-  prim_t_int = new_type_primitive(id_from_str ("int", 3), mode_i);
+  prim_t_int = new_type_primitive(id_from_str ("int", 3), mode_Is);
 
 #define METHODNAME "main_tp"
 #define NRARGS 1
@@ -65,8 +73,8 @@ main(void)
   irg = new_ir_graph (ent, 4);
 
   /* Generate two values */
-  set_value (0, new_Proj(get_irg_args(irg), mode_i, 0));
-  set_value (1, new_Const (mode_i, tarval_from_long (mode_i, 1)));
+  set_value (0, new_Proj(get_irg_args(irg), mode_Is, 0));
+  set_value (1, new_Const (mode_Is, new_tarval_from_long (1, mode_Is)));
   x = new_Jmp();
   mature_block (get_irg_current_block(irg));
 
@@ -74,8 +82,8 @@ main(void)
   /* generate a block for the loop header and the conditional branch */
   r = new_immBlock ();
   add_in_edge (r, x);
-  x = new_Cond (new_Proj(new_Cmp(new_Const (mode_i, tarval_from_long (mode_i, 0)),
-                                get_value(1, mode_i)),
+  x = new_Cond (new_Proj(new_Cmp(new_Const (mode_Is, new_tarval_from_long (0, mode_Is)),
+                                get_value(1, mode_Is)),
                          mode_b, Eq));
   f = new_Proj (x, mode_X, 0);
   t = new_Proj (x, mode_X, 1);
@@ -89,9 +97,9 @@ main(void)
   /* The code in the loop body,
      as we are dealing with local variables only the dataflow edges
      are manipulated. */
-  set_value (2, get_value (0, mode_i));
-  set_value (0, get_value (1, mode_i));
-  set_value (1, get_value (2, mode_i));
+  set_value (2, get_value (0, mode_Is));
+  set_value (0, get_value (1, mode_Is));
+  set_value (1, get_value (2, mode_Is));
   mature_block (b);
   mature_block (r);
 
@@ -102,7 +110,7 @@ main(void)
 
   {
      ir_node *in[1];
-     in[0] = new_Sub (get_value (0, mode_i), get_value (1, mode_i), mode_i);
+     in[0] = new_Sub (get_value (0, mode_Is), get_value (1, mode_Is), mode_Is);
 
      x = new_Return (get_store (), 1, in);
   }
@@ -123,7 +131,7 @@ main(void)
 
   /* output the vcg file */
   printf("Done building the graph.  Dumping it.\n");
-  turn_of_edge_labels();
+  turn_off_edge_labels();
   dump_all_types();
   dump_ir_block_graph (irg);
   printf("Use xvcg to view this graph:\n");