X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=testprograms%2Fmemory_example.c;h=ff09a90c23696c8676e84c5d2e6a2f8b886a864d;hb=f9b8d47d4043efa9d709fa221e4145d8019e4721;hp=b6a6e796ecfe5011356ecf0278c649a04b48a872;hpb=8a828c064c24643f30d68b67808a62e8a7ae1d80;p=libfirm

diff --git a/testprograms/memory_example.c b/testprograms/memory_example.c
index b6a6e796e..ff09a90c2 100644
--- a/testprograms/memory_example.c
+++ b/testprograms/memory_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/memory_example.c
+ * Purpose:     Illustrate memory edges.
+ * 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>
@@ -66,52 +70,56 @@ main(void)
 
   printf("\nCreating an IR graph: MEMORY_EXAMPLE...\n");
 
-  init_firm ();
+  init_firm (NULL);
 
   set_opt_dead_node_elimination (1);
 
   /*** Make basic type information for primitive type int. ***/
-  prim_t_int = new_type_primitive(id_from_str ("int", 3), mode_Iu);
+  prim_t_int = new_type_primitive(new_id_from_chars ("int", 3), mode_Iu);
 
   /* a class to get started with, containing the main procedure */
-  owner = new_type_class (id_from_str ("MEMORY_EXAMPLE", 14));
-  method = new_type_method (id_from_str("main", 4), 0, 1);
+  owner = new_type_class (new_id_from_chars ("MEMORY_EXAMPLE", 14));
+  method = new_type_method (new_id_from_chars("main", 4), 0, 1);
   set_method_res_type(method, 0, prim_t_int);
-  ent = new_entity (owner, id_from_str ("main", 4), method);
+  ent = new_entity (owner, new_id_from_chars ("main", 4), method);
   get_entity_ld_name(ent); /* To enforce name mangling for vcg graph name */
 
   /* Generates start and end blocks and nodes and a first, initial block */
   irg = new_ir_graph (ent, 4);
 
-  /* generate two constant pointers to string constants */
-  /* this simulates two global variables, a and b point to these variables */
-  a = new_Const (mode_P, tarval_P_from_str ("VAR_A"));
-  b = new_Const (mode_P, tarval_P_from_str ("VAR_B"));
-
-  /* set VAR_A and VAR_B to constant values */
+  /* create two global variables, a and b point to these variables */
+  a = new_simpleSel(
+              get_store(),
+              get_irg_globals(irg),
+              new_entity(get_glob_type(),new_id_from_chars("VAR_A",6),prim_t_int));
+  b = new_simpleSel(
+              get_store(),
+              get_irg_globals(irg),
+              new_entity(get_glob_type(),new_id_from_chars("VAR_B",6),prim_t_int));
+   /* set VAR_A and VAR_B to constant values */
   set_store (new_Proj (new_Store (get_store (), a,
-		     	          new_Const (mode_Iu, tarval_from_long (mode_Is, 0))),
+		     	          new_Const (mode_Iu, new_tarval_from_long (0, mode_Iu))),
                        mode_M, 0));
 
   set_store (new_Proj (new_Store (get_store (), b,
-			          new_Const (mode_Iu, tarval_from_long (mode_Is, 1))),
+			          new_Const (mode_Iu, new_tarval_from_long (1, mode_Iu))),
                        mode_M, 0));
 
   /* finish this first block */
   x = new_Jmp ();
-  mature_block (get_irg_current_block(irg));
+  mature_immBlock (get_irg_current_block(irg));
 
   /* a loop body */
   r = new_immBlock ();
-  add_in_edge (r, x);
+  add_immBlock_pred (r, x);
 
   /* exchange the content of the two variables. Exceptions not cached. */
   /* load the value and make it's effects visible. */
-  x = new_Load (get_store (), a);
+  x = new_Load (get_store (), a, mode_Iu);
     set_store (new_Proj (x, mode_M, 0));
     x = new_Proj(x, mode_Iu, 2);
   /* the same again: load the value and make it's effects visible. */
-  y = new_Load (get_store (), b);
+  y = new_Load (get_store (), b, mode_Iu);
     set_store (new_Proj (y, mode_M, 0));
     y = new_Proj(y, mode_Iu, 2);
   /* store the exchanged values. */
@@ -122,32 +130,32 @@ main(void)
   x = new_Cond (
         new_Proj (
           new_Cmp (
-            new_Const (mode_Iu, tarval_from_long (mode_Is, 0)),
+            new_Const (mode_Iu, new_tarval_from_long (0, mode_Iu)),
             x),
-          mode_b, Gt));
+          mode_b, pn_Cmp_Gt));
 
   /* build the cfg of the loop */
-  add_in_edge (r, new_Proj (x, mode_X, 0));
+  add_immBlock_pred (r, new_Proj (x, mode_X, 0));
   x = new_Proj (x, mode_X, 1);
-  mature_block(r);
+  mature_immBlock(r);
 
   /* generate the block the loop exits to */
   r = new_immBlock ();
-  add_in_edge (r, x);
+  add_immBlock_pred (r, x);
 
   /* generate the return block and return the content of VAR_A */
   {
      ir_node *in[1];
-     x = new_Load (get_store (), a);
+     x = new_Load (get_store (), a, mode_Iu);
      in[0] = new_Proj (x, mode_Iu, 2);
 
      x = new_Return (new_Proj(x, mode_M, 0), 1, in);
   }
-  mature_block (r);
-  add_in_edge (get_irg_end_block(irg), x);
-  mature_block (get_irg_end_block(irg));
+  mature_immBlock (r);
+  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");
   dead_node_elimination(irg);
@@ -156,7 +164,7 @@ main(void)
   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");