X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=testprograms%2Fcond_example.c;h=4b6414f078c6944376efe34966c82adc9545aaec;hb=bc772df6ffc43cc8d73b0fb3d8d43a1c8ebf1c25;hp=dfbbcf6a23afb5e1e0544db1269431373245839a;hpb=9fbc46dc213871984b377a2b622a7ca8817fb0ad;p=libfirm

diff --git a/testprograms/cond_example.c b/testprograms/cond_example.c
index dfbbcf6a2..4b6414f07 100644
--- a/testprograms/cond_example.c
+++ b/testprograms/cond_example.c
@@ -1,10 +1,15 @@
-/* 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>
@@ -38,7 +43,7 @@ int main(int argc, char **argv)
   init_firm (NULL);
 
   /*** Make basic type information for primitive type int. ***/
-  prim_t_int = new_type_primitive(id_from_str ("int", 3), mode_Is);
+  prim_t_int = new_type_primitive(new_id_from_chars ("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
@@ -49,11 +54,11 @@ int main(int argc, char **argv)
 #define CLASSNAME "COND_EXAMPLE"
 #define ENTITYNAME "main"
 
-  owner = new_type_class (id_from_str (CLASSNAME, strlen(CLASSNAME)));
-  method = new_type_method (id_from_str("main", 4), 1, 1);
+  owner = new_type_class (new_id_from_chars (CLASSNAME, strlen(CLASSNAME)));
+  method = new_type_method (new_id_from_chars("main", 4), 1, 1);
   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);
+  ent = new_entity (owner, new_id_from_chars (ENTITYNAME, strlen(ENTITYNAME)), method);
   get_entity_ld_name(ent);
 
 
@@ -73,39 +78,39 @@ int main(int argc, char **argv)
 
   /* the expression that evaluates the condition */
   /* cmpGt = a > 2 */
-  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);
+  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, pn_Cmp_Gt);
   cmpGt = new_Conv(cmpGt, mode_Is);
 
   /* cmpLt = a < 10 */
-  c10 = new_Const (mode_Is, tarval_from_long (mode_Is, 10));
-  cmpLt = new_Proj(new_Cmp(get_value(0, mode_Is), c10), mode_b, Lt);
+  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, pn_Cmp_Lt);
   cmpLt = new_Conv(cmpLt, mode_Is);
 
   /* cmpGt && cmpLt */
   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_Is, tarval_from_long (mode_Is, 0)));
-  and = new_Proj(and, mode_b, Ne);
+  and = new_Cmp(and, new_Const (mode_Is, new_tarval_from_long (0, mode_Is)));
+  and = new_Proj(and, mode_b, pn_Cmp_Lg);
 
   /* the conditional branch */
   x = new_Cond (and);
   f = new_Proj (x, mode_X, 0); /* if condition is false */
   t = new_Proj (x, mode_X, 1); /* if condition is true */
 
-  mature_block (get_irg_current_block(irg));
+  mature_immBlock (get_irg_current_block(irg));
 
   /* generate and fill the then block */
   b = new_immBlock ();
-  add_in_edge (b, t);
-  set_value (0, new_Const (mode_Is, tarval_from_long (mode_Is, 1)));
-  mature_block (b);
+  add_immBlock_pred (b, t);
+  set_value (0, new_Const (mode_Is, new_tarval_from_long (1, mode_Is)));
+  mature_immBlock (b);
   x_then = new_Jmp ();
 
   /* generate the fall through block and add all cfg edges */
   b = new_immBlock ();
-  add_in_edge (b, x_then);
-  add_in_edge (b, f);
+  add_immBlock_pred (b, x_then);
+  add_immBlock_pred (b, f);
 
 
   /* Generate the return node into current region. */
@@ -116,15 +121,15 @@ int main(int argc, char **argv)
   }
   /* Now generate all instructions for this block and all its predecessor blocks
    * so we can mature it. */
-  mature_block (get_irg_current_block(irg));
+  mature_immBlock (get_irg_current_block(irg));
 
   /* This adds the in edge of the end block which originates at the
      return statement. The return node passes controlflow to the end block.*/
-  add_in_edge (get_irg_end_block(irg), x);
+  add_immBlock_pred (get_irg_end_block(irg), x);
   /* Now we can mature the end block as all it's predecessors are known. */
-  mature_block (get_irg_end_block(irg));
+  mature_immBlock (get_irg_end_block(irg));
 
-  finalize_cons (irg);
+  irg_finalize_cons (irg);
 
   printf("Optimizing ...\n");
   dead_node_elimination(irg);
@@ -133,7 +138,7 @@ int main(int argc, char **argv)
   irg_vrfy(irg);
 
   printf("Done building the graph.  Dumping it.\n");
-  dump_ir_block_graph (irg);
+  dump_ir_block_graph (irg, 0);
   printf("Use xvcg to view this graph:\n");
   printf("/ben/goetz/bin/xvcg GRAPHNAME\n\n");