changed because of mor verbose irdump

[libfirm] / testprograms / const_ent_example.c

diff --git a/testprograms/const_ent_example.c b/testprograms/const_ent_example.c
index f2e16d1..928dbe9 100644 (file)
--- a/testprograms/const_ent_example.c
+++ b/testprograms/const_ent_example.c
@@ -1,9 +1,9 @@
 /* Copyright (C) 2000 by Universitaet Karlsruhe
-** All rights reserved.
-**
-** Author: Goetz Lindenmaier
-**
-** testprogram.
+* All rights reserved.
+*
+* Author: Goetz Lindenmaier
+*
+* testprogram.
 */
 
 #include <stdio.h>
@@ -14,25 +14,25 @@
 # include "firm.h"
 
 /**
-***  This file constructs type information for constant entities.
-***
-***  It constructs the information for a class type with a dispatch
-***  table.  The class has a field a, and two methods f and g.  The
-***  class is represented by a class type with two entities for the
-***  field a and the reference to the dispatch table.  This reference
-***  is a constant entity.  Ther dispatch table is also represented
-***  by a class type that contains the two methods.   There is one entity
-***  of the dispatch table which is constant.
-***
-***  Further the example shows the representation of a constant global
-***  array.
-***
-***  class C {
-***    int a;
-***    void f();
-***    void g(int);
-***  }
-***  int[4] arre = (7, 2, 13, 92);
+*  This file constructs type information for constant entities.
+*
+*  It constructs the information for a class type with a dispatch
+*  table.  The class has a field a, and two methods f and g.  The
+*  class is represented by a class type with two entities for the
+*  field a and the reference to the dispatch table.  This reference
+*  is a constant entity.  Ther dispatch table is also represented
+*  by a class type that contains the two methods.   There is one entity
+*  of the dispatch table which is constant.
+*
+*  Further the example shows the representation of a constant global
+*  array.
+*
+*  class C {
+*    int a;
+*    void f();
+*    void g(int);
+*  }
+*  int[4] arre = (7, 2, 13, 92);
 **/
 
 int main(int argc, char **argv)
@@ -48,7 +48,7 @@ int main(int argc, char **argv)
   printf("Creating type information...\n");
 
   /** init library */
-  init_firm ();
+  init_firm (NULL);
 
   /** make idents for all used identifiers in the program. */
   Ci  = id_from_str("C",  strlen("C"));
@@ -89,7 +89,11 @@ int main(int argc, char **argv)
   current_ir_graph = get_const_code_irg();
   /* The pointer to the dispatch table is constant. */
   /* The constant is the address of the given entity */
-  n = new_Const(mode_P, tarval_p_from_entity(dipte));
+<<<<<<< const_ent_example.c
+  n = new_Const(mode_P, new_tarval_from_entity(dipte, mode_P));
+=======
+  n = new_Const(mode_P, tarval_P_from_entity(dipte));
+>>>>>>> 1.7
   set_entity_variability(diptpe, constant);
   set_atomic_ent_value(diptpe, n);
 
@@ -118,13 +122,13 @@ int main(int argc, char **argv)
   arre = new_entity(get_glob_type(), arrei, arrt);
   set_entity_variability(arre, constant);
   current_ir_graph = get_const_code_irg();
-  n = new_Const(mode_Is, tarval_from_long (mode_Is, 7));
+  n = new_Const(mode_Is, new_tarval_from_long (7, mode_Is));
   add_compound_ent_value(arre, n, arrelte);
-  n = new_Const(mode_Is, tarval_from_long (mode_Is, 2));
+  n = new_Const(mode_Is, new_tarval_from_long (2, mode_Is));
   add_compound_ent_value(arre, n, arrelte);
-  n = new_Const(mode_Is, tarval_from_long (mode_Is, 13));
+  n = new_Const(mode_Is, new_tarval_from_long (13, mode_Is));
   add_compound_ent_value(arre, n, arrelte);
-  n = new_Const(mode_Is, tarval_from_long (mode_Is, 92));
+  n = new_Const(mode_Is, new_tarval_from_long (92, mode_Is));
   add_compound_ent_value(arre, n, arrelte);
 }
   printf("Done building the graph.  Dumping it.\n");