X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=testprograms%2Fif_example.c;h=f3944e134a91cac8aeb2be46f2c5bd9e46ee0539;hb=b4cfa9a1793173b5ccee8fcf9debdac126109902;hp=d3ca04040864526329ea50d9189ac1ba25abb393;hpb=efbeaff549fcc6015da255ed4d453a95937ff0fd;p=libfirm

diff --git a/testprograms/if_example.c b/testprograms/if_example.c
index d3ca04040..f3944e134 100644
--- a/testprograms/if_example.c
+++ b/testprograms/if_example.c
@@ -12,16 +12,12 @@
 /**
 ***  This file constructs the ir for the following pseudo-program:
 ***
-***  Doesn't work for some reason!!!!
-***
-***  main() {
-***    int a = 0;
+***  int main(int a) {
 ***    int b = 2;
-***    if ( a == a )  // a constant condition would be eliminated,
-***                   // a realistic condition would no more be a small example
-***      { a := a - 2; }
+***    if ( a == b )
+***      { a := a - 3; }
 ***
-***    // return a, bla; // das ist hier kein korrekter graph
+***    return a;
 ***  }
 **/
 
@@ -29,65 +25,71 @@ int
 main(void)
 {
   ir_graph *irg;
-  type_class *owner;
+  type *owner;
   entity *ent;
-  type_method *proc_main; /* typeinformation for the method main */
-  type_primitive *typ;
-  ir_node *x, *r, *t, *f, *a;
+  type *proc_main; /* type information for the method main */
+  type *typ;
+  ir_node *x, *r, *t, *f, *a, *cmp;
   int a_pos, b_pos;
-  FILE *outfile;
 
-  printf("creating an IR graph: IF_EXAMPLE...\n");
+  printf("\nCreating an IR graph: IF_EXAMPLE...\n");
 
   init_firm ();
 
 #define CLASSNAME "IF_EXAMPLE"
 #define METHODNAME "main"
-#define NRARGS 0
-#define NRES 2
-
-  owner = new_type_class (id_from_str (CLASSNAME, strlen(CLASSNAME)));
-  proc_main = new_type_method(id_from_str(METHODNAME, strlen(METHODNAME)), NRARGS, NRES);
-  ent = new_entity ((type *)owner,
-                    id_from_str (METHODNAME, strlen(METHODNAME)),
-                    (type *)proc_main);
-
-#define RES_NAME "res1"
-  typ = new_type_primitive(ID_FROM_STR(RES_NAME, strlen(RES_NAME)), mode_i);
-  set_method_res_type(proc_main, 0, (type*)typ);
-#undef RES_NAME
-
-#define RES_NAME "res2"
-  typ = new_type_primitive(ID_FROM_STR(RES_NAME, strlen(RES_NAME)), mode_i);
-  set_method_res_type(proc_main, 1, (type*)typ);
-#undef RES_NAME
+#define NRARGS 1
+#define NRES 1
 
+  /** Type information for the procedure **/
 
-  /* Generates start and end blocks and nodes and a first, initial block */
-  irg = new_ir_graph (ent, 1);
-
-  /* The value position used for a: */
+  owner = get_glob_type();
+  /* Type information for the procedure */
+  proc_main = new_type_method(id_from_str(METHODNAME, strlen(METHODNAME)),
+			      NRARGS, NRES);
+  /* The entity for the procedure */
+  ent = new_entity (owner,
+                    id_from_str (METHODNAME, strlen(METHODNAME)),
+                    proc_main);
+  /* The type int.  This type is necessary to model the result and parameters
+     the procedure. */
+#define PRIM_NAME "int"
+  typ = new_type_primitive(id_from_str(PRIM_NAME, strlen(PRIM_NAME)), mode_i);
+  /* The parameter and result types of the procedure. */
+  set_method_param_type(proc_main, 0, typ);
+  set_method_res_type(proc_main, 0, typ);
+
+  /** The code of the procedure **/
+
+  /* Generates start and end blocks and nodes, and a first, initial block */
+#define NRLOCS 2
+  irg = new_ir_graph (ent, NRLOCS);
+
+  /* The value position used for: */
   a_pos = 0;
   b_pos = 1;
 
-  /* Generate the constant */
-  set_value (a_pos, new_Const (mode_i, tarval_from_long (mode_i, 0)));
+  /* Get the procedure parameter and assign it to the parameter variable
+     a. */
+  set_value (a_pos, new_Proj (get_irg_args(irg), mode_i, 0));
+  /* Generate the constant and assign it to b. The assignment is resovled to a
+     dataflow edge. */
   set_value (b_pos, new_Const (mode_i, tarval_from_long (mode_i, 2)));
-  mature_block (irg->current_block);
+  /* We know all predecessors of the block and all set_values and set_stores are
+     preformed.   We can mature the block.  */
+  mature_block (get_irg_current_block(irg));
 
   /* Generate a conditional branch */
-  x = new_Cond (new_Proj(new_Cmp(get_value(a_pos, mode_i),
-                                 get_value(a_pos, mode_i)),
-                         mode_b, Eq));
+  cmp = new_Cmp(get_value(a_pos, mode_i), get_value(b_pos, mode_i));
+  x = new_Cond (new_Proj(cmp, mode_b, Eq));
   f = new_Proj (x, mode_X, 0);
   t = new_Proj (x, mode_X, 1);
 
   /* generate and fill the then block */
-  r = new_Block ();
+  r = new_immBlock ();
   add_in_edge (r, t);
-  // mature_block (r);
   a = new_Sub(get_value(a_pos, mode_i),
-              new_Const (mode_i, tarval_from_long (mode_i, 2)),
+              new_Const (mode_i, tarval_from_long (mode_i, 3)),
   	      mode_i);
   set_value (a_pos, a);
 
@@ -95,31 +97,31 @@ main(void)
   x = new_Jmp ();
 
   /* generate the fall through block and add all cfg edges */
-  r = new_Block ();
+  r = new_immBlock ();
   add_in_edge (r, f);
   add_in_edge (r, x);
   mature_block (r);
+  /* The Return statement */
   {
-     ir_node *in[3], *store ;
+     ir_node *in[1], *store ;
      in[0] = get_value (a_pos, mode_i);
-     in[1] = a;
-     in[2] = get_value (b_pos, mode_i);
      store = get_store();
 
-     x = new_Return (store, 2, in);
+     x = new_Return (store, 1, in);
   }
 
   /* finalize the end block generated in new_ir_graph() */
-  add_in_edge (irg->end_block, x);
-  mature_block (irg->end_block);
+  add_in_edge (get_irg_end_block(irg), x);
+  mature_block (get_irg_end_block(irg));
 
-  /* output the vcg file */
-  printf("\nDone building the graph.  Dumping it.\n");
+  /* verify the graph */
+  irg_vrfy(irg);
 
+  /* output the vcg file */
+  printf("Done building the graph.  Dumping it.\n");
   dump_ir_block_graph (irg);
-
   printf("use xvcg to view this graph:\n");
-  printf("/ben/trapp/bin/i486/xvcg GRAPHNAME\n");
+  printf("/ben/goetz/bin/xvcg GRAPHNAME\n\n");
 
   return (0);
 }