X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=testprograms%2Fconst_eval_example.c;h=9afc95d0cc6cf68c4201ac8d6f927f6494d345a5;hb=9e56dbf066d3698df877e2a9f78caeca29ea5a03;hp=59384ef68ef063fa7a3e7dd42947cda9632c53ce;hpb=3e5692defee7bec4dcd584b83d1c79baaf6a63c7;p=libfirm

diff --git a/testprograms/const_eval_example.c b/testprograms/const_eval_example.c
index 59384ef68..9afc95d0c 100644
--- a/testprograms/const_eval_example.c
+++ b/testprograms/const_eval_example.c
@@ -1,25 +1,33 @@
-/* Copyright (C) 1998 - 2000 by Universitaet Karlsruhe
-** All rights reserved.
-**
-** Authors: Christian Schaefer, Goetz Lindenmaier
-**
-** testprogram
-*/
-
+/*
+ * Project:     libFIRM
+ * File name:   testprograms/const_eval_example.c
+ * Purpose:     Test constant evaluation.
+ * Author:      Christian Schaefer, Goetz Lindenmaier
+ * Modified by:
+ * Created:
+ * CVS-ID:      $Id$
+ * Copyright:   (c) 1999-2003 Universität Karlsruhe
+ * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
+ */
+
+#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 c, d;
-***
-***    c = 5 + 7;
-***    d = 7 + 5;
-***
-***    return (c, d);
-***  }
+*  This file constructs the ir for the following pseudo-program:
+*
+*  main() {
+*    int c, d;
+*
+*    c = 5 + 7;
+*    d = 7 + 5;
+*
+*    return (c, d);
+*  }
 **/
 
 int
@@ -34,43 +42,44 @@ main(void)
 
   printf("\nCreating an IR graph: CONST_EVAL_EXAMPLE...\n");
 
-  init_firm ();
+  init_firm (NULL);
 
   /*** Make basic type information for primitive type int. ***/
-  prim_t_int = new_type_primitive(id_from_str ("int", 3), mode_i);
+  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 (id_from_str ("CONST_EVAL_EXAMPLE", 18));
-  method = new_type_method (id_from_str("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, id_from_str ("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);
 
-  a = new_Const (mode_i, tarval_from_long (mode_i, 7));
-  b = new_Const (mode_i, tarval_from_long (mode_i, 5));
+  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_block (get_irg_current_block(irg));
+  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_i, 3);
-  c = new_Proj(c, mode_i, 2);
+  d = new_Proj(c, mode_Is, 3);
+  c = new_Proj(c, mode_Is, 2);
   */
 
-  c = new_Add (new_Const (mode_i, tarval_from_long (mode_i, 5)),
-	       new_Const (mode_i, tarval_from_long (mode_i, 7)),
-	       mode_i);
-  d = new_Add (new_Const (mode_i, tarval_from_long (mode_i, 7)),
-	       new_Const (mode_i, tarval_from_long (mode_i, 5)),
-	       mode_i);
+  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)),
+	       mode_Is);
 
   {
      ir_node *in[2];
@@ -80,17 +89,19 @@ main(void)
      x = new_Return (get_store (), 2, in);
   }
 
-  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));
+
+  irg_finalize_cons (irg);
 
   printf("Optimizing ...\n");
   dead_node_elimination(irg);
 
-  printf("Done building the graph.  Dumping it.\n");
   /* verify the graph */
   irg_vrfy(irg);
 
-  dump_ir_block_graph (irg);
+  printf("Done building the graph.  Dumping it.\n");
+  dump_ir_block_graph (irg, 0);
 
   printf("use xvcg to view this graph:\n");
   printf("/ben/goetz/bin/xvcg GRAPHNAME\n\n");