X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=testprograms%2Foo_program_example.c;h=22fe94a3f741f3854e79a227722baa7f419454e5;hb=53b76abebcd071c7c25a7c17b5d0cdcb7772cb64;hp=8339fa130179b1346ba37cba5a5886cb69e01b94;hpb=6ed168c29789db8edf25c87f2da9164c49a5512c;p=libfirm

diff --git a/testprograms/oo_program_example.c b/testprograms/oo_program_example.c
index 8339fa130..22fe94a3f 100644
--- a/testprograms/oo_program_example.c
+++ b/testprograms/oo_program_example.c
@@ -1,10 +1,14 @@
-/* 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>
@@ -13,28 +17,28 @@
 # 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
@@ -55,37 +59,37 @@ main(void)
 
   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_Is);
+  prim_t_int = new_type_primitive(new_id_from_chars ("int", 3), mode_Is);
 
   /*** Make type information for the class (PRIMA). ***/
   /* The type of the class */
-  class_prima = new_type_class(id_from_str ("PRIMA", 5));
+  class_prima = new_type_class(new_id_from_chars ("PRIMA", 5));
   /* We need type information for pointers to the class: */
-  class_p_ptr = new_type_pointer (id_from_str ("class_prima_ptr", 15),
-				  class_prima);
+  class_p_ptr = new_type_pointer (new_id_from_chars("class_prima_ptr", 15),
+				  class_prima, mode_P);
   /* An entity for the field (a).  The entity constructor automatically adds
      the entity as member of the owner. */
-  a_e = new_entity(class_prima, id_from_str ("a", 1), prim_t_int);
+  a_e = new_entity(class_prima, new_id_from_chars ("a", 1), prim_t_int);
   /* An entity for the method set_a.  But first we need type information
      for the method. */
-  proc_set_a = new_type_method(id_from_str("set_a", 5), 2, 0);
+  proc_set_a = new_type_method(new_id_from_chars("set_a", 5), 2, 0);
   set_method_param_type(proc_set_a, 0, class_p_ptr);
   set_method_param_type(proc_set_a, 1, prim_t_int);
-  proc_set_a_e = new_entity(class_prima, id_from_str ("set_a", 5), proc_set_a);
+  proc_set_a_e = new_entity(class_prima, new_id_from_chars ("set_a", 5), proc_set_a);
   /* An entity for the method c. Implicit argument "self" must be modeled
      explicit! */
-  proc_c   = new_type_method(id_from_str("c", 1 ), 2, 1);
+  proc_c   = new_type_method(new_id_from_chars("c", 1 ), 2, 1);
   set_method_param_type(proc_c, 0, class_p_ptr);
   set_method_param_type(proc_c, 1, prim_t_int);
   set_method_res_type(proc_c, 0, prim_t_int);
-  proc_c_e = new_entity(class_prima, id_from_str ("c", 1), proc_c);
+  proc_c_e = new_entity(class_prima, new_id_from_chars ("c", 1), proc_c);
 
   /*** Now build procedure main. ***/
   /** Type information for main. **/
@@ -94,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(new_id_from_chars("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, new_id_from_chars ("OO_PROGRAM_EXAMPLE_main", 23), proc_main);
 
   /** Build code for procedure main. **/
   /* We need one local variable (for "o"). */
@@ -110,12 +114,13 @@ main(void)
   set_irp_main_irg(main_irg);
 
   /* Make the constants.  They are independent of a block. */
-  c2 = new_Const (mode_Is, tarval_from_long (mode_Is, 2));
-  c5 = new_Const (mode_Is, tarval_from_long (mode_Is, 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_type_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 */
@@ -158,14 +163,14 @@ main(void)
      in[0] = res;
      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));
 
   irg_vrfy(main_irg);
-  finalize_cons (main_irg);
+  irg_finalize_cons (main_irg);
 
   /****************************************************************************/
 
@@ -187,15 +192,15 @@ main(void)
 
   /* return nothing */
   x = new_Return (get_store (), 0, NULL);
-  mature_block (get_irg_current_block(set_a_irg));
+  mature_immBlock (get_irg_current_block(set_a_irg));
 
   /* complete the end_block */
-  add_in_edge (get_irg_end_block(set_a_irg), x);
-  mature_block (get_irg_end_block(set_a_irg));
+  add_immBlock_pred (get_irg_end_block(set_a_irg), x);
+  mature_immBlock (get_irg_end_block(set_a_irg));
 
   /* verify the graph */
   irg_vrfy(set_a_irg);
-  finalize_cons (set_a_irg);
+  irg_finalize_cons (set_a_irg);
 
   /****************************************************************************/
 
@@ -210,7 +215,7 @@ main(void)
 
   /* Select the entity and load the value */
   a_ptr = new_simpleSel(get_store(), self, a_e);
-  a_val = new_Load(get_store(), a_ptr);
+  a_val = new_Load(get_store(), a_ptr, mode_Is);
   set_store(new_Proj(a_val, mode_M, 0));
   a_val = new_Proj(a_val, mode_Is, 2);
 
@@ -221,15 +226,15 @@ main(void)
 
     x = new_Return (get_store (), 1, in);
   }
-  mature_block (get_irg_current_block(c_irg));
+  mature_immBlock (get_irg_current_block(c_irg));
 
   /* complete the end_block */
-  add_in_edge (get_irg_end_block(c_irg), x);
-  mature_block (get_irg_end_block(c_irg));
+  add_immBlock_pred (get_irg_end_block(c_irg), x);
+  mature_immBlock (get_irg_end_block(c_irg));
 
   /* verify the graph */
   irg_vrfy(c_irg);
-  finalize_cons (c_irg);
+  irg_finalize_cons (c_irg);
 
   /****************************************************************************/
 
@@ -240,9 +245,33 @@ main(void)
   }
 
   printf("Dumping graphs of all procedures and a type graph.\n");
-  dump_all_ir_graphs(dump_ir_block_graph);
-  dump_all_ir_graphs(dump_ir_block_graph_w_types);
-  dump_all_types();
+  /* 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_ir_graphs(dump_graph_as_text, "");
+  dump_all_types("");
+  dump_class_hierarchy (1, "");
+
+  entity **free_methods;
+  int arr_len;
+  cgana(&arr_len, &free_methods);
+  cg_construct(arr_len, free_methods);
+
+  set_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");