X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbessadestr.c;h=db7ddc7473a7a8488674c7e8368997545e485235;hb=01940748e783a49ba0f2a5edccd33346499401b3;hp=f19ae28c2fa8ab7ebdbc4c87d6d47147c370559c;hpb=df87ac575b8844b509cf576e9432f4eeadb0880a;p=libfirm

diff --git a/ir/be/bessadestr.c b/ir/be/bessadestr.c
index f19ae28c2..db7ddc747 100644
--- a/ir/be/bessadestr.c
+++ b/ir/be/bessadestr.c
@@ -24,9 +24,7 @@
  * @date        25.05.2005
  * @version     $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "debug.h"
 #include "set.h"
@@ -55,10 +53,6 @@ DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
 #define get_reg(irn)         arch_get_irn_register(irn)
 #define set_reg(irn, reg)    arch_set_irn_register(irn, reg)
 
-#define is_Perm(irn)            (arch_irn_class_is(arch_env, irn, perm))
-#define get_reg_cls(irn)        (arch_get_irn_reg_class(arch_env, irn, -1))
-#define is_curr_reg_class(irn)  (get_reg_cls(p) == chordal_env->cls)
-
 static void clear_link(ir_node *irn, void *data) {
 	(void) data;
 	set_irn_link(irn, NULL);
@@ -137,13 +131,15 @@ static void insert_all_perms_walker(ir_node *bl, void *data) {
 		 * register class by construction.
 		 */
 		for(phi = get_irn_link(bl); phi; phi = get_irn_link(phi)) {
-			ir_node     *arg  = get_irn_n(phi, i);
-			unsigned     hash = hash_irn(arg);
-			perm_proj_t  templ;
+			ir_node                   *arg = get_irn_n(phi, i);
+			const arch_register_req_t *req = arch_get_register_req_out(arg);
+			unsigned                   hash;
+			perm_proj_t                templ;
 
-			if (arch_irn_is(arg, ignore))
+			if (req->type & arch_register_req_type_ignore)
 				continue;
 
+			hash = hash_irn(arg);
 			templ.arg  = arg;
 			pp         = set_find(arg_set, &templ, sizeof(templ), hash);
 
@@ -238,26 +234,27 @@ static void	set_regs_or_place_dupls_walker(ir_node *bl, void *data) {
 
 	/* Consider all phis of this block */
 	for (phi = get_irn_link(bl); phi; phi = get_irn_link(phi)) {
-		int i, max;
-		ir_node *arg, *phi_block, *arg_block;
-		const arch_register_t *phi_reg, *arg_reg;
-		const arch_register_class_t *cls;
+		ir_node                     *phi_block = get_nodes_block(phi);
+		const arch_register_t       *phi_reg   = get_reg(phi);
+		const arch_register_class_t *cls       = phi_reg->reg_class;
+		int                          max;
+		int                          i;
 
 		assert(is_Phi(phi) && "Can only handle phi-destruction :)");
 
-		phi_block = get_nodes_block(phi);
-		phi_reg   = get_reg(phi);
-		cls       = arch_get_irn_reg_class(phi, -1);
-
 		/* process all arguments of the phi */
 		for (i = 0, max = get_irn_arity(phi); i < max; ++i) {
-			arg       = get_irn_n(phi, i);
-			arg_block = get_Block_cfgpred_block(phi_block, i);
-			arg_reg   = get_reg(arg);
+			ir_node                   *arg = get_irn_n(phi, i);
+			const arch_register_req_t *req = arch_get_register_req_out(arg);
+			const arch_register_t     *arg_reg;
+			ir_node                   *arg_block;
 
-			if (arch_irn_is(arg, ignore))
+			if (req->type & arch_register_req_type_ignore)
 				continue;
 
+			arg_block = get_Block_cfgpred_block(phi_block, i);
+			arg_reg   = get_reg(arg);
+
 			assert(arg_reg && "Register must be set while placing perms");
 
 			DBG((dbg, LEVEL_1, "  for %+F(%s) -- %+F(%s)\n", phi, phi_reg->name, arg, arg_reg->name));
@@ -429,9 +426,10 @@ static void ssa_destruction_check_walker(ir_node *bl, void *data) {
 		phi_reg = get_reg(phi);
 		/* iterate over all args of phi */
 		for (i = 0, max = get_irn_arity(phi); i < max; ++i) {
-			ir_node *arg = get_irn_n(phi, i);
+			ir_node                   *arg = get_irn_n(phi, i);
+			const arch_register_req_t *req = arch_get_register_req_out(arg);
 
-			if (arch_irn_is(arg, ignore))
+			if (req->type & arch_register_req_type_ignore)
 				continue;
 
 			arg_reg = get_reg(arg);