Add dump_file_suffix to All_types.vcg filename

[libfirm] / testprograms / global_var_example.c

diff --git a/testprograms/global_var_example.c b/testprograms/global_var_example.c
index 401dc18..816b248 100644 (file)
--- a/testprograms/global_var_example.c
+++ b/testprograms/global_var_example.c
@@ -7,8 +7,10 @@
 **
 */
 
-#include <stdio.h>
+# include <stdio.h>
+# include <string.h>
 
+# include "irvrfy.h"
 # include "irdump.h"
 # include "firm.h"
 
@@ -30,15 +32,15 @@
 
 int main(int argc, char **argv)
 {
-  ir_graph *irg;          /* this variable contains the irgraph */
-  type_class *owner;      /* the class in which this method is defined */
-  type_method *proc_main; /* type information for the method main */
-  type_primitive *prim_t_int;  /* describes int type defined by the language */
-  entity *main_ent;       /* represents this method as entity of owner */
-  entity *i_ent;          /* the entity representing the global variable i */
-  ir_node *x, *i_ptr, *store;
+  ir_graph *irg;        /* this variable contains the irgraph */
+  type     *owner;      /* the class in which this method is defined */
+  type     *proc_main;  /* type information for the method main */
+  type     *prim_t_int; /* describes int type defined by the language */
+  entity   *main_ent;   /* represents this method as entity of owner */
+  entity   *i_ent;      /* the entity representing the global variable i */
+  ir_node  *x, *i_ptr, *store;
 
-  printf("creating an IR graph: GLOBAL_VAR ...\n");
+  printf("\nCreating an IR graph: GLOBAL_VAR ...\n");
 
   /* init library */
   init_firm ();
@@ -63,9 +65,9 @@ int main(int argc, char **argv)
   owner = get_glob_type();
   proc_main = new_type_method(id_from_str(METHODNAME, strlen(METHODNAME)),
                               NRARGS, NRES);
-  main_ent = new_entity ((type *)owner,
+  main_ent = new_entity (owner,
                         id_from_str (METHODNAME, strlen(METHODNAME)),
-                        (type *)proc_main);
+                        proc_main);
 
   /* Generates the basic graph for the method represented by entity main_ent, that
    * is, generates start and end blocks and nodes and a first, initial block.
@@ -74,9 +76,9 @@ int main(int argc, char **argv)
 #define NUM_OF_LOCAL_VARS 0
 
   /* Generate the entities for the global variables. */
-  i_ent = new_entity ((type *)get_glob_type(),
+  i_ent = new_entity (get_glob_type(),
                      id_from_str ("i", strlen("i")),
-                     (type *)prim_t_int);
+                     prim_t_int);
 
   irg = new_ir_graph (main_ent, NUM_OF_LOCAL_VARS);
 
@@ -97,25 +99,27 @@ int main(int argc, char **argv)
   }
   /* Now generate all instructions for this block and all its predecessor blocks
    * so we can mature it. */
-  mature_block (irg->current_block);
+  mature_block (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_in_edge (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_block (get_irg_end_block(irg));
 
-  /* verify the graph */
-  irg_vrfy(irg);
+  finalize_cons (irg);
 
+  printf("Optimizing ...\n");
   dead_node_elimination(irg);
 
-  printf("\nDone building the graph.  Dumping it.\n");
+  /* verify the graph */
+  irg_vrfy(irg);
+
+  printf("Done building the graph.  Dumping it.\n");
   dump_ir_block_graph (irg);
   dump_ir_graph_w_types (irg);
-
-  printf("use xvcg to view this graph:\n");
-  printf("/ben/goetz/bin/xvcg GRAPHNAME\n");
+  printf("Use xvcg to view this graph:\n");
+  printf("/ben/goetz/bin/xvcg GRAPHNAME\n\n");
 
   return (0);
 }