X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=testprograms%2Fwhile_example.c;h=6922dbdaff523fb689793b2f6e21f53bdad55e1d;hb=c6e8578501b64a525e98b222894918e7a4512708;hp=8986af6b831edc290e7c2bb7c6fcc89ffc20ebf7;hpb=76572961989e62cef01b295c6c8af7460f6080dd;p=libfirm

diff --git a/testprograms/while_example.c b/testprograms/while_example.c
index 8986af6b8..6922dbdaf 100644
--- a/testprograms/while_example.c
+++ b/testprograms/while_example.c
@@ -9,21 +9,17 @@
  * 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 <libfirm/firm.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
+*  main(int a) {        //  pos 0
+*    int b = 1;         //  pos 1
+*    int h;             //  pos 2
 *
 *    while (0 == 2) loop {
 *      h = a;
@@ -38,88 +34,89 @@
 int
 main(void)
 {
-  type *prim_t_int;
+  const char *suffix = "";
+  ir_type *prim_t_int;
   ir_graph *irg;
-  type *owner;
-  type *proc_main;
-  entity *ent;
+  ir_type *owner;
+  ir_type *proc_main;
+  ir_entity *ent;
   ir_node *b, *x, *r, *t, *f;
 
   printf("\nCreating an IR graph: WHILE_EXAMPLE...\n");
 
-  init_firm (NULL);
+  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_Is);
+  prim_t_int = new_type_primitive(new_id_from_chars("int", 3), mode_Is);
 
 #define METHODNAME "main_tp"
 #define NRARGS 1
 #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_param_type(proc_main, 0, prim_t_int);
   set_method_res_type(proc_main, 0, prim_t_int);
 
 
-  owner = new_type_class (id_from_str ("WHILE_EXAMPLE", 13));
-  ent = new_entity (owner, id_from_str ("main", strlen("main")), proc_main);
+  owner = new_type_class(new_id_from_chars("WHILE_EXAMPLE", 13));
+  ent = new_entity(owner, new_id_from_chars("main", strlen("main")), proc_main);
+  get_entity_ld_name(ent); /* force name mangling */
 
   /* Generates start and end blocks and nodes and a first, initial block */
-  irg = new_ir_graph (ent, 4);
+  irg = new_ir_graph(ent, 4);
 
   /* Generate two values */
-  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)));
+  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));
+  mature_immBlock(get_irg_current_block(irg));
 
 
   /* 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_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);
+  r = new_immBlock();
+  add_immBlock_pred(r, x);
+  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, 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_in_edge (b, t);
-  x = new_Jmp ();
-  add_in_edge (r, x);
+  b = new_immBlock();
+  add_immBlock_pred(b, t);
+  x = new_Jmp();
+  add_immBlock_pred(r, x);
 
   /* 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_Is));
-  set_value (0, get_value (1, mode_Is));
-  set_value (1, get_value (2, mode_Is));
-  mature_block (b);
-  mature_block (r);
+  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_immBlock(b);
+  mature_immBlock(r);
 
   /* generate the return block */
-  r = new_immBlock ();
-  add_in_edge (r, f);
-  mature_block (r);
+  r = new_immBlock();
+  add_immBlock_pred(r, f);
+  mature_immBlock(r);
 
   {
      ir_node *in[1];
-     in[0] = new_Sub (get_value (0, mode_Is), get_value (1, mode_Is), mode_Is);
+     in[0] = new_Sub(get_value(0, mode_Is), get_value(1, mode_Is), mode_Is);
 
-     x = new_Return (get_store (), 1, in);
+     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");
 
@@ -132,10 +129,10 @@ main(void)
   /* output the vcg file */
   printf("Done building the graph.  Dumping it.\n");
   turn_off_edge_labels();
-  dump_all_types();
-  dump_ir_block_graph (irg);
-  printf("Use xvcg to view this graph:\n");
-  printf("/ben/goetz/bin/xvcg GRAPHNAME\n\n");
+  dump_all_types(suffix);
+  dump_ir_block_graph(irg, suffix);
+  printf("Use ycomp to view this graph:\n");
+  printf("ycomp WHILE_EXAMPLE\n\n");
 
-  return (0);
+  return(0);
 }