X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=testprograms%2Foo_program_example.c;h=f3dcaad56f471421d2c8f157aca817a55c98c8c5;hb=80fadd53d5cf0feddf63f34d6306e45f8d5de717;hp=a45e4c9b127c194c256187779ed1e63f6345a04a;hpb=3841faf71dcf8efa8312d0ebd9941f1e0fc08d72;p=libfirm

diff --git a/testprograms/oo_program_example.c b/testprograms/oo_program_example.c
index a45e4c9b1..f3dcaad56 100644
--- a/testprograms/oo_program_example.c
+++ b/testprograms/oo_program_example.c
@@ -11,204 +11,236 @@
 
 /**  This file constructs the IR for the following program:
 ***
-***  class PRIMA
+***  class PRIMA {
 ***    a: int;
-***    b: real;
-***    c(int): int;
-***    set_a(int): void;
-***  end
 ***
-***  c(d: int): int
-***    return (d + a);
-***  end
+***    int c(d: int) {
+***      return (d + self.a);
+***    }
 ***
-***  set_a(e:int): void
-***    self.a = e;
-***  end
+***    void set_a(e:int) {
+***      self.a = e;
+***    }
 ***
-***  main(): int
+***  }
+***
+***  int main() {
 ***    o: PRIMA;
+***    o = new PRIMA;
 ***    o.set_a(2);
 ***    return o.c(5);
-***  end
+***  };
 ***
 **/
 
-#define OPTIMIZE_NODE 0
-
 int
 main(void)
 {
-  type_primitive *prim_t_int;
-  type_class   *owner, *class_prima, *class_langint;
-  type_method  *proc_main, *proc_set, *proc_c;
-  type_pointer *class_p_ptr;
-  entity       *proc_main_e, *proc_set_e, *proc_c_e, *a_e;
+  type     *prim_t_int;
+  type     *owner, *class_prima;
+  type     *proc_main, *proc_set_a, *proc_c;
+  type     *class_p_ptr;
+  entity   *proc_main_e, *proc_set_a_e, *proc_c_e, *a_e;
 
   ir_graph     *main_irg, *set_a_irg, *c_irg;
-  ir_node      *c2, *c5, *obj_o, *obj_size, *proc_ptr, *call, *x;
+  ir_node      *c2, *c5, *obj_o, *obj_size, *proc_ptr, *call, *res, *x;
   ir_node      *self, *par1, *a_ptr;
   ir_node      *a_val;
 
+  int o_pos, self_pos, e_pos, d_pos;
+
+  int i;
+
   init_firm ();
 
-  set_opt_constant_folding(0);
-  set_opt_cse(0);
+  set_opt_constant_folding(1);
+  set_opt_cse(1);
+  set_opt_dead_node_elimination(1);
 
-  /* make basic type information for primitive type int.*/
+  /*** Make basic type information for primitive type int. ***/
   prim_t_int = new_type_primitive(id_from_str ("int", 3), mode_i);
 
-  /* first build procedure main */
-  printf("creating an IR graph: OO_PROGRAM_EXAMPLE...\n");
+  /*** Make type information for the class (PRIMA). ***/
+  /* The type of the class */
+  class_prima = new_type_class(id_from_str ("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);
+  /* 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);
+  /* 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);
+  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);
+  /* 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);
+  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);
+
+  /*** Now build procedure main. ***/
+  /** Type information for main. **/
+  printf("\nCreating an IR graph: OO_PROGRAM_EXAMPLE...\n");
+  /* Main is not modeled as part of an explicit class here. Therefore the
+     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);
-  set_method_res_type(proc_main, 0, (type *)prim_t_int);
+  /* 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);
+
+  /** Build code for procedure main. **/
+  /* We need one local variable (for "o"). */
+  main_irg = new_ir_graph (proc_main_e, 1);
+  o_pos = 0;
 
-  proc_main_e = new_entity ((type *)owner, id_from_str ("main", 4),
-                            (type *)proc_main);
-  main_irg = new_ir_graph (proc_main_e, 4);
+  /* Remark that this irg is the main routine of the program. */
+  set_irp_main_irg(main_irg);
 
-  /* There is only one block in main, it contains the constants and the calls. */
+  /* 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));
 
-  /* allocate the defined object and generate the type information */
-  class_prima = new_type_class(id_from_str ("PRIMA", 5));
-  obj_size = new_SymConst((type_or_id *)class_prima, size);
-  obj_o    = new_Alloc(get_store(), obj_size, (type *)class_prima, heap_alloc);
+  /* 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);
+  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, 1);  /* remember the pointer to the object */
-  /* we need type information for pointers to the class: */
-  class_p_ptr = new_type_pointer (id_from_str ("class_prima_ptr", 15),
-				  (type *)class_prima);
-
-  /* get the pointer to the procedure from the class type */
-  proc_set = new_type_method(id_from_str("set_a", 5), 2, 0);
-  set_method_param_type(proc_set, 0, (type *)class_p_ptr);
-  set_method_param_type(proc_set, 1, (type *)prim_t_int);
-  proc_set_e = new_entity((type *)class_prima, id_from_str ("set_a", 5),
-			  (type*)proc_set);
-  proc_ptr = new_simpleSel(get_store(),  /* The memory the object is allocated in */
-   		      obj_o,             /* The pointer to the object */
-		      proc_set_e );      /* The feature to select */
-
-  /* call procedure set_a, first built array with parameters */
+  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. */
+			   proc_set_a_e );            /* The feature to select. */
+
+  /* Call procedure set_a, first built array with parameters. */
   {
     ir_node *in[2];
-    in[0] = obj_o;
+    in[0] = get_value(o_pos, mode_p);
     in[1] = c2;
-    call = new_Call(get_store(), proc_ptr, 2, in, proc_set);
+    call = new_Call(get_store(), proc_ptr, 2, in, proc_set_a);
   }
-  /* make the change to memory visible */
+  /* Make the change to memory visible.  There are no results.  */
   set_store(new_Proj(call, mode_M, 0));
 
-  /* get the pointer to the procedure from the class type */
-  proc_c   = new_type_method(id_from_str("c", 1 ), 2, 1);
-  set_method_param_type(proc_c, 0, (type *)class_p_ptr);
-  set_method_param_type(proc_c, 1, (type *)prim_t_int);
-  set_method_res_type(proc_c, 0, (type *)prim_t_int);
-  proc_c_e = new_entity((type *)class_prima, id_from_str ("c", 1),
-			(type*)proc_c);
-  proc_ptr = new_simpleSel(get_store(), obj_o, proc_c_e);
+  /* 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);
 
   /* call procedure c, first built array with parameters */
   {
     ir_node *in[2];
-    in[0] = obj_o;
+    in[0] = get_value(o_pos, mode_p);
     in[1] = c5;
     call = new_Call(get_store(), proc_ptr, 2, in, proc_c);
   }
   /* make the change to memory visible */
   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);
 
   /* return the results of procedure main */
   {
      ir_node *in[1];
-     /* Select the result tuple from the call, then the proper
-        result from the tuple. */
-     in[0] = new_Proj(new_Proj(call, mode_T, 1), mode_I, 0);
-
-     x = new_Return (get_store (), 1, in);
+     in[0] = res;
+     x = new_Return (get_store(), 1, in);
   }
-  mature_block (main_irg->current_block);
+  mature_block (get_irg_current_block(main_irg));
 
   /* complete the end_block */
-  add_in_edge (main_irg->end_block, x);
-  mature_block (main_irg->end_block);
+  add_in_edge (get_irg_end_block(main_irg), x);
+  mature_block (get_irg_end_block(main_irg));
 
-  printf("\nDone building the graph.\n");
-  printf("Dumping the graph and a type graph.\n");
-  dump_ir_block_graph (main_irg);
-  dump_type_graph(main_irg);
+  irg_vrfy(main_irg);
+  finalize_cons (main_irg);
 
   /****************************************************************************/
 
-  printf("\ncreating IR graph for set_a: \n");
+  printf("Creating IR graph for set_a: \n");
 
-  set_a_irg = new_ir_graph (proc_set_e, 4);
+  /* Local variables: self, e */
+  set_a_irg = new_ir_graph (proc_set_a_e, 2);
+  self_pos = 0; e_pos = 1;
 
   /* get the procedure parameter */
-  self = new_Proj(set_a_irg->args, mode_p, 0);
-  par1 = new_Proj(set_a_irg->args, mode_I, 1);
+  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);
+  set_value(e_pos, par1);
   /* Create and select the entity to set */
-  class_langint = new_type_class(id_from_str ("Int", 3));
-  a_e = new_entity((type *)class_prima, id_from_str ("a", 1),
-		   (type*)class_langint);
   a_ptr = new_simpleSel(get_store(), self, a_e);
   /* perform the assignment */
   set_store(new_Proj(new_Store(get_store(), a_ptr, par1), mode_M, 0));
 
   /* return nothing */
   x = new_Return (get_store (), 0, NULL);
-  mature_block (set_a_irg->current_block);
+  mature_block (get_irg_current_block(set_a_irg));
 
   /* complete the end_block */
-  add_in_edge (set_a_irg->end_block, x);
-  mature_block (set_a_irg->end_block);
+  add_in_edge (get_irg_end_block(set_a_irg), x);
+  mature_block (get_irg_end_block(set_a_irg));
 
-  printf("\nDone building the graph.\n");
-  printf("Dumping the graph and a type graph.\n");
-  dump_ir_block_graph (set_a_irg);
-  dump_type_graph(set_a_irg);
+  /* verify the graph */
+  irg_vrfy(set_a_irg);
+  finalize_cons (set_a_irg);
 
   /****************************************************************************/
 
-  printf("\ncreating IR graph for c: \n");
+  printf("Creating IR graph for c: \n");
 
-  c_irg = new_ir_graph (proc_c_e, 4);
+  /* Local variables self, d */
+  c_irg = new_ir_graph (proc_c_e, 2);
 
   /* get the procedure parameter */
-  self = new_Proj(c_irg->args, mode_p, 0);
-  par1 = new_Proj(c_irg->args, mode_I, 1);
+  self = new_Proj(get_irg_args(c_irg), mode_p, 0);
+  par1 = new_Proj(get_irg_args(c_irg), mode_i, 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, 1);
+  a_val = new_Proj(a_val, mode_i, 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_i);
 
     x = new_Return (get_store (), 1, in);
   }
-  mature_block (c_irg->current_block);
+  mature_block (get_irg_current_block(c_irg));
 
   /* complete the end_block */
-  add_in_edge (c_irg->end_block, x);
-  mature_block (c_irg->end_block);
+  add_in_edge (get_irg_end_block(c_irg), x);
+  mature_block (get_irg_end_block(c_irg));
 
-  printf("\nDone building the graph.\n");
-  printf("Dumping the graph and a type graph.\n");
-  dump_ir_block_graph (c_irg);
-  dump_type_graph(c_irg);
+  /* verify the graph */
+  irg_vrfy(c_irg);
+  finalize_cons (c_irg);
 
   /****************************************************************************/
 
-  printf("\nuse xvcg to view these graphs:\n");
-  printf("/ben/trapp/bin/i486/xvcg GRAPHNAME\n");
+  printf("Optimizing ...\n");
+  for (i = 0; i < get_irp_n_irgs(); i++) {
+    local_optimize_graph(get_irp_irg(i));
+    dead_node_elimination(get_irp_irg(i));
+  }
+
+  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();
 
+  printf("Use xvcg to view these graphs:\n");
+  printf("/ben/goetz/bin/xvcg GRAPHNAME\n\n");
   return (1);
 }