X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana2%2Fpto_comp.c;h=94487cd448295c8b78f0869c72605bf45b65a83c;hb=c53a503e81f6e7c0995fbbcc451c2178ad9083bd;hp=d7b5731822d0de872a93807fd839ef7d6ac2749b;hpb=f75c9d04c9b10670c0456bb61727f25ee7c2aac0;p=libfirm diff --git a/ir/ana2/pto_comp.c b/ir/ana2/pto_comp.c index d7b573182..94487cd44 100644 --- a/ir/ana2/pto_comp.c +++ b/ir/ana2/pto_comp.c @@ -2,7 +2,7 @@ /* Project: libFIRM - File name: ir/ana/pto_comp.c + File name: ir/ana2/pto_comp.c Purpose: Main Implementation of PTO Author: Florian Modified by: @@ -29,7 +29,7 @@ # include "pto_mod.h" # include "irnode_t.h" -# include "irprog.h" +# include "irprog_t.h" # include "xmalloc.h" # include "irmemwalk.h" @@ -38,6 +38,8 @@ # include "ecg.h" +# include "gnu_ext.h" + /* Local Defines: */ /* Local Data Types: */ @@ -70,7 +72,7 @@ static void pto_end_block (ir_node*, pto_env_t*); static int add_graph_args (ir_graph *graph, ir_node *call, pto_env_t *env) { int change = FALSE; - type *meth = get_entity_type (get_irg_entity (graph)); + ir_type *meth = get_entity_type (get_irg_entity (graph)); ir_node **args = get_irg_proj_args (graph); int i, n_args; @@ -78,7 +80,8 @@ static int add_graph_args (ir_graph *graph, ir_node *call, pto_env_t *env) n_args = get_Call_n_params (call); - DBGPRINT (1, (stdout, "add_graph_args(/*todo*/): args of %s[%li] -> 0x%08x\n", + DBGPRINT (1, (stdout, "%s: args of %s[%li] -> 0x%08x\n", + __FUNCTION__, OPNAME (call), OPNUM (call), (int) graph)); for (i = 0; i < n_args; i ++) { @@ -93,7 +96,8 @@ static int add_graph_args (ir_graph *graph, ir_node *call, pto_env_t *env) change |= qset_insert_all (frm_pto->values, arg_pto->values); - DBGPRINT (2, (stdout, "add_graph_args(/*todo*/): arg [%i]: -> %s[%li] (%i) -> %s[%li] (%i)\n", + DBGPRINT (2, (stdout, "%s: arg [%i]: -> %s[%li] (%i) -> %s[%li] (%i)\n", + __FUNCTION__, i, OPNAME (call_arg), OPNUM (call_arg), arg_pto->values->id, @@ -109,7 +113,7 @@ static int add_graph_args (ir_graph *graph, ir_node *call, pto_env_t *env) /* Transfer the actual arguments to the formal arguments */ static void set_graph_args (ir_graph *graph, ir_node *call, pto_env_t *env) { - type *meth = get_entity_type (get_irg_entity (graph)); + ir_type *meth = get_entity_type (get_irg_entity (graph)); ir_node **args = get_irg_proj_args (graph); int i, n_args; @@ -125,7 +129,8 @@ static void set_graph_args (ir_graph *graph, ir_node *call, pto_env_t *env) assert (pto); set_node_pto (args [i], pto); - DBGPRINT (1, (stdout, "set_graph_args(/*todo*/): arg [%i]: %s[%li] -> %s[%li] (%i)\n", + DBGPRINT (1, (stdout, "%s: arg [%i]: %s[%li] -> %s[%li] (%i)\n", + __FUNCTION__, i, OPNAME (call_arg), OPNUM (call_arg), OPNAME (args [i]), OPNUM (args [i]), @@ -138,7 +143,7 @@ static void set_graph_args (ir_graph *graph, ir_node *call, pto_env_t *env) /* Transfer the graph's result to the call */ static int set_graph_result (ir_graph *graph, ir_node *call) { - type *tp = get_entity_type (get_irg_entity (graph)); + ir_type *tp = get_entity_type (get_irg_entity (graph)); ir_node *end_block; pto_t *ret_pto, *call_pto; int change; @@ -162,16 +167,16 @@ static int set_graph_result (ir_graph *graph, ir_node *call) assert (call_pto); - DBGPRINT (0, (stdout, "set_graph_result(/*todo*/): before change args\n")); - DBGEXE (0, pto_print_pto (end_block)); - DBGEXE (0, pto_print_pto (call)); + DBGPRINT (1, (stdout, "%s: before change args\n", __FUNCTION__)); + DBGEXE (1, pto_print_pto (end_block)); + DBGEXE (1, pto_print_pto (call)); change = qset_insert_all (call_pto->values, ret_pto->values); if (change) { - DBGPRINT (0, (stdout, "set_graph_result(/*todo*/): after change args\n")); - DBGEXE (0, pto_print_pto (end_block)); - DBGEXE (0, pto_print_pto (call)); + DBGPRINT (1, (stdout, "%s: after change args\n", __FUNCTION__)); + DBGEXE (1, pto_print_pto (end_block)); + DBGEXE (1, pto_print_pto (call)); /* assert (0); */ } @@ -306,7 +311,7 @@ static pto_t *get_pto_ret (ir_node *ret, pto_env_t *env) assert (pto); - DBGPRINT (9, (stdout, "get_pto_ret(/*todo*/): ")); + DBGPRINT (9, (stdout, "%s: ", __FUNCTION__)); DBGEXE (9, pto_print_pto (ret)); return (pto); @@ -318,7 +323,8 @@ static pto_t *get_pto (ir_node *node, pto_env_t *env) { const opcode op = get_irn_opcode (node); - DBGPRINT (2, (stdout, "get_pto (%s[%li])\n", + DBGPRINT (2, (stdout, "%s (%s[%li])\n", + __FUNCTION__, OPNAME (node), OPNUM (node))); switch (op) { @@ -340,7 +346,8 @@ static pto_t *get_pto (ir_node *node, pto_env_t *env) } default: /* stopgap measure */ - fprintf (stderr, "get_pto(/*todo*/): not handled: node[%li].op = %s\n", + fprintf (stderr, "%s: not handled: node[%li].op = %s\n", + __FUNCTION__, get_irn_node_nr (node), get_op_name (get_irn_op (node))); assert (0 && "something not handled"); @@ -356,7 +363,8 @@ static void pto_load (ir_node *load, pto_env_t *pto_env) entity *ent; /* perform load */ - DBGPRINT (2, (stdout, "pto_load(/*todo*/) (%s[%li]): pto = 0x%08x\n", + DBGPRINT (2, (stdout, "%s (%s[%li]): pto = 0x%08x\n", + __FUNCTION__, OPNAME (load), OPNUM (load), (int) get_node_pto (load))); ptr = get_Load_ptr (load); @@ -372,7 +380,8 @@ static void pto_load (ir_node *load, pto_env_t *pto_env) assert (ptr_pto); - DBGPRINT (1, (stdout, "pto_load(/*todo*/) (%s[%li]): ptr = 0x%08x\n", + DBGPRINT (1, (stdout, "%s (%s[%li]): ptr = 0x%08x\n", + __FUNCTION__, OPNAME (ptr), OPNUM (ptr), (int) ptr_pto)); pto_env->change |= mod_load (load, ent, ptr_pto); @@ -386,7 +395,8 @@ static void pto_store (ir_node *store, pto_env_t *pto_env) pto_t *ptr_pto, *val_pto; /* perform store */ - DBGPRINT (2, (stdout, "pto_store(/*todo*/) (%s[%li]) (no pto)\n", + DBGPRINT (2, (stdout, "%s (%s[%li]) (no pto)\n", + __FUNCTION__, OPNAME (store), OPNUM (store))); ptr = get_Store_ptr (store); @@ -404,9 +414,11 @@ static void pto_store (ir_node *store, pto_env_t *pto_env) assert (ptr_pto); assert (val_pto); - DBGPRINT (2, (stdout, "pto_store(/*todo*/) (%s[%li]): ptr_pto = 0x%08x\n", + DBGPRINT (2, (stdout, "%s (%s[%li]): ptr_pto = 0x%08x\n", + __FUNCTION__, OPNAME (ptr), OPNUM (ptr), (int) ptr_pto)); - DBGPRINT (2, (stdout, "pto_store(/*todo*/) (%s[%li]): val_pto = 0x%08x\n", + DBGPRINT (2, (stdout, "%s (%s[%li]): val_pto = 0x%08x\n", + __FUNCTION__, OPNAME (val), OPNUM (val), (int) val_pto)); pto_env->change |= mod_store (store, ent, ptr_pto, val_pto); @@ -417,21 +429,21 @@ static void pto_method (ir_node *call, pto_env_t *pto_env) int i; callEd_info_t *callEd_info; - DBGPRINT (2, (stdout, "pto_method(/*todo*/):%i (%s[%li]): pto = 0x%08x\n", - __LINE__, OPNAME (call), OPNUM (call), + DBGPRINT (2, (stdout, "%s:%i (%s[%li]): pto = 0x%08x\n", + __FUNCTION__, __LINE__, OPNAME (call), OPNUM (call), (int) get_node_pto (call))); callEd_info = ecg_get_callEd_info (call); if (NULL == callEd_info) { - DBGPRINT (2, (stdout, "pto_method(/*todo*/):%i (%s[%li]), no graph\n", - __LINE__, OPNAME (call), OPNUM (call))); + DBGPRINT (2, (stdout, "%s:%i (%s[%li]), no graph\n", + __FUNCTION__, __LINE__, OPNAME (call), OPNUM (call))); } i = 0; while (NULL != callEd_info) { - DBGPRINT (2, (stdout, "pto_method(/*todo*/):%i (%s[%li]), graph %i\n", - __LINE__, OPNAME (call), OPNUM (call), i ++)); + DBGPRINT (2, (stdout, "%s:%i (%s[%li]), graph %i\n", + __FUNCTION__, __LINE__, OPNAME (call), OPNUM (call), i ++)); pto_call (callEd_info->callEd, call, pto_env); @@ -444,8 +456,8 @@ static void pto_node_node(ir_node *node, pto_env_t *pto_env) { opcode op = get_irn_opcode (node); - DBGPRINT (1, (stdout, "pto_node_node(/*todo*/) (%s[%li])\n", - OPNAME (node), OPNUM (node))); + DBGPRINT (1, (stdout, "%s (%s[%li])\n", + __FUNCTION__, OPNAME (node), OPNUM (node))); switch (op) { case (iro_Start): /* nothing */ break; @@ -595,14 +607,14 @@ static void pto_call (ir_graph *graph, ir_node *call, pto_env_t *pto_env) DBGEXE (1, pto_print_pto (get_irg_end_block (graph))); if (rec_change) { - DBGPRINT (0, (stdout, "%s: change args", __FUNCTION__)); + DBGPRINT (0, (stdout, "%s: change args\n", __FUNCTION__)); } rec_change |= set_graph_result (graph, call); if (rec_change) { - DBGPRINT (0, (stdout, "%s: return out:", __FUNCTION__)); - DBGEXE (0, pto_print_pto (get_irg_end_block (graph))); + DBGPRINT (1, (stdout, "%s: return out:", __FUNCTION__)); + DBGEXE (1, pto_print_pto (get_irg_end_block (graph))); } # if 0 @@ -628,7 +640,7 @@ static void pto_raise (ir_node *raise, pto_env_t *pto_env) static void pto_end_block (ir_node *end_block, pto_env_t *pto_env) { /* perform end block */ - type *tp = get_entity_type (get_irg_entity (get_irn_irg (end_block))); + ir_type *tp = get_entity_type (get_irg_entity (get_irn_irg (end_block))); pto_t *end_pto; int i, n_ins; @@ -638,7 +650,7 @@ static void pto_end_block (ir_node *end_block, pto_env_t *pto_env) tp = get_method_res_type (tp, 0); - if (mode_P != get_type_mode (tp)) { + if (! mode_is_reference(get_type_mode (tp))) { return; } @@ -673,7 +685,7 @@ void pto_graph (ir_graph *graph, int ctx_idx, pto_env_t *enc_env) pto_env_t *pto_env; /* Also exported, since we need it in 'pto.c' */ - pto_env = (pto_env_t*) xmalloc (sizeof (pto_env_t*)); + pto_env = xmalloc (sizeof (pto_env_t)); pto_env->enc_env = enc_env; pto_env->graph = graph; pto_env->ctx_idx = ctx_idx; @@ -698,7 +710,7 @@ void pto_graph (ir_graph *graph, int ctx_idx, pto_env_t *enc_env) run, get_type_name (get_entity_owner (get_irg_entity (graph))), get_entity_name (get_irg_entity (graph)))); - memset (pto_env, 0, sizeof(*pto_env)); + memset (pto_env, 0, sizeof (pto_env_t)); free (pto_env); /* HERE ("end"); */ } @@ -744,6 +756,22 @@ pto_t *get_alloc_pto (ir_node *alloc) /* $Log$ + Revision 1.18 2006/01/13 22:57:41 beck + renamed all types 'type' to 'ir_type' + used mode_is_reference instead of != mode_P test + + Revision 1.17 2005/02/25 16:48:21 liekweg + fix typo + + Revision 1.16 2005/01/27 15:51:19 liekweg + whitespace change + + Revision 1.15 2005/01/14 14:14:26 liekweg + fix gnu extension, fix fprintf's + + Revision 1.14 2005/01/14 13:37:26 liekweg + fix allocation (size); don't cast malloc + Revision 1.13 2005/01/10 17:26:34 liekweg fixup printfs, don't put environments on the stack