Make reference for yesterdays changes: SymConst to start block

[libfirm] / testprograms / three_cfpred_example.c

diff --git a/testprograms/three_cfpred_example.c b/testprograms/three_cfpred_example.c
index c0f6cce..51ec8ad 100644 (file)
--- a/testprograms/three_cfpred_example.c
+++ b/testprograms/three_cfpred_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 "irdump.h"
 # include "firm.h"
 
@@ -16,38 +18,39 @@
  */
 
 /**
-***  This file constructs a control flow of following shape:
-***
-***
-***       firstCondBlock
-***          /     \
-***         /       \
-***       |/_       _\|
-***     Block1    scnCondBlock
-***        |       |        |
-***       |       |        |
-***       |      \ /      \ /
-***        |     Block2   Block3
-***         \      |       /
-***         \     |      /
-***         _\|  \ /   |/_
-***            nextBlock
-***
-***
-***   This is a program as, e.g.,
-***
-***   if () then
-***     { Jmp label1; } // happens anyways
-***   else
-***     { Jmp label1; } // happens anyways
-*** label1:
-***   return();
-***   Jmp label1;
-***
+*  This file constructs a control flow of following shape:
+*
+*
+*       firstCondBlock
+*          /     \
+*         /       \
+*       |/_       _\|
+*     Block1    scnCondBlock
+*        |       |        |
+*         |       |        |
+*         |      \ /      \ /
+*        |     Block2   Block3
+*         \      |       /
+*      \     |      /
+*      _\|  \ /   |/_
+*            nextBlock
+*
+*
+*   This is a program as, e.g.,
+*
+*   if () then
+*     { Jmp label1; } // happens anyways
+*   else
+*     { Jmp label1; } // happens anyways
+* label1:
+*   return();
+*   Jmp label1;
+*
 **/
 
 int main(int argc, char **argv)
 {
+  type     *prim_t_int;
   ir_graph *irg;          /* this variable contains the irgraph */
   type *owner;      /* the class in which this method is defined */
   type *proc_main; /* type information for the method main */
@@ -56,16 +59,19 @@ int main(int argc, char **argv)
           *scndCondBlock, *Block2, *Block3, *x;
 
   /* init library */
-  init_firm ();
+  init_firm (NULL);
 
   set_optimize(1);
 
+  /*** 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.
    * This class now is automatically generated.
    */
-#define METHODNAME "main"
+#define METHODNAME "THREE_CFPRED_EXAMPLE_main"
 #define NRARGS 1
 #define NRES 1
   printf("\nCreating an IR graph: ...\n");
@@ -73,7 +79,9 @@ int main(int argc, char **argv)
   owner = get_glob_type();
   proc_main = new_type_method(id_from_str(METHODNAME, strlen(METHODNAME)),
                              NRARGS, NRES);
-  /** @@@ setting of arg/res types misses **/
+  set_method_param_type(proc_main, 0, prim_t_int);
+  set_method_res_type(proc_main, 0, prim_t_int);
+
   ent = new_entity (owner,
                     id_from_str (METHODNAME, strlen(METHODNAME)),
                     proc_main);
@@ -83,12 +91,12 @@ int main(int argc, char **argv)
   irg = new_ir_graph (ent, NUM_OF_LOCAL_VARS);
 
   /* to make a condition  */
-  c1 = new_Const (mode_i, tarval_from_long (mode_i, 1));
-  c2 = new_Proj (get_irg_args(irg), mode_i, 0);
+  c1 = new_Const (mode_Is, new_tarval_from_long (1, mode_Is));
+  c2 = new_Proj (get_irg_args(irg), mode_Is, 0);
   set_value(1, c2);
 
   cond = new_Cond(new_Proj(new_Cmp(c1, c2), mode_b, Eq));
-  set_value(0, new_Const (mode_i, tarval_from_long (mode_i, 6)));
+  set_value(0, new_Const (mode_Is, new_tarval_from_long (6, mode_Is)));
   f = new_Proj(cond, mode_X, 0);
   t = new_Proj(cond, mode_X, 1);
   mature_block(get_irg_current_block(irg));
@@ -100,7 +108,7 @@ int main(int argc, char **argv)
   Block1 = new_immBlock();
   add_in_edge(Block1, t);
   mature_block(Block1);
-  set_value(0, new_Const (mode_i, tarval_from_long (mode_i, 5)));
+  set_value(0, new_Const (mode_Is, new_tarval_from_long (5, mode_Is)));
   jmp = new_Jmp();
   add_in_edge(endBlock, jmp);
 
@@ -108,8 +116,8 @@ int main(int argc, char **argv)
   scndCondBlock = new_immBlock();
   add_in_edge(scndCondBlock, f);
   mature_block(scndCondBlock);
-  c1 = new_Const (mode_i, tarval_from_long (mode_i, 3));
-  cond = new_Cond(new_Proj(new_Cmp(c1, get_value(1, mode_i)), mode_b, Eq));
+  c1 = new_Const (mode_Is, new_tarval_from_long (3, mode_Is));
+  cond = new_Cond(new_Proj(new_Cmp(c1, get_value(1, mode_Is)), mode_b, Eq));
   f = new_Proj(cond, mode_X, 0);
   t = new_Proj(cond, mode_X, 1);
   mature_block(get_irg_current_block(irg));
@@ -132,7 +140,7 @@ int main(int argc, char **argv)
   switch_block(endBlock);
   {
     ir_node *in[1];
-    in[0] = get_value(0, mode_i);
+    in[0] = get_value(0, mode_Is);
     x = new_Return (get_store(), 1, in);
   }
   mature_block (get_irg_current_block(irg));
@@ -141,11 +149,12 @@ int main(int argc, char **argv)
   add_in_edge (get_irg_end_block(irg), x);
   mature_block (get_irg_end_block(irg));
 
-  printf("Optimizing ...\n");
-  dead_node_elimination(irg);
-
   /* verify the graph */
   irg_vrfy(irg);
+  finalize_cons (irg);
+
+  printf("Optimizing ...\n");
+  dead_node_elimination(irg);
 
   printf("Dumping the graph and a control flow graph.\n");
   dump_ir_block_graph (irg);