- simplified code

[libfirm] / testprograms / irr_cf_example.c

diff --git a/testprograms/irr_cf_example.c b/testprograms/irr_cf_example.c
index 9b59afb..c9c594b 100644 (file)
--- a/testprograms/irr_cf_example.c
+++ b/testprograms/irr_cf_example.c
@@ -10,13 +10,10 @@
  * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
  */
 
-# include <stdio.h>
-# include <string.h>
-
-# include "irvrfy.h"
-# include "irdump.h"
-# include "firm.h"
+#include <stdio.h>
+#include <string.h>
 
+#include <libfirm/firm.h>
 
 /**
 *  This file constructs a control flow of following shape:
@@ -46,50 +43,51 @@
 *   return
 **/
 
-int main(int argc, char **argv)
+int main(void)
 {
+  char *dump_file_suffix = "";
   ir_graph *irg;        /* this variable contains the irgraph */
-  type     *owner;      /* the class in which this method is defined */
-  type     *proc_main;  /* typeinformation for the method main */
-  entity   *ent;        /* represents this method as entity of owner */
+  ir_type     *owner;      /* the class in which this method is defined */
+  ir_type     *proc_main;  /* typeinformation for the method main */
+  ir_entity   *ent;        /* represents this method as ir_entity of owner */
   ir_node  *expr, *c1, *c2, *cond, *f, *t, *jmp, *x;
 
   printf("\nCreating an IR graph: IRR_CF...\n");
 
   /* init library */
-  init_firm (NULL);
+  init_firm(NULL);
   set_opt_constant_folding(0); /* so that stupid test are not evaluated. */
 
   /* FIRM was designed for oo languages where all methods belong to a class.
    * For imperative languages like C we view a file as a large class containing
    * all functions as methods in this file.
    * Therefore we define a class "empty" according to the file name
-   * with a method main as an entity.
+   * with a method main as an ir_entity.
    */
 #define CLASSNAME "IRREGULAR_CF"
 #define METHODNAME "main"
 #define NRARGS 0
 #define NRES 0
 
-  owner = new_type_class (new_id_from_chars (CLASSNAME, strlen(CLASSNAME)));
+  owner = new_type_class(new_id_from_chars(CLASSNAME, strlen(CLASSNAME)));
   proc_main = new_type_method(new_id_from_chars(METHODNAME, strlen(METHODNAME)),
                               NRARGS, NRES);
-  ent = new_entity ((type *)owner,
-                    new_id_from_chars (METHODNAME, strlen(METHODNAME)),
-                    (type *)proc_main);
+  ent = new_entity(owner,
+                   new_id_from_chars(METHODNAME, strlen(METHODNAME)),
+                   proc_main);
   get_entity_ld_name(ent);
 #define NUM_OF_LOCAL_VARS 0
 
-  irg = new_ir_graph (ent, NUM_OF_LOCAL_VARS);
+  irg = new_ir_graph(ent, NUM_OF_LOCAL_VARS);
 
   /* two make two conditionals that represent a switch */
-  expr = new_Const (mode_Is, new_tarval_from_long (0, mode_Is));
-  c1 = new_Const (mode_Is, new_tarval_from_long (1, mode_Is));
-  c2 = new_Const (mode_Is, new_tarval_from_long (2, mode_Is));
+  expr = new_Const(mode_Is, new_tarval_from_long(0, mode_Is));
+  c1 = new_Const(mode_Is, new_tarval_from_long(1, mode_Is));
+  c2 = new_Const(mode_Is, new_tarval_from_long(2, mode_Is));
 
   cond = new_Cond(new_Proj(new_Cmp(expr, c1), mode_b, pn_Cmp_Eq));
-  f = new_Proj(cond, mode_X, 0);
-  t = new_Proj(cond, mode_X, 1);
+  f = new_Proj(cond, mode_X, pn_Cond_false);
+  t = new_Proj(cond, mode_X, pn_Cond_true);
   mature_immBlock(get_irg_current_block(irg));
 
   new_immBlock();
@@ -100,8 +98,8 @@ int main(int argc, char **argv)
   new_immBlock();
   add_immBlock_pred(get_irg_current_block(irg), f);
   cond = new_Cond(new_Proj(new_Cmp(expr, c2), mode_b, pn_Cmp_Eq));
-  f = new_Proj(cond, mode_X, 0);
-  t = new_Proj(cond, mode_X, 1);
+  f = new_Proj(cond, mode_X, pn_Cond_false);
+  t = new_Proj(cond, mode_X, pn_Cond_true);
   mature_immBlock(get_irg_current_block(irg));
 
   new_immBlock();
@@ -119,14 +117,14 @@ int main(int argc, char **argv)
   add_immBlock_pred(get_irg_current_block(irg), t);
   add_immBlock_pred(get_irg_current_block(irg), jmp);
 
-  x = new_Return (get_store(), 0, NULL);
+  x = new_Return(get_store(), 0, NULL);
 
-  mature_immBlock (get_irg_current_block(irg));
+  mature_immBlock(get_irg_current_block(irg));
 
-  add_immBlock_pred (get_irg_end_block(irg), x);
-  mature_immBlock (get_irg_end_block(irg));
+  add_immBlock_pred(get_irg_end_block(irg), x);
+  mature_immBlock(get_irg_end_block(irg));
 
-  irg_finalize_cons (irg);
+  irg_finalize_cons(irg);
 
   printf("Optimizing ...\n");
   dead_node_elimination(irg);
@@ -135,11 +133,11 @@ int main(int argc, char **argv)
   irg_vrfy(irg);
 
   printf("Dumping the graph and a control flow graph.\n");
-  char *dump_file_suffix = "";
-  dump_ir_block_graph (irg, dump_file_suffix);
-  dump_cfg (irg, dump_file_suffix);
-  printf("Use xvcg to view these graphs:\n");
-  printf("/ben/goetz/bin/xvcg GRAPHNAME\n\n");
+  dump_ir_block_graph(irg, dump_file_suffix);
+  dump_cfg(irg, dump_file_suffix);
+  printf("Use ycomp to view these graphs:\n");
+  printf("ycomp IRREGULAR_CF_main.vcg\n\n");
+  printf("ycomp IRREGULAR_CF_main-cfg.vcg\n\n");
 
-  return (0);
+  return 0;
 }