X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=testprograms%2Fconst_eval_example.c;h=02f44b3212880a260b77b38f918f672b3e9bcc66;hb=6b458d6a9cd084958049e18008160b7862f9ce62;hp=9afc95d0cc6cf68c4201ac8d6f927f6494d345a5;hpb=863d31d7a5c8210432fef88b30fc3e8353131538;p=libfirm

diff --git a/testprograms/const_eval_example.c b/testprograms/const_eval_example.c
index 9afc95d0c..02f44b321 100644
--- a/testprograms/const_eval_example.c
+++ b/testprograms/const_eval_example.c
@@ -11,11 +11,9 @@
  */
 
 #include <stdio.h>
-# include <string.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:
@@ -33,52 +31,51 @@
 int
 main(void)
 {
-  type     *prim_t_int;
+  ir_type     *prim_t_int;
   ir_graph *irg;
-  type *owner;
-  type *method;    /* the type of this method */
-  entity *ent;
+  ir_type *owner;
+  ir_type *method;    /* the ir_type of this method */
+  ir_entity *ent;
   ir_node *a, *b, *c, *d, *x;
 
   printf("\nCreating an IR graph: CONST_EVAL_EXAMPLE...\n");
 
-  init_firm (NULL);
+  init_firm(NULL);
 
-  /*** Make basic type information for primitive type int. ***/
-  prim_t_int = new_type_primitive(new_id_from_chars ("int", 3), mode_Is);
+  /*** Make basic ir_type information for primitive ir_type int. ***/
+  prim_t_int = new_type_primitive(new_id_from_chars("int", 3), mode_Is);
 
   /* Try both optimizations: */
   set_opt_constant_folding(1);
   set_opt_cse(1);
-  set_opt_dead_node_elimination (1);
 
-  owner = new_type_class (new_id_from_chars ("CONST_EVAL_EXAMPLE", 18));
-  method = new_type_method (new_id_from_chars("main", 4), 0, 2);
+  owner = new_type_class(new_id_from_chars("CONST_EVAL_EXAMPLE", 18));
+  method = new_type_method(new_id_from_chars("main", 4), 0, 2);
   set_method_res_type(method, 0, prim_t_int);
   set_method_res_type(method, 1, prim_t_int);
-  ent = new_entity (owner, new_id_from_chars ("main", 4), method);
+  ent = new_entity(owner, new_id_from_chars("main", 4), method);
   get_entity_ld_name(ent);
 
-  irg = new_ir_graph (ent, 4);
+  irg = new_ir_graph(ent, 4);
 
-  a = new_Const (mode_Is, new_tarval_from_long (7, mode_Is));
-  b = new_Const (mode_Is, new_tarval_from_long (5, mode_Is));
+  a = new_Const(mode_Is, new_tarval_from_long(7, mode_Is));
+  b = new_Const(mode_Is, new_tarval_from_long(5, mode_Is));
 
-  x = new_Jmp ();
-  mature_immBlock (get_irg_current_block(irg));
+  x = new_Jmp();
+  mature_immBlock(get_irg_current_block(irg));
 
   /*  To test const eval on DivMod
   c = new_DivMod(get_store(), a, b);
-  set_store(new_Proj(c, mode_M, 0));
-  d = new_Proj(c, mode_Is, 3);
-  c = new_Proj(c, mode_Is, 2);
+  set_store(new_Proj(c, mode_M, pn_DivMod_M));
+  d = new_Proj(c, mode_Is, pn_DivMod_res_mod);
+  c = new_Proj(c, mode_Is, pn_DivMod_res_div);
   */
 
-  c = new_Add (new_Const (mode_Is, new_tarval_from_long (5, mode_Is)),
-	       new_Const (mode_Is, new_tarval_from_long (7, mode_Is)),
+  c = new_Add(new_Const(mode_Is, new_tarval_from_long(5, mode_Is)),
+	       new_Const(mode_Is, new_tarval_from_long(7, mode_Is)),
 	       mode_Is);
-  d = new_Add (new_Const (mode_Is, new_tarval_from_long (7, mode_Is)),
-	       new_Const (mode_Is, new_tarval_from_long (5, mode_Is)),
+  d = new_Add(new_Const(mode_Is, new_tarval_from_long(7, mode_Is)),
+	       new_Const(mode_Is, new_tarval_from_long(5, mode_Is)),
 	       mode_Is);
 
   {
@@ -86,13 +83,13 @@ main(void)
      in[0] = c;
      in[1] = d;
 
-     x = new_Return (get_store (), 2, in);
+     x = new_Return(get_store(), 2, in);
   }
 
-  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));
 
-  irg_finalize_cons (irg);
+  irg_finalize_cons(irg);
 
   printf("Optimizing ...\n");
   dead_node_elimination(irg);
@@ -101,10 +98,10 @@ main(void)
   irg_vrfy(irg);
 
   printf("Done building the graph.  Dumping it.\n");
-  dump_ir_block_graph (irg, 0);
+  dump_ir_block_graph(irg, 0);
 
-  printf("use xvcg to view this graph:\n");
-  printf("/ben/goetz/bin/xvcg GRAPHNAME\n\n");
+  printf("Use ycomp to view this graph:\n");
+  printf("ycomp GRAPHNAME\n\n");
 
-  return (0);
+  return 0;
 }