X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=testprograms%2Fif_example.c;h=794db2cfcb8ca91f0048b266851e56a6ac6dfc6a;hb=60478f1cd1789370b9f088fa46b13fe71801e126;hp=e20ad23fb9b9b5215480a1dd4b0108a90c9215b5;hpb=fb4e09c319ad22eb4623c289236a1511572756e2;p=libfirm

diff --git a/testprograms/if_example.c b/testprograms/if_example.c
index e20ad23fb..794db2cfc 100644
--- a/testprograms/if_example.c
+++ b/testprograms/if_example.c
@@ -6,18 +6,20 @@
 ** testprogram.
 */
 
+# include <stdio.h>
+# include <string.h>
+
+# include "irvrfy.h"
 # include "irdump.h"
 # include "firm.h"
 
 /**
 ***  This file constructs the ir for the following pseudo-program:
 ***
-***  Doesn't work for some reason!!!!
-***
 ***  int main(int a) {
 ***    int b = 2;
 ***    if ( a == b )
-***      { a := a - 2; }
+***      { a := a - 3; }
 ***
 ***    return a;
 ***  }
@@ -27,15 +29,14 @@ int
 main(void)
 {
   ir_graph *irg;
-  type_class *owner;
+  type *owner;
   entity *ent;
-  type_method *proc_main; /* type information for the method main */
-  type_primitive *typ;
+  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 ();
 
@@ -44,30 +45,43 @@ main(void)
 #define NRARGS 1
 #define NRES 1
 
+  /** Type information for the procedure **/
+
   owner = get_glob_type();
+  /* Type information for the procedure */
   proc_main = new_type_method(id_from_str(METHODNAME, strlen(METHODNAME)),
 			      NRARGS, NRES);
-  ent = new_entity ((type *)owner,
+  /* The entity for the procedure */
+  ent = new_entity (owner,
                     id_from_str (METHODNAME, strlen(METHODNAME)),
-                    (type *)proc_main);
-
-#define RES_NAME "int"
-  typ = new_type_primitive(ID_FROM_STR(RES_NAME, strlen(RES_NAME)), mode_i);
-  set_method_param_type(proc_main, 0, (type*)typ);
-  set_method_res_type(proc_main, 0, (type*)typ);
-
-  /* Generates start and end blocks and nodes and a first, initial block */
-  irg = new_ir_graph (ent, 1);
-
-  /* The value position used for a: */
+                    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 */
+  /* 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));
-  /*set_value (a_pos, new_Const (mode_i, tarval_from_long (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 */
   cmp = new_Cmp(get_value(a_pos, mode_i), get_value(b_pos, mode_i));
@@ -76,10 +90,10 @@ main(void)
   t = new_Proj (x, mode_X, 1);
 
   /* generate and fill the then block */
-  r = new_Block ();
+  r = new_immBlock ();
   add_in_edge (r, t);
   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);
 
@@ -87,10 +101,11 @@ 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[1], *store ;
      in[0] = get_value (a_pos, mode_i);
@@ -100,19 +115,18 @@ main(void)
   }
 
   /* 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));
 
   /* verify the graph */
-  vrfy_graph(irg);
+  irg_vrfy(irg);
+  finalize_cons (irg);
 
   /* output the vcg file */
-  printf("\nDone building the graph.  Dumping it.\n");
-
+  printf("Done building the graph.  Dumping it.\n");
   dump_ir_block_graph (irg);
-
   printf("use xvcg to view this graph:\n");
-  printf("/ben/goetz/bin/xvcg GRAPHNAME\n");
+  printf("/ben/goetz/bin/xvcg GRAPHNAME\n\n");
 
   return (0);
 }