X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=testprograms%2Farray-heap_example.c;h=d8505540c4b5412aedb054c80e563de5f13431c4;hb=c688278dcfed3ffce6ec4d58dac0a9fa9e1d6f9a;hp=eeb7e222a2634e5fb11c8fea7a0ebd22a4c28509;hpb=9fbc46dc213871984b377a2b622a7ca8817fb0ad;p=libfirm

diff --git a/testprograms/array-heap_example.c b/testprograms/array-heap_example.c
index eeb7e222a..d8505540c 100644
--- a/testprograms/array-heap_example.c
+++ b/testprograms/array-heap_example.c
@@ -1,10 +1,15 @@
- /* Copyright (C) 1998 - 2000 by Universitaet Karlsruhe
-* All rights reserved.
-*
-* Authors: Goetz Lindenmaier
-*
-* testprogram.
-*/
+/*
+ * Project:     libFIRM
+ * File name:   testprograms/array-heap_example.c
+ * Purpose:     Show representation of dynamically allocated array.
+ * Author:      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 <string.h>
 # include <stdio.h>
@@ -76,28 +81,29 @@ main(void)
      This is the modeling appropriate for other languages.
      Mode_i says that all integers shall be implemented as a
      32 bit integer value.  */
-  prim_t_int = new_type_primitive(id_from_str ("int", 3), mode_Is);
+  prim_t_int = new_type_primitive(new_id_from_chars ("int", 3), mode_Is);
 
   printf("\nCreating an IR graph: ARRAY-HEAP_EXAMPLE...\n");
 
   /* first build procedure main */
   owner = get_glob_type();
-  proc_main = new_type_method(id_from_str("ARRAY-HEAP_EXAMPLE_main", 23), 0, 1);
+  proc_main = new_type_method(new_id_from_chars("ARRAY-HEAP_EXAMPLE_main", 23), 0, 1);
   set_method_res_type(proc_main, 0, (type *)prim_t_int);
-  proc_main_e = new_entity ((type*)owner, id_from_str ("ARRAY-HEAP_EXAMPLE_main", 23), (type *)proc_main);
-  main_irg = new_ir_graph (proc_main_e, 4);
+  proc_main_e = new_entity ((type*)owner, new_id_from_chars("ARRAY-HEAP_EXAMPLE_main", 23), (type *)proc_main);
 
   /* make type information for the array and set the bounds */
 # define N_DIMS 1
 # define L_BOUND 0
 # define U_BOUND 9
-  array_type = new_type_array(id_from_str("a", 1), N_DIMS, prim_t_int);
-  set_array_bounds(array_type, 1,
-		   new_Const(mode_Iu, tarval_from_long (mode_Iu, L_BOUND)),
-		   new_Const(mode_Iu, tarval_from_long (mode_Iu, U_BOUND)));
+  current_ir_graph = get_const_code_irg();
+  array_type = new_type_array(new_id_from_chars("a", 1), N_DIMS, prim_t_int);
+  set_array_bounds(array_type, 0,
+		   new_Const(mode_Iu, new_tarval_from_long (L_BOUND, mode_Iu)),
+		   new_Const(mode_Iu, new_tarval_from_long (U_BOUND, mode_Iu)));
   /* As the array is accessed by Sel nodes, we need information about
      the entity the node selects.  Entities of an array are it's elements
      which are, in this case, integers. */
+  main_irg = new_ir_graph (proc_main_e, 4);
   array_ent = get_array_element_entity(array_type);
 
   /* Allocate the array. All program known variables that
@@ -107,9 +113,9 @@ main(void)
   elt_type = get_array_element_type(array_type);
   elt_type_mode = get_type_mode(elt_type);
   /*   better: read bounds out of array type information */
-  size = (U_BOUND - L_BOUND + 1) * get_mode_size(elt_type_mode);
+  size = (U_BOUND - L_BOUND + 1) * get_mode_size_bytes(elt_type_mode);
   /*   make constant representing the size */
-  arr_size  = new_Const(mode_Iu, tarval_from_long (mode_Iu, size));
+  arr_size  = new_Const(mode_Iu, new_tarval_from_long (size, mode_Iu));
   /*   allocate and generate the Proj nodes. */
   array     = new_Alloc(get_store(), arr_size, (type*)array_type, stack_alloc);
   set_store(new_Proj(array, mode_M, 0));   /* make the changed memory visible */
@@ -121,13 +127,13 @@ main(void)
      by (three * elt_size), but this complicates some optimizations. The
      type information accessible via the entity allows to generate the
      pointer increment later. */
-  c3 = new_Const (mode_Iu, tarval_from_long (mode_Iu, 3));
+  c3 = new_Const (mode_Iu, new_tarval_from_long (3, mode_Iu));
   {
      ir_node *in[1];
      in[0] = c3;
      elt = new_Sel(get_store(), array_ptr, 1, in, array_ent);
   }
-  val = new_Load(get_store(), elt);
+  val = new_Load(get_store(), elt, mode_Is);
   set_store(new_Proj(val, mode_M, 0));
   val = new_Proj(val, mode_Is, 2);
 
@@ -138,11 +144,11 @@ main(void)
 
      x = new_Return (get_store (), 1, in);
   }
-  mature_block (get_irg_current_block(main_irg));
+  mature_immBlock (get_irg_current_block(main_irg));
 
   /* complete the end_block */
-  add_in_edge (get_irg_end_block(main_irg), x);
-  mature_block (get_irg_end_block(main_irg));
+  add_immBlock_pred (get_irg_end_block(main_irg), x);
+  mature_immBlock (get_irg_end_block(main_irg));
 
   finalize_cons (main_irg);
 
@@ -153,8 +159,10 @@ main(void)
   irg_vrfy(main_irg);
 
   printf("Dumping the graph and a type graph.\n");
-  dump_ir_block_graph (main_irg);
-  dump_type_graph(main_irg);
+  char *dump_file_suffix = "";
+  dump_ir_block_graph (main_irg, dump_file_suffix);
+  dump_type_graph(main_irg, dump_file_suffix);
+  dump_all_types(dump_file_suffix);
   printf("use xvcg to view these graphs:\n");
   printf("/ben/goetz/bin/xvcg GRAPHNAME\n\n");