X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=testprograms%2Fif_example.c;h=9fcce41cbfb57df2447d34ee567f739d3dbd0ae8;hb=9e56dbf066d3698df877e2a9f78caeca29ea5a03;hp=daf1b9cff941b16b0f798a480ef9c2b0d1302232;hpb=6ed168c29789db8edf25c87f2da9164c49a5512c;p=libfirm

diff --git a/testprograms/if_example.c b/testprograms/if_example.c
index daf1b9cff..9fcce41cb 100644
--- a/testprograms/if_example.c
+++ b/testprograms/if_example.c
@@ -1,10 +1,14 @@
-/* Copyright (C) 1998 - 2000 by Universitaet Karlsruhe
-** All rights reserved.
-**
-** Authors: Christian Schaefer, Goetz Lindenmaier
-**
-** testprogram.
-*/
+/*
+ * Project:     libFIRM
+ * File name:   testprograms/if_example.c
+ * Purpose:     Shows construction of if.
+ * 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>
@@ -14,15 +18,15 @@
 # include "firm.h"
 
 /**
-***  This file constructs the ir for the following pseudo-program:
-***
-***  int main(int a) {
-***    int b = 2;
-***    if ( a == b )
-***      { a := a - 3; }
-***
-***    return a;
-***  }
+*  This file constructs the ir for the following pseudo-program:
+*
+*  int main(int a) {
+*    int b = 2;
+*    if ( a == b )
+*      { a := a - 3; }
+*
+*    return a;
+*  }
 **/
 
 int
@@ -38,10 +42,10 @@ main(void)
 
   printf("\nCreating an IR graph: IF_EXAMPLE...\n");
 
-  init_firm ();
+  init_firm (NULL);
 
 #define CLASSNAME "IF_EXAMPLE"
-#define METHODNAME "main"
+#define METHODNAME "IF_EXAMPLE_main"
 #define NRARGS 1
 #define NRES 1
 
@@ -49,16 +53,16 @@ main(void)
 
   owner = get_glob_type();
   /* Type information for the procedure */
-  proc_main = new_type_method(id_from_str(METHODNAME, strlen(METHODNAME)),
+  proc_main = new_type_method(new_id_from_chars(METHODNAME, strlen(METHODNAME)),
 			      NRARGS, NRES);
   /* The entity for the procedure */
   ent = new_entity (owner,
-                    id_from_str (METHODNAME, strlen(METHODNAME)),
+                    new_id_from_chars (METHODNAME, strlen(METHODNAME)),
                     proc_main);
   /* The type int.  This type is necessary to model the result and parameters
      the procedure. */
 #define PRIM_NAME "int"
-  typ = new_type_primitive(id_from_str(PRIM_NAME, strlen(PRIM_NAME)), mode_Is);
+  typ = new_type_primitive(new_id_from_chars(PRIM_NAME, strlen(PRIM_NAME)), mode_Is);
   /* The parameter and result types of the procedure. */
   set_method_param_type(proc_main, 0, typ);
   set_method_res_type(proc_main, 0, typ);
@@ -78,33 +82,38 @@ main(void)
   set_value (a_pos, new_Proj (get_irg_args(irg), mode_Is, 0));
   /* Generate the constant and assign it to b. The assignment is resovled to a
      dataflow edge. */
-  set_value (b_pos, new_Const (mode_Is, tarval_from_long (mode_Is, 2)));
+  set_value (b_pos, new_Const (mode_Is, new_tarval_from_long (2, mode_Is)));
   /* We know all predecessors of the block and all set_values and set_stores are
      preformed.   We can mature the block.  */
-  mature_block (get_irg_current_block(irg));
+  mature_immBlock (get_irg_current_block(irg));
 
   /* Generate a conditional branch */
   cmp = new_Cmp(get_value(a_pos, mode_Is), get_value(b_pos, mode_Is));
-  x = new_Cond (new_Proj(cmp, mode_b, Eq));
+  x = new_Cond (new_Proj(cmp, mode_b, pn_Cmp_Eq));
   f = new_Proj (x, mode_X, 0);
   t = new_Proj (x, mode_X, 1);
 
   /* generate and fill the then block */
   r = new_immBlock ();
-  add_in_edge (r, t);
-  a = new_Sub(get_value(a_pos, mode_Is),
-              new_Const (mode_Is, tarval_from_long (mode_Is, 3)),
+  add_immBlock_pred (r, t);
+  {
+    ir_node *b,*c;
+    c = new_Const (mode_Is, new_tarval_from_long (3, mode_Is));
+    b = get_value(a_pos, mode_Is);
+    a = new_Sub(b,
+              c,
   	      mode_Is);
+  }
   set_value (a_pos, a);
 
-  mature_block (r);
+  mature_immBlock (r);
   x = new_Jmp ();
 
   /* generate the fall through block and add all cfg edges */
   r = new_immBlock ();
-  add_in_edge (r, f);
-  add_in_edge (r, x);
-  mature_block (r);
+  add_immBlock_pred (r, f);
+  add_immBlock_pred (r, x);
+  mature_immBlock (r);
   /* The Return statement */
   {
      ir_node *in[1], *store ;
@@ -115,16 +124,16 @@ main(void)
   }
 
   /* finalize the end block generated in new_ir_graph() */
-  add_in_edge (get_irg_end_block(irg), x);
-  mature_block (get_irg_end_block(irg));
+  add_immBlock_pred (get_irg_end_block(irg), x);
+  mature_immBlock (get_irg_end_block(irg));
 
   /* verify the graph */
   irg_vrfy(irg);
-  finalize_cons (irg);
+  irg_finalize_cons (irg);
 
   /* output the vcg file */
   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");