X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=testprograms%2Fglobal_cse.c;h=1d15440665ba0b2467bbc9b04dfc5d230e613f62;hb=67067849894a6b5e0f87253ede8539331e3bdc3d;hp=386b594e2be6be4761f748becd12cb6150d5f736;hpb=67e3ef5e7088c2254daeb2a72e0950bef6ca0256;p=libfirm

diff --git a/testprograms/global_cse.c b/testprograms/global_cse.c
index 386b594e2..1d1544066 100644
--- a/testprograms/global_cse.c
+++ b/testprograms/global_cse.c
@@ -1,9 +1,9 @@
 /* Copyright (C) 2002 by Universitaet Karlsruhe
-** All rights reserved.
-**
-** Authors: Christian Schaefer, Goetz Lindenmaier
-**
-** testprogram.
+* All rights reserved.
+*
+* Authors: Christian Schaefer, Goetz Lindenmaier
+*
+* testprogram.
 */
 
 /* $Id$ */
@@ -16,18 +16,18 @@
 # 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;
-***    } else {
-***       a := a - 3;
-***       a := a + 5;
-***    }
-***    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;
+*    } else {
+*       a := a - 3;
+*       a := a + 5;
+*    }
+*    return a;
+*  }
 **/
 
 int
@@ -43,7 +43,7 @@ main(void)
 
   printf("\nCreating an IR graph: GLOBAL_CSE_EXAMPLE...\n");
 
-  init_firm ();
+  init_firm (NULL);
 
   set_optimize(1);
   set_opt_constant_folding(1);
@@ -52,7 +52,7 @@ main(void)
   set_opt_dead_node_elimination (1);
 
 #define CLASSNAME "GLOBAL_CSE_EXAMPLE"
-#define METHODNAME "main"
+#define METHODNAME "GLOBAL_CSE_EXAMPLE_main"
 #define NRARGS 1
 #define NRES 1
 
@@ -69,7 +69,7 @@ main(void)
   /* 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_i);
+  typ = new_type_primitive(id_from_str(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);
@@ -86,18 +86,18 @@ main(void)
 
   /* Get the procedure parameter and assign it to the parameter variable
      a. */
-  set_value (a_pos, new_Proj (get_irg_args(irg), mode_i, 0));
+  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_i, tarval_from_long (mode_i, 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));
 
   /* Generate a conditional branch */
-  cmp = new_Cmp(get_value(a_pos, mode_i), get_value(b_pos, mode_i)); /*
-  cmp = new_Cmp(new_Const (mode_i, tarval_from_long (mode_i, 2)),
-                new_Const (mode_i, tarval_from_long (mode_i, 2)));*/
+  cmp = new_Cmp(get_value(a_pos, mode_Is), get_value(b_pos, mode_Is)); /*
+  cmp = new_Cmp(new_Const (mode_Is, new_tarval_from_long (2, mode_Is)),
+                new_Const (mode_Is, new_tarval_from_long (2, mode_Is)));*/
   x = new_Cond (new_Proj(cmp, mode_b, Eq));
   f = new_Proj (x, mode_X, 0);
   t = new_Proj (x, mode_X, 1);
@@ -105,9 +105,9 @@ main(void)
   /* generate and fill the then block */
   r = new_immBlock ();
   add_in_edge (r, t);
-  a = new_Sub(get_value(a_pos, mode_i),
-              new_Const (mode_i, tarval_from_long (mode_i, 3)),
-  	      mode_i);
+  a = new_Sub(get_value(a_pos, mode_Is),
+              new_Const (mode_Is, new_tarval_from_long (3, mode_Is)),
+  	      mode_Is);
   set_value (a_pos, a);
 
   mature_block (r);
@@ -116,10 +116,10 @@ main(void)
   /* generate the else block */
   r = new_immBlock ();
   add_in_edge (r, f);
-  a = new_Sub(get_value(a_pos, mode_i),
-              new_Const (mode_i, tarval_from_long (mode_i, 3)),
-  	      mode_i);
-  a = new_Add(a, new_Const (mode_i, tarval_from_long (mode_i, 5)), mode_i);
+  a = new_Sub(get_value(a_pos, mode_Is),
+              new_Const (mode_Is, new_tarval_from_long (3, mode_Is)),
+  	      mode_Is);
+  a = new_Add(a, new_Const (mode_Is, new_tarval_from_long (5, mode_Is)), mode_Is);
   set_value (a_pos, a);
 
   mature_block (r);
@@ -133,7 +133,7 @@ main(void)
   /* The Return statement */
   {
      ir_node *in[1], *store ;
-     in[0] = get_value (a_pos, mode_i);
+     in[0] = get_value (a_pos, mode_Is);
      store = get_store();
 
      x = new_Return (store, 1, in);