X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=testprograms%2Fif_else_example.c;h=f4f9246e4ca29ac578416a606bd21012506f1710;hb=d3a41e0b6d8f8c4fd8f66be85fd4023d153eef88;hp=21543c4a3ed638307d4079a9ec3cceecb51bfb93;hpb=4d9dd59076e57e746b88a5614e15ab3b071e1d75;p=libfirm

diff --git a/testprograms/if_else_example.c b/testprograms/if_else_example.c
index 21543c4a3..f4f9246e4 100644
--- a/testprograms/if_else_example.c
+++ b/testprograms/if_else_example.c
@@ -1,13 +1,15 @@
 /* Copyright (C) 1998 - 2000 by Universitaet Karlsruhe
-** All rights reserved.
-**
-** Authors: Christian Schaefer, Goetz Lindenmaier
-**
-** testprogram.
+* All rights reserved.
+*
+* Authors: Christian Schaefer, Goetz Lindenmaier
+*
+* testprogram.
 */
 
 # include <stdio.h>
+# include <string.h>
 
+# include "irvrfy.h"
 # include "firm.h"
 # include "irdump.h"
 
@@ -16,45 +18,52 @@
  */
 
 /**
-***  This file constructs the ir for the following pseudo-program:
-***
-***  main() {
-***    int a = 0;
-***    int b = 1;
-***
-***    if (a > 2)
-***      { a = b; }
-***    else
-***      { b = 2; }
-***
-***    return a, b;
+*  This file constructs the ir for the following pseudo-program:
+*
+*  main() {
+*    int a = 0;
+*    int b = 1;
+*
+*    if (a > 2)
+*      { a = b; }
+*    else
+*      { b = 2; }
+*
+*    return a, b;
 **/
 
 int main(int argc, char **argv)
 {
-  ir_graph *irg;          /* this variable contains the irgraph */
-  type_class *owner;      /* the class in which this method is defined */
-  type_method *method;    /* the type of this method */
-  entity *ent;            /* represents this method as entity of owner */
-  ir_node *x, *x_then, *x_else, *c0, *c1, *c2, *cmpGt, *f, *t, *b;
+  type     *prim_t_int;
+  ir_graph *irg;       /* this variable contains the irgraph */
+  type     *owner;     /* the class in which this method is defined */
+  type     *method;    /* the type of this method */
+  entity   *ent;       /* represents this method as entity of owner */
+  ir_node  *x, *x_then, *x_else, *c0, *c1, *c2, *cmpGt, *f, *t, *b;
 
   printf("\ncreating an IR graph: IF_ELSE_EXAMPLE...\n");
 
   /* init library */
   init_firm ();
 
+  /*** Make basic type information for primitive type int. ***/
+  prim_t_int = new_type_primitive(id_from_str ("int", 3), mode_Is);
+
   /* FIRM was designed for oo languages where all methods belong to a class.
    * For imperative languages like C we view a file as a large class containing
    * all functions as methods in this file.
    * Therefore we define a class "IF_ELSE_EXAMPLE" with a method main as an
    * entity.
    */
-#define ENTITYNAME "main"
+#define ENTITYNAME "IF_ELSE_EXAMPLE_main"
 
   owner = get_glob_type();
-  method = new_type_method (id_from_str("main", 4), 0, 2);
-  ent = new_entity ((type *)owner, id_from_str (ENTITYNAME,
-		    strlen(ENTITYNAME)), (type *)method);
+  method = new_type_method (id_from_str(ENTITYNAME, strlen(ENTITYNAME)), 0, 2);
+  set_method_res_type(method, 0, prim_t_int);
+  set_method_res_type(method, 1, prim_t_int);
+
+  ent = new_entity (owner, id_from_str (ENTITYNAME,
+		    strlen(ENTITYNAME)), method);
 
   /* Generates the basic graph for the method represented by entity ent, that
    * is, generates start and end blocks and nodes and a first, initial block.
@@ -65,16 +74,16 @@ int main(int argc, char **argv)
   irg = new_ir_graph (ent, NUM_OF_LOCAL_VARS);
 
   /* Generate two constants */
-  c0 = new_Const (mode_i, tarval_from_long (mode_i, 0));
-  c1 = new_Const (mode_i, tarval_from_long (mode_i, 1));
+  c0 = new_Const (mode_Is, tarval_from_long (mode_Is, 0));
+  c1 = new_Const (mode_Is, tarval_from_long (mode_Is, 1));
 
   /* set a and b to constants */
   set_value (0, c0);  /* this (0) is variable a */
   set_value (1, c1);  /* this (1) is variable b */
 
   /* the expression that evaluates the condition */
-  c2 = new_Const (mode_i, tarval_from_long (mode_i, 2));
-  cmpGt = new_Proj(new_Cmp(get_value(0, mode_i), c2), mode_b, Gt);
+  c2 = new_Const (mode_Is, tarval_from_long (mode_Is, 2));
+  cmpGt = new_Proj(new_Cmp(get_value(0, mode_Is), c2), mode_b, Gt);
 
   /* the conditional branch */
   x = new_Cond (cmpGt);
@@ -86,14 +95,14 @@ int main(int argc, char **argv)
   /* generate and fill the then block */
   b = new_immBlock ();
   add_in_edge (b, t);
-  set_value (0, get_value(1, mode_i));
+  set_value (0, get_value(1, mode_Is));
   mature_block (b);
   x_then = new_Jmp ();
 
   /* generate and fill the else block */
   b = new_immBlock ();
   add_in_edge (b, f);
-  set_value (1, new_Const (mode_i, tarval_from_long (mode_i, 2)));
+  set_value (1, new_Const (mode_Is, tarval_from_long (mode_Is, 2)));
   mature_block (b);
   x_else = new_Jmp ();
 
@@ -105,8 +114,8 @@ int main(int argc, char **argv)
   /* Generate the return node into current region. */
   {
     ir_node *in[2]; /* this is the array containing the return parameters */
-    in[0] = get_value(0, mode_i);
-    in[1] = get_value(1, mode_i);
+    in[0] = get_value(0, mode_Is);
+    in[1] = get_value(1, mode_Is);
     x = new_Return (get_store(), 2, in);
   }
   /* Now generate all instructions for this block and all its predecessor
@@ -120,14 +129,17 @@ int main(int argc, char **argv)
   /* Now we can mature the end block as all it's predecessors are known. */
   mature_block (get_irg_end_block(irg));
 
-  printf("Optimizing ...\n");
-  //dead_node_elimination(irg);
+  finalize_cons (irg);
+
+  printf("\nOptimizing ...\n");
+  local_optimize_graph(irg);
+  dead_node_elimination(irg);
 
   /* verify the graph */
   irg_vrfy(irg);
+  finalize_cons (irg);
 
   printf("Done building the graph.  Dumping it.\n");
-  //dump_ir_graph (irg);
   dump_ir_block_graph (irg);
   printf("use xvcg to view this graph:\n");
   printf("/ben/goetz/bin/xvcg GRAPHNAME\n\n");