From 41bcf606399e7f6ab113baa8618afd1a3f4fb374 Mon Sep 17 00:00:00 2001 From: =?utf8?q?G=C3=B6tz=20Lindenmaier?= Date: Tue, 22 Jan 2002 08:51:52 +0000 Subject: [PATCH] Fixed bug in while_ex [r299] --- testprograms/oo_program_example.c | 1 - testprograms/three_cfpred_example.c | 8 +++++++- testprograms/while_example.c | 17 +++++++++++------ 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/testprograms/oo_program_example.c b/testprograms/oo_program_example.c index dae7ddb32..791500528 100644 --- a/testprograms/oo_program_example.c +++ b/testprograms/oo_program_example.c @@ -83,7 +83,6 @@ main(void) set_method_res_type(proc_c, 0, prim_t_int); proc_c_e = new_entity(class_prima, id_from_str ("c", 1), proc_c); - /*** Now build procedure main. ***/ /** Type information for main. **/ printf("\nCreating an IR graph: OO_PROGRAM_EXAMPLE...\n"); diff --git a/testprograms/three_cfpred_example.c b/testprograms/three_cfpred_example.c index c0f6cceba..a5232a727 100644 --- a/testprograms/three_cfpred_example.c +++ b/testprograms/three_cfpred_example.c @@ -48,6 +48,7 @@ int main(int argc, char **argv) { + type *prim_t_int; 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 */ @@ -60,6 +61,9 @@ int main(int argc, char **argv) set_optimize(1); + /*** Make basic type information for primitive type int. ***/ + prim_t_int = new_type_primitive(id_from_str ("int", 3), mode_i); + /* 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. @@ -73,7 +77,9 @@ int main(int argc, char **argv) owner = get_glob_type(); proc_main = new_type_method(id_from_str(METHODNAME, strlen(METHODNAME)), NRARGS, NRES); - /** @@@ setting of arg/res types misses **/ + set_method_param_type(proc_main, 0, prim_t_int); + set_method_res_type(proc_main, 0, prim_t_int); + ent = new_entity (owner, id_from_str (METHODNAME, strlen(METHODNAME)), proc_main); diff --git a/testprograms/while_example.c b/testprograms/while_example.c index a4d4e2654..c1dd962f4 100644 --- a/testprograms/while_example.c +++ b/testprograms/while_example.c @@ -48,31 +48,34 @@ main(void) prim_t_int = new_type_primitive(id_from_str ("int", 3), mode_i); -#define METHODNAME "main" +#define METHODNAME "main_tp" #define NRARGS 1 -#define NRES 0 +#define NRES 1 proc_main = new_type_method(id_from_str(METHODNAME, strlen(METHODNAME)), NRARGS, NRES); set_method_param_type(proc_main, 0, prim_t_int); + set_method_res_type(proc_main, 0, prim_t_int); - owner = new_type_class (id_from_str ("WHILE_EXAMPLE", 16)); - ent = new_entity (owner, id_from_str ("main", 4), proc_main); + + owner = new_type_class (id_from_str ("WHILE_EXAMPLE", 13)); + ent = new_entity (owner, id_from_str ("main", strlen("main")), proc_main); /* Generates start and end blocks and nodes and a first, initial block */ irg = new_ir_graph (ent, 4); - /* Generate two constants */ + /* Generate two values */ set_value (0, new_Proj(get_irg_args(irg), mode_i, 0)); set_value (1, new_Const (mode_i, tarval_from_long (mode_i, 1))); x = new_Jmp(); mature_block (get_irg_current_block(irg)); + /* generate a block for the loop header and the conditional branch */ r = new_immBlock (); add_in_edge (r, x); x = new_Cond (new_Proj(new_Cmp(new_Const (mode_i, tarval_from_long (mode_i, 0)), - new_Const (mode_i, tarval_from_long (mode_i, 0))), + get_value(1, mode_i)), mode_b, Eq)); f = new_Proj (x, mode_X, 0); t = new_Proj (x, mode_X, 1); @@ -118,6 +121,8 @@ main(void) /* output the vcg file */ printf("Done building the graph. Dumping it.\n"); + turn_of_edge_labels(); + dump_all_types(); dump_ir_block_graph (irg); printf("Use xvcg to view this graph:\n"); printf("/ben/goetz/bin/xvcg GRAPHNAME\n\n"); -- 2.20.1