INHERITANCE_EXAMPLE works now (ssems it crashes in older version of libfirm)

[libfirm] / testprograms / dead_block_example.c

diff --git a/testprograms/dead_block_example.c b/testprograms/dead_block_example.c
index 113c21c..5a4d040 100644 (file)
--- a/testprograms/dead_block_example.c
+++ b/testprograms/dead_block_example.c
@@ -1,13 +1,15 @@
 /* Copyright (C) 1998 - 2000 by Universitaet Karlsruhe
-** All rights reserved.
-**
-** Authors: Christian Schaefer, Goetz Lindenmaier
-**
-** testprogram.
+* All rights reserved.
+*
+* Authors: Christian Schaefer, Goetz Lindenmaier
+*
+* testprogram.
 */
 
 # include <stdio.h>
+# include <string.h>
 
+# include "irvrfy.h"
 # include "irdump.h"
 # include "firm.h"
 
@@ -16,30 +18,30 @@
  */
 
 /**
-***  This file constructs a control flow of following shape:
-***
-***
-***         firstBlock
-***          /   \
-***         /     \
-***       |/_     _\|
-***     Block1    Block2   deadBlock
-***        \       |       /
-***        \      |      /
-***        _\|   \ /   |/_
-***            nextBlock
-***
-***
-***   This is a program as, e.g.,
-***
-***   if () then
-***     { Jmp label1; } // happens anyways
-***   else
-***     { Jmp label1; } // happens anyways
-*** label1:
-***   return();
-***   Jmp label1;
-***
+*  This file constructs a control flow of following shape:
+*
+*
+*         firstBlock
+*          /   \
+*         /     \
+*       |/_     _\|
+*     Block1    Block2   deadBlock
+*        \       |       /
+*          \      |      /
+*          _\|   \ /   |/_
+*            nextBlock
+*
+*
+*   This is a program as, e.g.,
+*
+*   if () then
+*     { Jmp label1; } // happens anyways
+*   else
+*     { Jmp label1; } // happens anyways
+* label1:
+*   return();
+*   Jmp label1;
+*
 **/
 
 int main(int argc, char **argv)
@@ -53,12 +55,10 @@ int main(int argc, char **argv)
           *deadBlock, *x;
 
   /* init library */
-  init_firm ();
-
-  set_opt_cse(0);  /* there is a bug: first and start block are cse!! @@@ */
+  init_firm (NULL);
 
   /*** Make basic type information for primitive type int. ***/
-  prim_t_int = new_type_primitive(id_from_str ("int", 3), mode_i);
+  prim_t_int = new_type_primitive(id_from_str ("int", 3), mode_Is);
 
   /* 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
@@ -79,14 +79,14 @@ int main(int argc, char **argv)
   ent = new_entity (owner,
                     id_from_str (METHODNAME, strlen(METHODNAME)),
                     proc_main);
-
+  get_entity_ld_name(ent); /* To enforce name mangling for vcg graph name */
 #define NUM_OF_LOCAL_VARS 1
 
   irg = new_ir_graph (ent, NUM_OF_LOCAL_VARS);
 
   /* to make a condition  */
-  c1 = new_Const (mode_i, tarval_from_long (mode_i, 1));
-  c2 = new_Const (mode_i, tarval_from_long (mode_i, 2));
+  c1 = new_Const (mode_Is, tarval_from_long (mode_Is, 1));
+  c2 = new_Const (mode_Is, tarval_from_long (mode_Is, 2));
   set_value(0, c2);
 
   cond = new_Cond(new_Proj(new_Cmp(c1, c2), mode_b, Eq));
@@ -121,7 +121,7 @@ int main(int argc, char **argv)
   switch_block(endBlock);
   {
     ir_node *in[1];
-    in[0] = get_value(0, mode_i);
+    in[0] = get_value(0, mode_Is);
     get_store();
     x = new_Return (get_store(), 1, in);
   }
@@ -130,6 +130,8 @@ int main(int argc, char **argv)
   add_in_edge (get_irg_end_block(irg), x);
   mature_block (get_irg_end_block(irg));
 
+  finalize_cons (irg);
+
   printf("Optimizing ...\n");
   local_optimize_graph (irg);
   dead_node_elimination (irg);