X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=testprograms%2Fif_while_example.c;h=1a8cab8c1c8cd6a35cfeed51b800630203d3f169;hb=cafbc21b0a0229d71139e0e2e5e88a8b38a763dd;hp=50758d25c50c068f2e05798a610655ad7396d7a6;hpb=dddcc630819f338c3b45e2bc646233e6872d5bb6;p=libfirm

diff --git a/testprograms/if_while_example.c b/testprograms/if_while_example.c
index 50758d25c..1a8cab8c1 100644
--- a/testprograms/if_while_example.c
+++ b/testprograms/if_while_example.c
@@ -9,15 +9,10 @@
  * Copyright:   (c) 1999-2003 Universität Karlsruhe
  * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
  */
+#include <stdio.h>
+#include <string.h>
 
-
-# include <stdio.h>
-# include <string.h>
-
-# include "irvrfy.h"
-# include "irdump.h"
-# include "firm.h"
-# include "irouts.h"
+#include <libfirm/firm.h>
 
 /**
 *  This file constructs the ir for the following pseudo-program:
@@ -44,10 +39,10 @@ int
 main(void)
 {
   ir_graph *irg;
-  type *owner;
-  type *proc_main;
-  type     *prim_t_int;
-  entity *ent;
+  ir_type *owner;
+  ir_type *proc_main;
+  ir_type *prim_t_int;
+  ir_entity *ent;
   ir_node *b, *x, *r, *t, *f;
 
   printf("\nCreating an IR graph: IF_WHILE_EXAMPLE...\n");
@@ -59,9 +54,8 @@ main(void)
   set_opt_constant_folding(0);  /* so that the stupid tests are not optimized. */
                                 /* if optimized no path to End remains!! */
   set_opt_cse(1);
-  set_opt_dead_node_elimination (1);
 
-  /*** Make basic type information for primitive type int. ***/
+  /*** Make basic ir_type information for primitive ir_type int. ***/
   prim_t_int = new_type_primitive(new_id_from_chars ("int", 3), mode_Iu);
 
 #define METHODNAME "main"
@@ -79,77 +73,77 @@ main(void)
   irg = new_ir_graph (ent, 4);
 
   /* Generate two constants */
-  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));
+  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_immBlock_pred (r, x);
-  mature_immBlock (r);
-  x = new_Jmp ();
+  r = new_immBlock();
+  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_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, Eq));
-  f = new_Proj (x, mode_X, 0);
-  t = new_Proj (x, mode_X, 1);
+  r = new_immBlock();
+  add_immBlock_pred(r, x);
+  x = new_Cond(new_Proj(new_Cmp(new_Const(mode_Iu, new_tarval_from_long(0, mode_Iu)),
+                                new_Const(mode_Iu, new_tarval_from_long(0, mode_Iu))),
+                        mode_b, pn_Cmp_Eq));
+  f = new_Proj(x, mode_X, pn_Cond_false);
+  t = new_Proj(x, mode_X, pn_Cond_true);
 
   /* generate the block for the loop body */
-  b = new_immBlock ();
-  add_immBlock_pred (b,t);
-  x = new_Jmp ();
-  add_immBlock_pred (r, x);
-  mature_immBlock (r);
+  b = new_immBlock();
+  add_immBlock_pred(b,t);
+  x = new_Jmp();
+  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_Iu));
-  set_value (0, get_value (1, mode_Iu));
-  set_value (1, get_value (2, mode_Iu));
-  mature_immBlock (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_immBlock_pred (r, f);
-  mature_immBlock (r);
+  r = new_immBlock();
+  add_immBlock_pred(r, f);
+  mature_immBlock(r);
 
   {
      ir_node *in[1];
-     in[0] = new_Sub (get_value (0, mode_Iu), get_value (1, mode_Iu), mode_Iu);
+     in[0] = new_Sub(get_value(0, mode_Iu), get_value(1, mode_Iu), mode_Iu);
 
-     x = new_Return (get_store (), 1, in);
+     x = new_Return(get_store(), 1, in);
   }
 
   /* finalize the end block generated in new_ir_graph() */
-  add_immBlock_pred (get_irg_end_block(irg), x);
-  mature_immBlock (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");
 
   local_optimize_graph(irg);
   dead_node_elimination(irg);
 
-  compute_outs(irg);
+  compute_irg_outs(irg);
 
   /* verify the graph */
   irg_vrfy(irg);
 
   /* output the vcg file */
   printf("Done building the graph.  Dumping it with out-edges.\n");
-  dump_out_edges();
-  dump_ir_graph (irg, 0);
-  printf("Use xvcg to view this graph:\n");
-  printf("/ben/goetz/bin/xvcg GRAPHNAME\n\n");
+  dump_out_edges(1);
+  dump_ir_graph(irg, 0);
+  printf("Use ycomp to view this graph:\n");
+  printf("ycomp GRAPHNAME\n\n");
 
-  return (0);
+  return 0;
 }