X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=testprograms%2Fconst_eval_example.c;h=ba20d8f37798a54f83b15d94487a994c4af7d897;hb=60478f1cd1789370b9f088fa46b13fe71801e126;hp=a507bfa41cc5509b296201a67a3cbe6e89237647;hpb=2fa17934abe60b32409bf3b797ec3aa675a1b1a0;p=libfirm

diff --git a/testprograms/const_eval_example.c b/testprograms/const_eval_example.c
index a507bfa41..ba20d8f37 100644
--- a/testprograms/const_eval_example.c
+++ b/testprograms/const_eval_example.c
@@ -6,6 +6,10 @@
 ** testprogram
 */
 
+#include <stdio.h>
+# include <string.h>
+
+# include "irvrfy.h"
 # include "irdump.h"
 # include "firm.h"
 
@@ -25,24 +29,30 @@
 int
 main(void)
 {
+  type     *prim_t_int;
   ir_graph *irg;
-  type_class *owner;
-  type_method *method;    /* the type of this method */
+  type *owner;
+  type *method;    /* the type of this method */
   entity *ent;
   ir_node *a, *b, *c, *d, *x;
 
-  printf("creating an IR graph: CONST_EVAL_EXAMPLE...\n");
+  printf("\nCreating an IR graph: CONST_EVAL_EXAMPLE...\n");
 
   init_firm ();
 
+  /*** Make basic type information for primitive type int. ***/
+  prim_t_int = new_type_primitive(id_from_str ("int", 3), mode_i);
+
   /* Try both optimizations: */
   set_opt_constant_folding(1);
   set_opt_cse(1);
-  set_opt_dead_node_elimination (0);
+  set_opt_dead_node_elimination (1);
 
   owner = new_type_class (id_from_str ("CONST_EVAL_EXAMPLE", 18));
   method = new_type_method (id_from_str("main", 4), 0, 2);
-  ent = new_entity ((type *)owner, id_from_str ("main", 4), (type *)method);
+  set_method_res_type(method, 0, prim_t_int);
+  set_method_res_type(method, 1, prim_t_int);
+  ent = new_entity (owner, id_from_str ("main", 4), method);
 
   irg = new_ir_graph (ent, 4);
 
@@ -50,7 +60,7 @@ main(void)
   b = new_Const (mode_i, tarval_from_long (mode_i, 5));
 
   x = new_Jmp ();
-  mature_block (irg->current_block);
+  mature_block (get_irg_current_block(irg));
 
   /*  To test const eval on DivMod
   c = new_DivMod(get_store(), a, b);
@@ -74,19 +84,22 @@ main(void)
      x = new_Return (get_store (), 2, in);
   }
 
-  add_in_edge (irg->end_block, x);
-  mature_block (irg->end_block);
+  add_in_edge (get_irg_end_block(irg), x);
+  mature_block (get_irg_end_block(irg));
 
-  printf("\nDone building the graph.  Dumping it.\n");
-  /* verify the graph */
-  irg_vrfy(irg);
+  finalize_cons (irg);
 
+  printf("Optimizing ...\n");
   dead_node_elimination(irg);
 
+  /* verify the graph */
+  irg_vrfy(irg);
+
+  printf("Done building the graph.  Dumping it.\n");
   dump_ir_block_graph (irg);
 
   printf("use xvcg to view this graph:\n");
-  printf("/ben/goetz/bin/xvcg GRAPHNAME\n");
+  printf("/ben/goetz/bin/xvcg GRAPHNAME\n\n");
 
   return (0);
 }