X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=testprograms%2Fthree_cfpred_example.c;h=201ad7afb677dd2b99dec63ccd7b97b9bb325fe4;hb=a4c85aab2676bbb3138f042ed5bc27a6df8b1903;hp=ea9aea4d783b6636e0e7785f4939b54e22bb093e;hpb=eed0e43a82a6da6d60cf9d2e67f2394ca9f34e8d;p=libfirm diff --git a/testprograms/three_cfpred_example.c b/testprograms/three_cfpred_example.c index ea9aea4d7..201ad7afb 100644 --- a/testprograms/three_cfpred_example.c +++ b/testprograms/three_cfpred_example.c @@ -68,11 +68,11 @@ int main(int argc, char **argv) #define METHODNAME "main" #define NRARGS 1 #define NRES 1 - printf("creating an IR graph: ...\n"); + printf("\nCreating an IR graph: ...\n"); owner = get_glob_type(); proc_main = new_type_method(id_from_str(METHODNAME, strlen(METHODNAME)), - NRARGS, NRES); + NRARGS, NRES); /** @@@ setting of arg/res types misses **/ ent = new_entity ((type *)owner, id_from_str (METHODNAME, strlen(METHODNAME)), @@ -91,13 +91,13 @@ int main(int argc, char **argv) set_value(0, new_Const (mode_i, tarval_from_long (mode_i, 6))); f = new_Proj(cond, mode_X, 0); t = new_Proj(cond, mode_X, 1); - mature_block(irg->current_block); + mature_block(get_irg_current_block(irg)); /* end block to add jmps */ - endBlock = new_Block(); + endBlock = new_immBlock(); /* Block 1 */ - Block1 = new_Block(); + Block1 = new_immBlock(); add_in_edge(Block1, t); mature_block(Block1); set_value(0, new_Const (mode_i, tarval_from_long (mode_i, 5))); @@ -105,24 +105,24 @@ int main(int argc, char **argv) add_in_edge(endBlock, jmp); /* scndCondBlock */ - scndCondBlock = new_Block(); + scndCondBlock = new_immBlock(); add_in_edge(scndCondBlock, f); mature_block(scndCondBlock); c1 = new_Const (mode_i, tarval_from_long (mode_i, 3)); cond = new_Cond(new_Proj(new_Cmp(c1, get_value(1, mode_i)), mode_b, Eq)); f = new_Proj(cond, mode_X, 0); t = new_Proj(cond, mode_X, 1); - mature_block(irg->current_block); + mature_block(get_irg_current_block(irg)); /* Block 2 */ - Block2 = new_Block(); + Block2 = new_immBlock(); add_in_edge(Block2, f); mature_block(Block2); jmp = new_Jmp(); add_in_edge(endBlock, jmp); /* Block 3 */ - Block3 = new_Block(); + Block3 = new_immBlock(); add_in_edge(Block3, t); mature_block(Block3); jmp = new_Jmp(); @@ -135,13 +135,14 @@ int main(int argc, char **argv) in[0] = get_value(0, mode_i); x = new_Return (get_store(), 1, in); } - mature_block (irg->current_block); + mature_block (get_irg_current_block(irg)); /* finish the Block with the end node */ - add_in_edge (irg->end_block, x); - mature_block (irg->end_block); + add_in_edge (get_irg_end_block(irg), x); + mature_block (get_irg_end_block(irg)); - printf("\nDone building the graph.\n"); + printf("Optimizing ...\n"); + dead_node_elimination(irg); /* verify the graph */ irg_vrfy(irg); @@ -149,8 +150,8 @@ int main(int argc, char **argv) printf("Dumping the graph and a control flow graph.\n"); dump_ir_block_graph (irg); dump_cfg (irg); - printf("use xvcg to view these graphs:\n"); - printf("/ben/goetz/bin/xvcg GRAPHNAME\n"); + printf("Use xvcg to view these graphs:\n"); + printf("/ben/goetz/bin/xvcg GRAPHNAME\n\n"); return (0); }