X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=testprograms%2Fif_while_example.c;h=433758c8364573282e18f003742c08f2888735fb;hb=8c07354ef364b2f5f9774c7b3e64d42ccc2ccf75;hp=0e6a18a626a26ecd641d9566f3725bb3f056c1c9;hpb=67e3ef5e7088c2254daeb2a72e0950bef6ca0256;p=libfirm

diff --git a/testprograms/if_while_example.c b/testprograms/if_while_example.c
index 0e6a18a62..433758c83 100644
--- a/testprograms/if_while_example.c
+++ b/testprograms/if_while_example.c
@@ -1,10 +1,15 @@
-/* (C) 1998 - 2000 by Universitaet Karlsruhe
-** All rights reserved.
-**
-** Authors: Christian Schaefer, Goetz Lindenmaier
-**
-** testprogram.
-*/
+/*
+ * Project:     libFIRM
+ * File name:   testprograms/if_while_example.c
+ * Purpose:     Shows more complex 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>
@@ -12,26 +17,27 @@
 # include "irvrfy.h"
 # include "irdump.h"
 # include "firm.h"
+# include "irouts.h"
 
 /**
-***  This file constructs the ir for the following pseudo-program:
-***
-***  main() {
-***    int a = 0;         // pos 0
-***    int b = 1;         // pos 1
-***    int h;             // pos 2
-***
-***    if (0 == 0)
-***      { a = 2; }
-***
-***    while (0 == 0) loop {
-***      h = a;
-***      a = b;
-***      b = h;
-***    }
-***
-***    return a-b;
-***  }
+*  This file constructs the ir for the following pseudo-program:
+*
+*  main() {
+*    int a = 0;         //  pos 0
+*    int b = 1;         //  pos 1
+*    int h;             //  pos 2
+*
+*    if (0 == 0)
+*      { a = 2; }
+*
+*    while (0 == 0) loop {
+*      h = a;
+*      a = b;
+*      b = h;
+*    }
+*
+*    return a-b;
+*  }
 **/
 
 int
@@ -46,7 +52,7 @@ main(void)
 
   printf("\nCreating an IR graph: IF_WHILE_EXAMPLE...\n");
 
-  init_firm ();
+  init_firm (NULL);
   turn_off_edge_labels();
 
   set_optimize(1);
@@ -56,76 +62,77 @@ main(void)
   set_opt_dead_node_elimination (1);
 
   /*** Make basic type information for primitive type int. ***/
-  prim_t_int = new_type_primitive(id_from_str ("int", 3), mode_I);
+  prim_t_int = new_type_primitive(new_id_from_chars ("int", 3), mode_Iu);
 
 #define METHODNAME "main"
 #define NRARGS 0
 #define NRES 1
 
-  proc_main = new_type_method(id_from_str(METHODNAME, strlen(METHODNAME)),
+  proc_main = new_type_method(new_id_from_chars(METHODNAME, strlen(METHODNAME)),
                               NRARGS, NRES);
   set_method_res_type(proc_main, 0, prim_t_int);
-  owner = new_type_class (id_from_str ("IF_WHILE_EXAMPLE", 16));
-  ent = new_entity (owner, id_from_str ("main", 4), proc_main);
+  owner = new_type_class (new_id_from_chars ("IF_WHILE_EXAMPLE", 16));
+  ent = new_entity (owner, new_id_from_chars ("main", 4), proc_main);
+  get_entity_ld_name(ent);
 
   /* Generates start and end blocks and nodes and a first, initial block */
   irg = new_ir_graph (ent, 4);
 
   /* Generate two constants */
-  set_value (0, new_Const (mode_I, tarval_from_long (mode_I, 0)));
-  set_value (1, new_Const (mode_I, tarval_from_long (mode_I, 1)));
-  mature_block (get_irg_current_block(irg));
+  set_value (0, new_Const (mode_Iu, new_tarval_from_long (0, mode_Iu)));
+  set_value (1, new_Const (mode_Iu, new_tarval_from_long (1, mode_Iu)));
+  mature_immBlock (get_irg_current_block(irg));
 
   /* Generate a conditional branch */
   x = new_Jmp();
 
   /* generate the fall through block and add all cfg edges */
   r = new_immBlock ();
-  add_in_edge (r, x);
-  mature_block (r);
+  add_immBlock_pred (r, x);
+  mature_immBlock (r);
   x = new_Jmp ();
 
   /* 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)),
-                                 new_Const (mode_I, tarval_from_long (mode_i, 0))),
-                         mode_b, Eq));
+  add_immBlock_pred (r, x);
+  x = new_Cond (new_Proj(new_Cmp(new_Const (mode_Iu, new_tarval_from_long (0, mode_Is)),
+                                 new_Const (mode_Iu, new_tarval_from_long (0, mode_Is))),
+                         mode_b, pn_Cmp_Eq));
   f = new_Proj (x, mode_X, 0);
   t = new_Proj (x, mode_X, 1);
 
   /* generate the block for the loop body */
   b = new_immBlock ();
-  add_in_edge (b,t);
+  add_immBlock_pred (b,t);
   x = new_Jmp ();
-  add_in_edge (r, x);
-  mature_block (r);
+  add_immBlock_pred (r, x);
+  mature_immBlock (r);
 
   /* 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));
-  mature_block (b);
+  set_value (2, get_value (0, mode_Iu));
+  set_value (0, get_value (1, mode_Iu));
+  set_value (1, get_value (2, mode_Iu));
+  mature_immBlock (b);
 
   /* generate the return block */
   r = new_immBlock ();
-  add_in_edge (r, f);
-  mature_block (r);
+  add_immBlock_pred (r, f);
+  mature_immBlock (r);
 
   {
      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_Iu), get_value (1, mode_Iu), mode_Iu);
 
      x = new_Return (get_store (), 1, in);
   }
 
   /* finalize the end block generated in new_ir_graph() */
-  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");
 
@@ -139,8 +146,8 @@ main(void)
 
   /* output the vcg file */
   printf("Done building the graph.  Dumping it with out-edges.\n");
-  dump_out_edges();
-  dump_ir_graph (irg);
+  dump_out_edges(1);
+  dump_ir_graph (irg, 0);
   printf("Use xvcg to view this graph:\n");
   printf("/ben/goetz/bin/xvcg GRAPHNAME\n\n");