X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=testprograms%2Fendless_loop.c;h=2ee88de7c982dc2b7eb6f3c062c9ce63139164a0;hb=a73258fd0b489615eaf52f0004d0604dba541b1d;hp=4d2d7fb0bc18d148007957fbd2a404264b5980dc;hpb=dbbbca55706f97a96d19d8cfa738575789bc2978;p=libfirm

diff --git a/testprograms/endless_loop.c b/testprograms/endless_loop.c
index 4d2d7fb0b..2ee88de7c 100644
--- a/testprograms/endless_loop.c
+++ b/testprograms/endless_loop.c
@@ -1,12 +1,16 @@
-/* (C) 2002 by Universitaet Karlsruhe
-** All rights reserved.
-**
-** Authors: Goetz Lindenmaier
-**
-** testprogram.
-*/
+/*
+ * Project:     libFIRM
+ * File name:   testprograms/endless_loop.c
+ * Purpose:     Representation of an endless loop.
+ * Author:      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.
+ */
+
 
-/* $ID$ */
 
 # include <stdio.h>
 # include <string.h>
@@ -16,23 +20,23 @@
 # include "firm.h"
 
 /**
-***  This file constructs the ir for the following pseudo-program:
-***
-***  VAR_A is some extern variable.
-***
-***  main(int a) {        // pos 0
-***    int b = 1;         // pos 1
-***    int h;             // pos 2
-***
-***    while (0 == 0) loop {
-***      h = a;
-***      a = b;
-***      b = h;
-***      VAR_A = b;
-***    }
-***
-***    return a-b;
-***  }
+*  This file constructs the ir for the following pseudo-program:
+*
+*  VAR_A is some extern variable.
+*
+*  main(int a) {        //  pos 0
+*    int b = 1;         //  pos 1
+*    int h;             //  pos 2
+*
+*    while (0 == 0) loop {
+*      h = a;
+*      a = b;
+*      b = h;
+*      VAR_A = b;
+*    }
+*
+*    return a-b;
+*  }
 **/
 
 int
@@ -47,7 +51,7 @@ main(void)
 
   printf("\nCreating an IR graph: ENDLESS_LOOP_EXAMPLE...\n");
 
-  init_firm ();
+  init_firm (NULL);
 
   set_optimize(1);
   set_opt_constant_folding(1);
@@ -55,45 +59,46 @@ main(void)
   set_opt_global_cse(0);
   set_opt_dead_node_elimination (1);
 
-  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);
 
 #define METHODNAME "main_tp"
 #define NRARGS 1
 #define NRES 1
 
-  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);
   set_method_param_type(proc_main, 0, prim_t_int);
   set_method_res_type(proc_main, 0, prim_t_int);
 
 
-  owner = new_type_class (id_from_str ("ENDLESS_LOOP_EXAMPLE", 20));
-  ent = new_entity (owner, id_from_str ("main", strlen("main")), proc_main);
+  owner = new_type_class (new_id_from_chars ("ENDLESS_LOOP_EXAMPLE", 20));
+  ent = new_entity (owner, new_id_from_chars ("main", strlen("main")), proc_main);
+  get_entity_ld_name(ent); /* force name mangling */
 
   /* Generates start and end blocks and nodes and a first, initial block */
   irg = new_ir_graph (ent, 4);
 
   /* Generate two values */
   set_value (0, new_Proj(get_irg_args(irg), mode_Is, 0));
-  set_value (1, new_Const (mode_Is, tarval_from_long (mode_Is, 1)));
+  set_value (1, new_Const (mode_Is, new_tarval_from_long (1, mode_Is)));
 
   x = new_Jmp();
-  mature_block (get_irg_current_block(irg));
+  mature_immBlock (get_irg_current_block(irg));
 
   /* generate a block for the loop header and the conditional branch */
   r = new_immBlock ();
-  add_in_edge (r, x);
-  x = new_Cond (new_Proj(new_Cmp(new_Const (mode_Is, tarval_from_long (mode_Is, 0)),
-				 new_Const (mode_Is, tarval_from_long (mode_Is, 0))),
-			 mode_b, Eq));
+  add_immBlock_pred (r, x);
+  x = new_Cond (new_Proj(new_Cmp(new_Const (mode_Is, new_tarval_from_long (0, mode_Is)),
+                 new_Const (mode_Is, new_tarval_from_long (0, mode_Is))),
+             mode_b, pn_Cmp_Eq));
   f = new_Proj (x, mode_X, 0);
   t = new_Proj (x, mode_X, 1);
 
   /* generate the block for the loop body */
   b = new_immBlock ();
-  add_in_edge (b, t);
+  add_immBlock_pred (b, t);
   x = new_Jmp ();
-  add_in_edge (r, x);
+  add_immBlock_pred (r, x);
 
   /* The code in the loop body,
      as we are dealing with local variables only the dataflow edges
@@ -104,17 +109,20 @@ main(void)
 
   /* set VAR_A to constant value */
   set_store (new_Proj (new_Store (get_store (),
-				  new_Const (mode_P, tarval_P_from_str ("VAR_A")),
-		     	          get_value(1, mode_Is)),
+                                  new_simpleSel(
+                                    get_store(),
+                                    get_irg_globals(irg),
+                                    new_entity(get_glob_type(),new_id_from_chars("VAR_A",6),prim_t_int)),
+                                  get_value(1, mode_Is)),
                        mode_M, 0));
 
-  mature_block (b);
-  mature_block (r);
+  mature_immBlock (b);
+  mature_immBlock (r);
 
   /* generate the return block */
   r = new_immBlock ();
-  add_in_edge (r, f);
-  mature_block (r);
+  add_immBlock_pred (r, f);
+  mature_immBlock (r);
 
   {
      ir_node *in[1];
@@ -124,10 +132,10 @@ 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));
 
-  finalize_cons (irg);
+  irg_finalize_cons (irg);
 
   printf("Optimizing ...\n");
 
@@ -139,10 +147,11 @@ main(void)
 
   /* output the vcg file */
   printf("Done building the graph.  Dumping it.\n");
-  //turn_of_edge_labels();
-  dump_keepalive_edges(true);
-  dump_all_types();
-  dump_ir_block_graph (irg);
+  /* turn_of_edge_labels(); */
+  dump_keepalive_edges(1);
+  char *dump_file_suffix = "";
+  dump_all_types(dump_file_suffix);
+  dump_ir_block_graph (irg, dump_file_suffix);
   printf("Use xvcg to view this graph:\n");
   printf("/ben/goetz/bin/xvcg GRAPHNAME\n\n");