X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=testprograms%2Fcond_example.c;h=21e3a839bcec909f7aca645cb0b7c38ebec93b4c;hb=478dcb4a03eec4c6fe63b5aa9e4ee70f11bdd93e;hp=e10205fb3509c70e5a172fb9c11a0538bc019973;hpb=3e5692defee7bec4dcd584b83d1c79baaf6a63c7;p=libfirm

diff --git a/testprograms/cond_example.c b/testprograms/cond_example.c
index e10205fb3..21e3a839b 100644
--- a/testprograms/cond_example.c
+++ b/testprograms/cond_example.c
@@ -1,24 +1,31 @@
-/* Copyright (C) 1998 - 2000 by Universitaet Karlsruhe
-** All rights reserved.
-**
-** Authors: Christian Schaefer, Goetz Lindenmaier
-**
-** testprogram.
-*/
+/*
+ * Project:     libFIRM
+ * File name:   testprograms/cond_example.c
+ * Purpose:     Shows how to represent boolean expressions.
+ * Author:      Christian Schaefer, Goetz Lindenmaier
+ * Modified by:
+ * Created:
+ * CVS-ID:      $Id$
+ * Copyright:   (c) 1999-2003 Universität Karlsruhe
+ * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
+ */
+
 
 #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:
-***
-***  main(int a) {
-***    if ((a > 2) && (a < 10))
-***      { a = 1; }
-***
-***    return a;
+*  This file constructs the ir for the following pseudo-program:
+*
+*  main(int a) {
+*    if ((a > 2) && (a < 10))
+*      { a = 1; }
+*
+*    return a;
 **/
 
 int main(int argc, char **argv)
@@ -33,10 +40,10 @@ int main(int argc, char **argv)
   printf("\nCreating an IR graph: COND_EXAMPLE...\n");
 
   /* init library */
-  init_firm ();
+  init_firm (NULL);
 
   /*** Make basic type information for primitive type int. ***/
-  prim_t_int = new_type_primitive(id_from_str ("int", 3), mode_i);
+  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
@@ -52,6 +59,7 @@ int main(int argc, char **argv)
   set_method_param_type(method, 0, prim_t_int);
   set_method_res_type(method, 0, prim_t_int);
   ent = new_entity (owner, id_from_str (ENTITYNAME, strlen(ENTITYNAME)), method);
+  get_entity_ld_name(ent);
 
 
   /* Generates the basic graph for the method represented by entity ent, that
@@ -63,26 +71,26 @@ int main(int argc, char **argv)
   irg = new_ir_graph (ent, NUM_OF_LOCAL_VARS);
 
   /* get the first argument a of method main - see irgraph.h */
-  arg1 = new_Proj(get_irg_args(irg), mode_i, 0);
+  arg1 = new_Proj(get_irg_args(irg), mode_Is, 0);
 
   /* arg1 as first first local variable - makes things simple */
   set_value(0, arg1);
 
   /* the expression that evaluates the condition */
   /* cmpGt = a > 2 */
-  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);
-  cmpGt = new_Conv(cmpGt, mode_i);
+  c2 = new_Const (mode_Is, new_tarval_from_long (2, mode_Is));
+  cmpGt = new_Proj(new_Cmp(get_value(0, mode_Is), c2), mode_b, Gt);
+  cmpGt = new_Conv(cmpGt, mode_Is);
 
   /* cmpLt = a < 10 */
-  c10 = new_Const (mode_i, tarval_from_long (mode_i, 10));
-  cmpLt = new_Proj(new_Cmp(get_value(0, mode_i), c10), mode_b, Lt);
-  cmpLt = new_Conv(cmpLt, mode_i);
+  c10 = new_Const (mode_Is, new_tarval_from_long (10, mode_Is));
+  cmpLt = new_Proj(new_Cmp(get_value(0, mode_Is), c10), mode_b, Lt);
+  cmpLt = new_Conv(cmpLt, mode_Is);
 
   /* cmpGt && cmpLt */
-  and = new_And(cmpGt, cmpLt, mode_i);
+  and = new_And(cmpGt, cmpLt, mode_Is);
   /* compare result and 0 because we have no cast from integer to bool */
-  and = new_Cmp(and, new_Const (mode_i, tarval_from_long (mode_i, 0)));
+  and = new_Cmp(and, new_Const (mode_Is, new_tarval_from_long (0, mode_Is)));
   and = new_Proj(and, mode_b, Ne);
 
   /* the conditional branch */
@@ -95,7 +103,7 @@ int main(int argc, char **argv)
   /* generate and fill the then block */
   b = new_immBlock ();
   add_in_edge (b, t);
-  set_value (0, new_Const (mode_i, tarval_from_long (mode_i, 1)));
+  set_value (0, new_Const (mode_Is, new_tarval_from_long (1, mode_Is)));
   mature_block (b);
   x_then = new_Jmp ();
 
@@ -108,7 +116,7 @@ int main(int argc, char **argv)
   /* Generate the return node into current region. */
   {
     ir_node *in[1]; /* this is the array containing the return parameters */
-    in[0] = get_value(0, mode_i);
+    in[0] = get_value(0, mode_Is);
     x = new_Return (get_store(), 1, in);
   }
   /* Now generate all instructions for this block and all its predecessor blocks
@@ -121,6 +129,8 @@ 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));
 
+  finalize_cons (irg);
+
   printf("Optimizing ...\n");
   dead_node_elimination(irg);