X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=testprograms%2Fwhile_example.c;h=69d2bdfb1de5c89043a3eb41f24cc3202a11e840;hb=191ffc9153ebeb4a57a8bfa0c0d124081738f939;hp=3c19927c73f493f8a2d4cafe9113f5add264737a;hpb=9924f5a9ff6902ae3c18d5065b13b676bbf25502;p=libfirm

diff --git a/testprograms/while_example.c b/testprograms/while_example.c
index 3c19927c7..69d2bdfb1 100644
--- a/testprograms/while_example.c
+++ b/testprograms/while_example.c
@@ -1,78 +1,84 @@
 /* Copyright (C) 2001 by Universitaet Karlsruhe
-** All rights reserved.
-**
-** Authors: Goetz Lindenmaier
-**
-** testprogram.
+* All rights reserved.
+*
+* Authors: Goetz Lindenmaier
+*
+* testprogram.
 */
 
+# include <stdio.h>
+# include <string.h>
+
+# include "irvrfy.h"
 # include "irdump.h"
 # include "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
-***
-***    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
 main(void)
 {
-  type_primitive *prim_t_int;
+  type *prim_t_int;
   ir_graph *irg;
-  type_class *owner;
-  type_method *proc_main;
+  type *owner;
+  type *proc_main;
   entity *ent;
   ir_node *b, *x, *r, *t, *f;
 
   printf("\nCreating an IR graph: WHILE_EXAMPLE...\n");
 
   init_firm ();
-  //turn_of_edge_labels();
 
   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"
+#define METHODNAME "main_tp"
 #define NRARGS 1
-#define NRES 0
+#define NRES 1
 
   proc_main = new_type_method(id_from_str(METHODNAME, strlen(METHODNAME)),
                               NRARGS, NRES);
-  set_method_param_type(proc_main, 0, (type *)prim_t_int);
+  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", 16));
-  ent = new_entity ((type *)owner, id_from_str ("main", 4), (type *)proc_main);
+  owner = new_type_class (id_from_str ("WHILE_EXAMPLE", 13));
+  ent = new_entity (owner, id_from_str ("main", strlen("main")), proc_main);
 
   /* 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_Proj(get_irg_args(irg), mode_I, 0));
-  set_value (1, new_Const (mode_I, tarval_from_long (mode_I, 1)));
+  /* Generate two values */
+  set_value (0, new_Proj(get_irg_args(irg), mode_Is, 0));
+  set_value (1, new_Const (mode_Is, tarval_from_long (mode_Is, 1)));
   x = new_Jmp();
   mature_block (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_I, tarval_from_long (mode_i, 0)),
-				 new_Const (mode_I, tarval_from_long (mode_i, 0))),
+  x = new_Cond (new_Proj(new_Cmp(new_Const (mode_Is, tarval_from_long (mode_Is, 0)),
+				 get_value(1, mode_Is)),
                          mode_b, Eq));
   f = new_Proj (x, mode_X, 0);
   t = new_Proj (x, mode_X, 1);
@@ -86,9 +92,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);
 
@@ -99,7 +105,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);
   }
@@ -108,6 +114,8 @@ main(void)
   add_in_edge (get_irg_end_block(irg), x);
   mature_block (get_irg_end_block(irg));
 
+  finalize_cons (irg);
+
   printf("Optimizing ...\n");
 
   local_optimize_graph(irg),
@@ -118,6 +126,8 @@ 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");