X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=testprograms%2Foo_program_example.c;h=835d8be97f6a264cc9b1220b3ae1fbb9ee0c538b;hb=0eb9e8a7def8f3003527c59013190344d27f38f2;hp=f3dcaad56f471421d2c8f157aca817a55c98c8c5;hpb=328ae18da3e796f4f9fda2aba629cc34e2849ed7;p=libfirm

diff --git a/testprograms/oo_program_example.c b/testprograms/oo_program_example.c
index f3dcaad56..835d8be97 100644
--- a/testprograms/oo_program_example.c
+++ b/testprograms/oo_program_example.c
@@ -1,36 +1,44 @@
-/* Copyright (C) 1998 - 2000 by Universitaet Karlsruhe
-** All rights reserved.
-**
-** Authors: Goetz Lindenmaier
-**
-** testprogram.
-*/
-
+/*
+ * Project:     libFIRM
+ * File name:   testprograms/oo_program_example.c
+ * Purpose:     A complex example.
+ * 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 <stdio.h>
+# include <string.h>
+
+# include "irvrfy.h"
 # include "irdump.h"
 # include "firm.h"
 
-/**  This file constructs the IR for the following program:
-***
-***  class PRIMA {
-***    a: int;
-***
-***    int c(d: int) {
-***      return (d + self.a);
-***    }
-***
-***    void set_a(e:int) {
-***      self.a = e;
-***    }
-***
-***  }
-***
-***  int main() {
-***    o: PRIMA;
-***    o = new PRIMA;
-***    o.set_a(2);
-***    return o.c(5);
-***  };
-***
+/**
+*
+*  class PRIMA {
+*    a: int;
+*
+*    int c(d: int) {
+*      return (d + self.a);
+*    }
+*
+*    void set_a(e:int) {
+*      self.a = e;
+*    }
+*
+*  }
+*
+*  int main() {
+*    o: PRIMA;
+*    o = new PRIMA;
+*    o.set_a(2);
+*    return o.c(5);
+*  };
+*
 **/
 
 int
@@ -47,18 +55,18 @@ main(void)
   ir_node      *self, *par1, *a_ptr;
   ir_node      *a_val;
 
-  int o_pos, self_pos, e_pos, d_pos;
+  int o_pos, self_pos, e_pos;
 
   int i;
 
-  init_firm ();
+  init_firm (NULL);
 
   set_opt_constant_folding(1);
   set_opt_cse(1);
   set_opt_dead_node_elimination(1);
 
   /*** 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(id_from_str ("int", 3), mode_Is);
 
   /*** Make type information for the class (PRIMA). ***/
   /* The type of the class */
@@ -90,12 +98,12 @@ main(void)
      owner is the global type. */
   owner = get_glob_type();
   /* Main has zero parameters and one result. */
-  proc_main = new_type_method(id_from_str("main", 4), 0, 1);
+  proc_main = new_type_method(id_from_str("OO_PROGRAM_EXAMPLE_main", 23), 0, 1);
   /* The result type is int. */
   set_method_res_type(proc_main, 0, prim_t_int);
 
   /* The entity for main. */
-  proc_main_e = new_entity (owner, id_from_str ("main", 4), proc_main);
+  proc_main_e = new_entity (owner, id_from_str ("OO_PROGRAM_EXAMPLE_main", 23), proc_main);
 
   /** Build code for procedure main. **/
   /* We need one local variable (for "o"). */
@@ -106,26 +114,27 @@ main(void)
   set_irp_main_irg(main_irg);
 
   /* Make the constants.  They are independent of a block. */
-  c2 = new_Const (mode_i, tarval_from_long (mode_i, 2));
-  c5 = new_Const (mode_i, tarval_from_long (mode_i, 5));
+  c2 = new_Const (mode_Is, new_tarval_from_long (2, mode_Is));
+  c5 = new_Const (mode_Is, new_tarval_from_long (5, mode_Is));
 
   /* There is only one block in main, it contains the allocation and the calls. */
   /* Allocate the defined object and generate the type information. */
-  obj_size = new_SymConst((type_or_id_p)class_prima, size);
+  symconst_symbol sym = {class_prima};
+  obj_size = new_SymConst(sym, symconst_size);
   obj_o    = new_Alloc(get_store(), obj_size, class_prima, heap_alloc);
   set_store(new_Proj(obj_o, mode_M, 0));  /* make the changed memory visible */
-  obj_o    = new_Proj(obj_o, mode_p, 2);  /* remember the pointer to the object */
+  obj_o    = new_Proj(obj_o, mode_P, 2);  /* remember the pointer to the object */
   set_value(o_pos, obj_o);
 
   /* Get the pointer to the procedure from the object.  */
   proc_ptr = new_simpleSel(get_store(),             /* The memory containing the object. */
-			   get_value(o_pos, mode_p),/* The pointer to the object. */
+			   get_value(o_pos, mode_P),/* The pointer to the object. */
 			   proc_set_a_e );            /* The feature to select. */
 
   /* Call procedure set_a, first built array with parameters. */
   {
     ir_node *in[2];
-    in[0] = get_value(o_pos, mode_p);
+    in[0] = get_value(o_pos, mode_P);
     in[1] = c2;
     call = new_Call(get_store(), proc_ptr, 2, in, proc_set_a);
   }
@@ -133,12 +142,12 @@ main(void)
   set_store(new_Proj(call, mode_M, 0));
 
   /* Get the pointer to the nest procedure from the object. */
-  proc_ptr = new_simpleSel(get_store(), get_value(o_pos, mode_p), proc_c_e);
+  proc_ptr = new_simpleSel(get_store(), get_value(o_pos, mode_P), proc_c_e);
 
   /* call procedure c, first built array with parameters */
   {
     ir_node *in[2];
-    in[0] = get_value(o_pos, mode_p);
+    in[0] = get_value(o_pos, mode_P);
     in[1] = c5;
     call = new_Call(get_store(), proc_ptr, 2, in, proc_c);
   }
@@ -146,7 +155,7 @@ main(void)
   set_store(new_Proj(call, mode_M, 0));
   /* Get the result of the procedure: select the result tuple from the call,
      then the proper result from the tuple. */
-  res = new_Proj(new_Proj(call, mode_T, 2), mode_i, 0);
+  res = new_Proj(new_Proj(call, mode_T, 2), mode_Is, 0);
 
   /* return the results of procedure main */
   {
@@ -172,9 +181,9 @@ main(void)
   self_pos = 0; e_pos = 1;
 
   /* get the procedure parameter */
-  self = new_Proj(get_irg_args(set_a_irg), mode_p, 0);
+  self = new_Proj(get_irg_args(set_a_irg), mode_P, 0);
   set_value(self_pos, self);
-  par1 = new_Proj(get_irg_args(set_a_irg), mode_i, 1);
+  par1 = new_Proj(get_irg_args(set_a_irg), mode_Is, 1);
   set_value(e_pos, par1);
   /* Create and select the entity to set */
   a_ptr = new_simpleSel(get_store(), self, a_e);
@@ -201,19 +210,19 @@ main(void)
   c_irg = new_ir_graph (proc_c_e, 2);
 
   /* get the procedure parameter */
-  self = new_Proj(get_irg_args(c_irg), mode_p, 0);
-  par1 = new_Proj(get_irg_args(c_irg), mode_i, 1);
+  self = new_Proj(get_irg_args(c_irg), mode_P, 0);
+  par1 = new_Proj(get_irg_args(c_irg), mode_Is, 1);
 
   /* Select the entity and load the value */
   a_ptr = new_simpleSel(get_store(), self, a_e);
   a_val = new_Load(get_store(), a_ptr);
   set_store(new_Proj(a_val, mode_M, 0));
-  a_val = new_Proj(a_val, mode_i, 2);
+  a_val = new_Proj(a_val, mode_Is, 2);
 
   /* return the result */
   {
     ir_node *in[1];
-    in[0] = new_Add(par1, a_val, mode_i);
+    in[0] = new_Add(par1, a_val, mode_Is);
 
     x = new_Return (get_store (), 1, in);
   }
@@ -236,11 +245,34 @@ main(void)
   }
 
   printf("Dumping graphs of all procedures and a type graph.\n");
+  /* Touch ld names to distinguish names from oo_inline names. */
+  get_entity_ld_ident(proc_set_a_e);
+  get_entity_ld_ident(proc_c_e);
+
+  dump_consts_local(1);
+  turn_off_edge_labels();
+
+  dump_all_ir_graphs(dump_ir_graph);
   dump_all_ir_graphs(dump_ir_block_graph);
+  dump_all_ir_graphs(dump_ir_graph_w_types);
   dump_all_ir_graphs(dump_ir_block_graph_w_types);
+  dump_all_ir_graphs(dump_type_graph);
   dump_all_types();
+  dump_class_hierarchy (true);
+
+  entity **free_methods;
+  int arr_len;
+  cgana(&arr_len, &free_methods, 0);
+  cg_construct(arr_len, free_methods);
+
+  interprocedural_view = 1;
+  dump_ir_graph(main_irg);
+  dump_ir_block_graph(main_irg);
+  dump_ir_graph_w_types(main_irg);
+  dump_ir_block_graph_w_types(main_irg);
+  dump_all_cg_block_graph();
 
   printf("Use xvcg to view these graphs:\n");
   printf("/ben/goetz/bin/xvcg GRAPHNAME\n\n");
-  return (1);
+  return (0);
 }