X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=testprograms%2Fcond_example.c;h=5599794c08c1f5a600403cc1a7131393aae9a838;hb=1f231ec18477e4384a4b3e105270262ae19566de;hp=69f82c7e3073233da8020de4b49c51ca093e7a2d;hpb=4433514e4b01cb3c566d24d671e689f02682f59f;p=libfirm

diff --git a/testprograms/cond_example.c b/testprograms/cond_example.c
index 69f82c7e3..5599794c0 100644
--- a/testprograms/cond_example.c
+++ b/testprograms/cond_example.c
@@ -1,119 +1,132 @@
-/* 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 "irdump.h"
-# include "firm.h"
+#include <libfirm/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)
+int main(void)
 {
-  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, *arg1, *c2, *c10, *cmpGt, *cmpLt, *and, *f, *t, *b;
+  ir_type     *prim_t_int;
+  ir_graph *irg;       /* this variable contains the irgraph */
+  ir_type     *owner;     /* the class in which this method is defined */
+  ir_type     *method;    /* the ir_type of this method */
+  ir_entity   *ent;       /* represents this method as ir_entity of owner */
+  ir_node  *x, *x_then, *arg1, *c2, *c10, *cmpGt, *cmpLt, *and, *f, *t, *b;
 
   printf("\nCreating an IR graph: COND_EXAMPLE...\n");
 
   /* init library */
-  init_firm ();
+  init_firm(NULL);
+
+  /*** Make basic ir_type information for primitive ir_type int. ***/
+  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
    * all functions as methods in this file.
    * Therefore we define a class "COND_EXAMPLE" with a method main as an
-   * entity.
+   * ir_entity.
    */
 #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), 0, 2);
-  ent = new_entity ((type *)owner, id_from_str (ENTITYNAME, strlen(ENTITYNAME)), (type *)method);
+  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, new_id_from_chars(ENTITYNAME, strlen(ENTITYNAME)), method);
+  get_entity_ld_name(ent);
 
 
-  /* Generates the basic graph for the method represented by entity ent, that
+  /* Generates the basic graph for the method represented by ir_entity ent, that
    * is, generates start and end blocks and nodes and a first, initial block.
    * The constructor needs to know how many local variables the method has.
    */
 #define NUM_OF_LOCAL_VARS 1
 
-  irg = new_ir_graph (ent, NUM_OF_LOCAL_VARS);
+  irg = new_ir_graph(ent, NUM_OF_LOCAL_VARS);
 
   /* get the first argument a of method main - see irgraph.h */
-  arg1 = new_Proj(irg->args, 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, pn_Cmp_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, pn_Cmp_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_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 */
+  x = new_Cond(and);
+  f = new_Proj(x, mode_X, pn_Cond_false); /* if condition is false */
+  t = new_Proj(x, mode_X, pn_Cond_true); /* if condition is true */
 
-  mature_block (irg->current_block);
+  mature_immBlock(get_irg_current_block(irg));
 
   /* generate and fill the then block */
-  b = new_Block ();
-  add_in_edge (b, t);
-  set_value (0, new_Const (mode_i, tarval_from_long (mode_i, 1)));
-  mature_block (b);
-  x_then = new_Jmp ();
+  b = new_immBlock();
+  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_Block ();
-  add_in_edge (b, x_then);
-  add_in_edge (b, f);
+  b = new_immBlock();
+  add_immBlock_pred(b, x_then);
+  add_immBlock_pred(b, f);
 
 
   /* 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);
-    x = new_Return (get_store(), 1, in);
+    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
    * so we can mature it. */
-  mature_block (irg->current_block);
+  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 (irg->end_block, 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 (irg->end_block);
+  mature_immBlock(get_irg_end_block(irg));
+
+  irg_finalize_cons(irg);
 
   printf("Optimizing ...\n");
   dead_node_elimination(irg);
@@ -122,9 +135,9 @@ int main(int argc, char **argv)
   irg_vrfy(irg);
 
   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");
+  dump_ir_block_graph(irg, 0);
+  printf("Use ycomp to view this graph:\n");
+  printf("ycomp GRAPHNAME\n\n");
 
-  return (0);
+  return 0;
 }