X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Fanalyze_irg_args.c;h=17b8c69bfdc6d765b3b0dd9aae07f2c8768717da;hb=ceb8c85dcec7d95e97093c5577f1e3d5a1a362d3;hp=586a1cf86b036d0b91899e0d3be06c8855009da1;hpb=050de43e17417e3293564bc75b0e6d8b6c4bb7b5;p=libfirm

diff --git a/ir/ana/analyze_irg_args.c b/ir/ana/analyze_irg_args.c
index 586a1cf86..17b8c69bf 100644
--- a/ir/ana/analyze_irg_args.c
+++ b/ir/ana/analyze_irg_args.c
@@ -23,27 +23,19 @@
  * @author     Beyhan Veliev
  * @version    $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
-#ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
+#include <stdlib.h>
 
 #include "irouts.h"
 #include "irnode_t.h"
 #include "irmode_t.h"
-#include "array.h"
+#include "array_t.h"
 #include "irprog.h"
 #include "entity_t.h"
-#include "xmalloc.h"
 
 #include "analyze_irg_args.h"
 
-static char v;
-static void *VISITED = &v;
-
 /**
  * Walk recursive the successors of a graph argument
  * with mode reference and mark if it will be read,
@@ -52,18 +44,19 @@ static void *VISITED = &v;
  * @param arg   The graph argument with mode reference,
  *             that must be checked.
  */
-static unsigned analyze_arg(ir_node *arg, unsigned bits) {
+static ptr_access_kind analyze_arg(ir_node *arg, ptr_access_kind bits)
+{
 	int i, p;
 	ir_node *succ;
 
 	/* We must visit a node once to avoid endless recursion.*/
-	set_irn_link(arg, VISITED);
+	mark_irn_visited(arg);
 
 	for (i = get_irn_n_outs(arg) - 1; i >= 0; --i) {
 		succ = get_irn_out(arg, i);
 
 		/* We was here.*/
-		if (get_irn_link(succ) == VISITED)
+		if (irn_visited(succ))
 			continue;
 
 		/* We should not walk over the memory edge.*/
@@ -181,7 +174,8 @@ static unsigned analyze_arg(ir_node *arg, unsigned bits) {
  *
  * @param irg   The ir graph to analyze.
  */
-static void analyze_ent_args(ir_entity *ent) {
+static void analyze_ent_args(ir_entity *ent)
+{
 	ir_graph *irg;
 	ir_node *irg_args, *arg;
 	ir_mode *arg_mode;
@@ -265,7 +259,8 @@ static void analyze_ent_args(ir_entity *ent) {
  *
  * @param irg   The ir graph to analyze.
  */
-void analyze_irg_args(ir_graph *irg) {
+void analyze_irg_args(ir_graph *irg)
+{
 	ir_entity *ent;
 
 	if (irg == get_const_code_irg())
@@ -283,13 +278,13 @@ void analyze_irg_args(ir_graph *irg) {
  * Compute for a method with pointer parameter(s)
  * if they will be read or written.
  */
-ptr_access_kind get_method_param_access(ir_entity *ent, int pos)
+ptr_access_kind get_method_param_access(ir_entity *ent, size_t pos)
 {
 #ifndef NDEBUG
 	ir_type *mtp = get_entity_type(ent);
 	int is_variadic = get_method_variadicity(mtp) == variadicity_variadic;
 
-	assert(0 <= pos && (is_variadic || pos < get_method_n_params(mtp)));
+	assert(is_variadic || pos < get_method_n_params(mtp));
 #endif
 
 	if (ent->attr.mtd_attr.param_access) {
@@ -322,19 +317,20 @@ enum args_weight {
  *
  * @param arg  The parameter them weight muss be computed.
  */
-static unsigned calc_method_param_weight(ir_node *arg) {
+static unsigned calc_method_param_weight(ir_node *arg)
+{
 	int      i, j, k;
 	ir_node  *succ, *op;
 	unsigned weight = null_weight;
 
 	/* We mark the nodes to avoid endless recursion */
-	set_irn_link(arg, VISITED);
+	mark_irn_visited(arg);
 
 	for (i = get_irn_n_outs(arg) - 1; i >= 0; i--) {
 		succ = get_irn_out(arg, i);
 
 		/* We was here.*/
-		if (get_irn_link(succ) == VISITED)
+		if (irn_visited(succ))
 			continue;
 
 		/* We should not walk over the memory edge.*/
@@ -425,7 +421,8 @@ static unsigned calc_method_param_weight(ir_node *arg) {
  *
  * @param ent  The entity of the ir_graph.
  */
-static void analyze_method_params_weight(ir_entity *ent) {
+static void analyze_method_params_weight(ir_entity *ent)
+{
 	ir_type  *mtp;
 	ir_graph *irg;
 	int      nparams, i, proj_nr;
@@ -460,12 +457,6 @@ static void analyze_method_params_weight(ir_entity *ent) {
 		proj_nr = get_Proj_proj(arg);
 		ent->attr.mtd_attr.param_weight[proj_nr] += calc_method_param_weight(arg);
 	}
-
-#if 0
-	printf("\n%s:\n", get_entity_name(ent));
-	for (i = nparams - 1; i >= 0; --i)
-		printf("The weight of argument %i is %f \n", i, ent->param_weight[i]);
-#endif
 }
 
 /*
@@ -481,7 +472,7 @@ static void analyze_method_params_weight(ir_entity *ent) {
  * @return the parameter weight or null_weight if pos is greater
  * than the number of arguments.
  */
-unsigned get_method_param_weight(ir_entity *ent, int pos)
+unsigned get_method_param_weight(ir_entity *ent, size_t pos)
 {
 	if (ent->attr.mtd_attr.param_weight) {
 		if (pos < ARR_LEN(ent->attr.mtd_attr.param_weight))
@@ -504,13 +495,18 @@ unsigned get_method_param_weight(ir_entity *ent, int pos)
  *
  * @param irg The ir graph to analyze.
  */
-void analyze_irg_args_weight(ir_graph *irg) {
-	ir_entity *ent;
+void analyze_irg_args_weight(ir_graph *irg)
+{
+	ir_entity *entity = get_irg_entity(irg);
+	if (entity == NULL)
+		return;
 
-	ent = get_irg_entity(irg);
-	if (ent == NULL)
+	assert(is_method_entity(entity));
+	if (entity->attr.mtd_attr.param_weight != NULL)
 		return;
 
-	if (! ent->attr.mtd_attr.param_weight)
-		analyze_method_params_weight(ent);
+	ir_reserve_resources(irg, IR_RESOURCE_IRN_VISITED);
+	inc_irg_visited(irg);
+	analyze_method_params_weight(entity);
+	ir_free_resources(irg, IR_RESOURCE_IRN_VISITED);
 }