X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fscalar_replace.c;h=ad3c7316ddd96d7ccb7ede53090d220dc51d055a;hb=ce6161a7e42a48f7422b7babcc64d8ace18e2687;hp=6e1d182efbf5a76ba1421262bce1bf95d4643bc5;hpb=1d0bf58a87d778b354f84e2d105bcdaa2557507c;p=libfirm

diff --git a/ir/opt/scalar_replace.c b/ir/opt/scalar_replace.c
index 6e1d182ef..ad3c7316d 100644
--- a/ir/opt/scalar_replace.c
+++ b/ir/opt/scalar_replace.c
@@ -29,6 +29,7 @@
 
 #include "iroptimize.h"
 #include "scalar_replace.h"
+#include "opt_init.h"
 #include "irflag_t.h"
 #include "irouts.h"
 #include "set.h"
@@ -40,6 +41,7 @@
 #include "irgwalk.h"
 #include "irgmod.h"
 #include "irnode_t.h"
+#include "irpass.h"
 #include "irtools.h"
 #include "xmalloc.h"
 #include "debug.h"
@@ -55,14 +57,14 @@
  */
 typedef union {
 	ir_entity *ent;
-	tarval *tv;
+	ir_tarval *tv;
 } path_elem_t;
 
 /**
  * An access path, used to assign value numbers
  * to variables that will be scalar replaced.
  */
-typedef struct _path_t {
+typedef struct path_t {
 	unsigned    vnum;      /**< The value number. */
 	unsigned    path_len;  /**< The length of the access path. */
 	path_elem_t path[1];   /**< The path. */
@@ -71,9 +73,8 @@ typedef struct _path_t {
 /** The size of a path in bytes. */
 #define PATH_SIZE(p)  (sizeof(*(p)) + sizeof((p)->path[0]) * ((p)->path_len - 1))
 
-typedef struct _scalars_t {
+typedef struct scalars_t {
 	ir_entity *ent;              /**< A entity for scalar replacement. */
-	ir_type *ent_owner;          /**< The owner of this entity. */
 } scalars_t;
 
 DEBUG_ONLY(static firm_dbg_module_t *dbg;)
@@ -83,9 +84,10 @@ DEBUG_ONLY(static firm_dbg_module_t *dbg;)
  *
  * @return 0 if they are identically
  */
-static int path_cmp(const void *elt, const void *key, size_t size) {
-	const path_t *p1 = elt;
-	const path_t *p2 = key;
+static int path_cmp(const void *elt, const void *key, size_t size)
+{
+	const path_t *p1 = (const path_t*)elt;
+	const path_t *p2 = (const path_t*)key;
 	(void) size;
 
 	/* we can use memcmp here, because identical tarvals should have identical addresses */
@@ -97,9 +99,10 @@ static int path_cmp(const void *elt, const void *key, size_t size) {
  *
  * @return 0 if they are identically
  */
-static int ent_cmp(const void *elt, const void *key, size_t size) {
-	const scalars_t *c1 = elt;
-	const scalars_t *c2 = key;
+static int ent_cmp(const void *elt, const void *key, size_t size)
+{
+	const scalars_t *c1 = (const scalars_t*)elt;
+	const scalars_t *c2 = (const scalars_t*)key;
 	(void) size;
 
 	return c1->ent != c2->ent;
@@ -108,7 +111,8 @@ static int ent_cmp(const void *elt, const void *key, size_t size) {
 /**
  * Calculate a hash value for a path.
  */
-static unsigned path_hash(const path_t *path) {
+static unsigned path_hash(const path_t *path)
+{
 	unsigned hash = 0;
 	unsigned i;
 
@@ -123,7 +127,8 @@ static unsigned path_hash(const path_t *path) {
  *
  * @param sel  the Sel node that will be checked
  */
-static int is_const_sel(ir_node *sel) {
+static int is_const_sel(ir_node *sel)
+{
 	int i, n = get_Sel_n_indexs(sel);
 
 	for (i = 0; i < n; ++i) {
@@ -152,7 +157,8 @@ static int is_const_sel(ir_node *sel) {
  * @param mode     the mode of the Load/Store
  * @param ent_mode the mode of the accessed entity
  */
-static int check_load_store_mode(ir_mode *mode, ir_mode *ent_mode) {
+static int check_load_store_mode(ir_mode *mode, ir_mode *ent_mode)
+{
 	if (ent_mode != mode) {
 		if (ent_mode == NULL ||
 		    get_mode_size_bits(ent_mode) != get_mode_size_bits(mode) ||
@@ -274,7 +280,8 @@ int is_address_taken(ir_node *sel)
  * @param ent  the entity that will be scalar replaced
  * @param sel  a Sel node that selects some fields of this entity
  */
-static int link_all_leave_sels(ir_entity *ent, ir_node *sel) {
+static int link_all_leave_sels(ir_entity *ent, ir_node *sel)
+{
 	int i, is_leave = 1;
 
 	for (i = get_irn_n_outs(sel) - 1; i >= 0; --i) {
@@ -321,7 +328,8 @@ static void *ADDRESS_TAKEN = &_x;
  * @return  non-zero if at least one entity could be replaced
  *          potentially
  */
-static int find_possible_replacements(ir_graph *irg) {
+static int find_possible_replacements(ir_graph *irg)
+{
 	ir_node *irg_frame;
 	ir_type *frame_tp;
 	int     i, j, k, static_link_arg;
@@ -428,7 +436,8 @@ static int find_possible_replacements(ir_graph *irg) {
  * @param sel  the Sel node
  * @param len  the length of the path so far
  */
-static path_t *find_path(ir_node *sel, unsigned len) {
+static path_t *find_path(ir_node *sel, unsigned len)
+{
 	int pos, i, n;
 	path_t *res;
 	ir_node *pred = get_Sel_ptr(sel);
@@ -476,14 +485,15 @@ static unsigned allocate_value_numbers(pset *sels, ir_entity *ent, unsigned vnum
 
 	DB((dbg, SET_LEVEL_3, "  Visiting Sel nodes of entity %+F\n", ent));
 	/* visit all Sel nodes in the chain of the entity */
-	for (sel = get_entity_link(ent); sel; sel = next) {
-		next = get_irn_link(sel);
+	for (sel = (ir_node*)get_entity_link(ent); sel != NULL;
+	     sel = next) {
+		next = (ir_node*)get_irn_link(sel);
 
 		/* we must mark this sel for later */
 		pset_insert_ptr(sels, sel);
 
 		key  = find_path(sel, 0);
-		path = set_find(pathes, key, PATH_SIZE(key), path_hash(key));
+		path = (path_t*)set_find(pathes, key, PATH_SIZE(key), path_hash(key));
 
 		if (path) {
 			SET_VNUM(sel, path->vnum);
@@ -528,7 +538,7 @@ static unsigned allocate_value_numbers(pset *sels, ir_entity *ent, unsigned vnum
 /**
  * A list entry for the fixing lists
  */
-typedef struct _list_entry_t {
+typedef struct list_entry_t {
 	ir_node  *node;   /**< the node that must be fixed */
 	unsigned vnum;    /**< the value number of this node */
 } list_entry_t;
@@ -536,7 +546,7 @@ typedef struct _list_entry_t {
 /**
  * environment for memory walker
  */
-typedef struct _env_t {
+typedef struct env_t {
 	int          nvals;       /**< number of values */
 	ir_mode      **modes;     /**< the modes of the values */
 	pset         *sels;       /**< A set of all Sel nodes that have a value number */
@@ -545,11 +555,13 @@ typedef struct _env_t {
 /**
  * topological post-walker.
  */
-static void topologic_walker(ir_node *node, void *ctx) {
-	env_t        *env = ctx;
-	ir_node      *adr, *block, *mem, *val;
-	ir_mode      *mode;
-	unsigned     vnum;
+static void topologic_walker(ir_node *node, void *ctx)
+{
+	env_t    *env = (env_t*)ctx;
+	ir_graph *irg = get_irn_irg(node);
+	ir_node  *adr, *block, *mem, *val;
+	ir_mode  *mode;
+	unsigned vnum;
 
 	if (is_Load(node)) {
 		/* a load, check if we can resolve it */
@@ -587,14 +599,14 @@ static void topologic_walker(ir_node *node, void *ctx) {
 		Handle this here. */
 		mode = get_Load_mode(node);
 		if (mode != get_irn_mode(val))
-			val = new_d_Conv(get_irn_dbg_info(node), val, mode);
+			val = new_rd_Conv(get_irn_dbg_info(node), block, val, mode);
 
 		mem = get_Load_mem(node);
 		turn_into_tuple(node, pn_Load_max);
 		set_Tuple_pred(node, pn_Load_M,         mem);
 		set_Tuple_pred(node, pn_Load_res,       val);
-		set_Tuple_pred(node, pn_Load_X_regular, new_Jmp());
-		set_Tuple_pred(node, pn_Load_X_except,  new_Bad());
+		set_Tuple_pred(node, pn_Load_X_regular, new_r_Jmp(block));
+		set_Tuple_pred(node, pn_Load_X_except,  new_r_Bad(irg));
 	} else if (is_Store(node)) {
 		DB((dbg, SET_LEVEL_3, "  checking %+F for replacement ", node));
 
@@ -622,15 +634,15 @@ static void topologic_walker(ir_node *node, void *ctx) {
 		/* Beware: A Store can contain a hidden conversion in Firm. */
 		val = get_Store_value(node);
 		if (get_irn_mode(val) != env->modes[vnum])
-			val = new_d_Conv(get_irn_dbg_info(node), val, env->modes[vnum]);
+			val = new_rd_Conv(get_irn_dbg_info(node), block, val, env->modes[vnum]);
 
 		set_value(vnum, val);
 
 		mem = get_Store_mem(node);
 		turn_into_tuple(node, pn_Store_max);
 		set_Tuple_pred(node, pn_Store_M,         mem);
-		set_Tuple_pred(node, pn_Store_X_regular, new_Jmp());
-		set_Tuple_pred(node, pn_Store_X_except,  new_Bad());
+		set_Tuple_pred(node, pn_Store_X_regular, new_r_Jmp(block));
+		set_Tuple_pred(node, pn_Store_X_except,  new_r_Bad(irg));
 	}
 }
 
@@ -642,23 +654,25 @@ static void topologic_walker(ir_node *node, void *ctx) {
  * @param modes   A flexible array, containing all the modes of
  *                the value numbers.
  */
-static void do_scalar_replacements(pset *sels, int nvals, ir_mode **modes) {
+static void do_scalar_replacements(ir_graph *irg, pset *sels, int nvals,
+                                   ir_mode **modes)
+{
 	env_t env;
 
-	ssa_cons_start(current_ir_graph, nvals);
+	ssa_cons_start(irg, nvals);
 
-	env.nvals     = nvals;
-	env.modes     = modes;
-	env.sels      = sels;
+	env.nvals = nvals;
+	env.modes = modes;
+	env.sels  = sels;
 
 	/*
 	 * second step: walk over the graph blockwise in topological order
 	 * and fill the array as much as possible.
 	 */
-	DB((dbg, SET_LEVEL_3, "Substituting Loads and Stores in %+F\n", current_ir_graph));
-	irg_walk_blkwise_graph(current_ir_graph, NULL, topologic_walker, &env);
+	DB((dbg, SET_LEVEL_3, "Substituting Loads and Stores in %+F\n", irg));
+	irg_walk_blkwise_graph(irg, NULL, topologic_walker, &env);
 
-	ssa_cons_finish(current_ir_graph);
+	ssa_cons_finish(irg);
 }
 
 /*
@@ -666,7 +680,8 @@ static void do_scalar_replacements(pset *sels, int nvals, ir_mode **modes) {
  *
  * @param irg  The current ir graph.
  */
-int scalar_replacement_opt(ir_graph *irg) {
+int scalar_replacement_opt(ir_graph *irg)
+{
 	unsigned  nvals;
 	int       i;
 	scalars_t key, *value;
@@ -675,15 +690,8 @@ int scalar_replacement_opt(ir_graph *irg) {
 	set       *set_ent;
 	pset      *sels;
 	ir_type   *ent_type, *frame_tp;
-	ir_graph  *rem;
 	int       res = 0;
 
-	if (! get_opt_scalar_replacement())
-		return 0;
-
-	rem = current_ir_graph;
-	current_ir_graph = irg;
-
 	/* Call algorithm that computes the out edges */
 	assure_irg_outs(irg);
 
@@ -720,7 +728,6 @@ int scalar_replacement_opt(ir_graph *irg) {
 				ent_type = get_entity_type(ent);
 
 				key.ent       = ent;
-				key.ent_owner = get_entity_owner(ent);
 				set_insert(set_ent, &key, sizeof(key), HASH_PTR(key.ent));
 
 #ifdef DEBUG_libfirm
@@ -743,10 +750,10 @@ int scalar_replacement_opt(ir_graph *irg) {
 
 		/* If scalars were found. */
 		if (nvals > 0) {
-			do_scalar_replacements(sels, nvals, modes);
+			do_scalar_replacements(irg, sels, nvals, modes);
 
-			foreach_set(set_ent, value) {
-				remove_class_member(value->ent_owner, value->ent);
+			foreach_set(set_ent, scalars_t*, value) {
+				free_entity(value->ent);
 			}
 
 			/*
@@ -767,10 +774,16 @@ int scalar_replacement_opt(ir_graph *irg) {
 	ir_free_resources(irg, IR_RESOURCE_IRN_LINK);
 	irp_free_resources(irp, IR_RESOURCE_ENTITY_LINK);
 
-	current_ir_graph = rem;
 	return res;
 }
 
-void firm_init_scalar_replace(void) {
+ir_graph_pass_t *scalar_replacement_opt_pass(const char *name)
+{
+	return def_graph_pass_ret(name ? name : "scalar_rep",
+	                          scalar_replacement_opt);
+}
+
+void firm_init_scalar_replace(void)
+{
 	FIRM_DBG_REGISTER(dbg, "firm.opt.scalar_replace");
 }