X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=testprograms%2Farray-stack_example.c;h=cda2601966f01fa5ea79136f54ac512018f37ee7;hb=67067849894a6b5e0f87253ede8539331e3bdc3d;hp=38287fd48a3449a3a3ad41126d9827ad85572c2e;hpb=3e5692defee7bec4dcd584b83d1c79baaf6a63c7;p=libfirm

diff --git a/testprograms/array-stack_example.c b/testprograms/array-stack_example.c
index 38287fd48..cda260196 100644
--- a/testprograms/array-stack_example.c
+++ b/testprograms/array-stack_example.c
@@ -1,32 +1,36 @@
  /* Copyright (C) 1998 - 2000 by Universitaet Karlsruhe
-** All rights reserved.
-**
-** Authors: Goetz Lindenmaier
-**
-** testprogram.
+* All rights reserved.
+*
+* Authors: Goetz Lindenmaier
+*
+* testprogram.
 */
 
+# include <string.h>
+# include <stdio.h>
+
+# include "irvrfy.h"
 # include "irdump.h"
 # include "firm.h"
 
-/**  This example describes representation of stack allocated variables of
-***  imperative programs.
-***  It constructs the IR for the following program:
-***
-***
-***  main(): int
-***    int a[10];
-***
-***    return (a[3]);
-***  end;
-***
-***  The array is placed on the stack, i.e., a pointer to the array
-***  is obtained by selecting the entity "a" from the stack.  The variables
-***  on the stack are considered to be entities of the method, as locals
-***  of a method are only visible within the method.  (An alternative to
-***  make the method owner of the stack variables is to give the ownership
-***  to the class representing the C-file.  This would extend the visibility
-***  of the locals, though.)
+/**
+*  imperative programs.
+*  It constructs the IR for the following program:
+*
+*
+*  main(): int
+*    int a[10];
+*
+*    return (a[3]);
+*  end;
+*
+*  The array is placed on the stack, i.e., a pointer to the array
+*  is obtained by selecting the entity "a" from the stack.  The variables
+*  on the stack are considered to be entities of the method, as locals
+*  of a method are only visible within the method.  (An alternative to
+*  make the method owner of the stack variables is to give the ownership
+*  to the class representing the C-file.  This would extend the visibility
+*  of the locals, though.)
 **/
 
 
@@ -48,20 +52,14 @@ main(void)
   entity         *array_ent;    /* the entity representing the array as member
                                    of the stack/method */
   type           *array_type;   /* the type information for the array */
-  entity         *field_ent;    /* the entity representing a field of the array */
-
-  /* Needed while finding the element size.  */
-  type           *elt_type;
-  ir_mode        *elt_type_mode;
-  int            size;
-  ir_node        *arr_size;
+  entity         *field_ent;    /* the entity representing a field of the
+				   array */
 
   /* holds the graph and nodes. */
   ir_graph       *main_irg;
-  ir_node        *array, *array_ptr, *c3, *elt, *val, *x;
-
+  ir_node        *array_ptr, *c3, *elt, *val, *x;
 
-  init_firm ();
+  init_firm (NULL);
 
   printf("\nCreating an IR graph: ARRAY-STACK_EXAMPLE...\n");
 
@@ -70,7 +68,7 @@ main(void)
      This is the modeling appropriate for other languages.
      Mode_i says that all language-integers shall be implemented
      as a 32 bit processor-integer value.  */
-  prim_t_int = new_type_primitive(id_from_str ("int", 3), mode_i);
+  prim_t_int = new_type_primitive(id_from_str ("int", 3), mode_Is);
 
   /* build typeinformation of procedure main */
   owner = new_type_class (id_from_str ("ARRAY-STACK_EXAMPLE", 19));
@@ -86,8 +84,8 @@ main(void)
 # define U_BOUND 9
   array_type = new_type_array(id_from_str("a_tp", 4), N_DIMS, prim_t_int);
   set_array_bounds(array_type, 1,
-		   new_Const(mode_I, tarval_from_long (mode_I, L_BOUND)),
-		   new_Const(mode_I, tarval_from_long (mode_I, U_BOUND)));
+		   new_Const(mode_Iu, new_tarval_from_long (L_BOUND, mode_Iu)),
+		   new_Const(mode_Iu, new_tarval_from_long (U_BOUND, mode_Iu)));
   /* The array is an entity of the method, placed on the mehtod's own memory,
      the stack frame. */
   array_ent = new_entity(get_cur_frame_type(), id_from_str("a", 1), array_type);
@@ -107,7 +105,7 @@ main(void)
      array pointer 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_I, tarval_from_long (mode_I, 3));
+  c3 = new_Const (mode_Iu, new_tarval_from_long (3, mode_Iu));
   {
      ir_node *in[1];
      in[0] = c3;
@@ -115,7 +113,7 @@ main(void)
   }
   val = new_Load(get_store(), elt);
   set_store(new_Proj(val, mode_M, 0));
-  val = new_Proj(val, mode_i, 2);
+  val = new_Proj(val, mode_Is, 2);
 
   /* return the result of procedure main */
   {
@@ -130,13 +128,14 @@ main(void)
   add_in_edge (get_irg_end_block(main_irg), x);
   mature_block (get_irg_end_block(main_irg));
 
+  finalize_cons (main_irg);
+
   printf("Optimizing ...\n");
   dead_node_elimination(main_irg);
 
   /* verify the graph */
   irg_vrfy(main_irg);
 
-
   printf("Dumping the graph and a type graph.\n");
   dump_ir_block_graph (main_irg);
   dump_type_graph(main_irg);
@@ -144,5 +143,5 @@ main(void)
   printf("Use xvcg to view these graphs:\n");
   printf("/ben/goetz/bin/xvcg GRAPHNAME\n\n");
 
-  return (1);
+  return (0);
 }