- Added 2 new blockschedulers, a greedy algorithm and an "optimal" ILP that

[libfirm] / ir / be / ia32 / ia32_map_regs.c

diff --git a/ir/be/ia32/ia32_map_regs.c b/ir/be/ia32/ia32_map_regs.c
index c9bb092..4468222 100644 (file)
--- a/ir/be/ia32/ia32_map_regs.c
+++ b/ir/be/ia32/ia32_map_regs.c
@@ -15,6 +15,7 @@
 #include "ia32_map_regs.h"
 #include "ia32_new_nodes.h"
 #include "gen_ia32_regalloc_if.h"
+#include "../benodesets.h"
 
 static int maxnum_gpreg_args = 3;   /* maximum number of int arguments passed in registers; default 3 */
 static int maxnum_fpreg_args = 5;   /* maximum number of float arguments passed in registers; default 5 */
@@ -84,7 +85,7 @@ static struct ia32_irn_reg_assoc *get_irn_reg_assoc(const ir_node *irn, set *reg
 
        templ.irn = irn;
        templ.reg = NULL;
-       hash = HASH_PTR(irn);
+       hash = nodeset_hash(irn);
 
        return set_insert(reg_set, &templ, sizeof(templ), hash);
 }
@@ -241,16 +242,7 @@ long ia32_translate_proj_pos(const ir_node *proj) {
                        return 0;
                assert(0 && "unsupported Proj(Load) number");
        }
-       else if (is_ia32_St(pred)) {
-               return 0;
-       }
-       else if (is_ia32_CondJmp(pred)) {
-               return 0;
-       }
-       else if (is_ia32_SwitchJmp(pred)) {
-               return 0;
-       }
-       else if (is_ia32_Cdq(pred) || is_ia32_Mulh(pred)) {
+       else if (is_ia32_Cdq(pred) || is_ia32_MulS(pred) || is_ia32_Mulh(pred)) {
                if (nr == pn_EAX)
                        return 0;
                if (nr == pn_EDX)
@@ -263,22 +255,16 @@ long ia32_translate_proj_pos(const ir_node *proj) {
                        return 1;
                assert(0 && "unsupported DivMod");
        }
-       else if (is_ia32_xDiv(pred)) {
-               if (nr == pn_Quot_res)
-                       return 0;
-               else
-                       assert(0 && "there should be no more Projs for a xDiv");
-       }
-       else if (get_irn_mode(proj) == mode_X && nr == pn_Start_X_initial_exec) {
-               return 0;
+       else if (get_irn_opcode(pred) == iro_Start) {
+               return nr;
        }
-       else if (is_Proj(pred)) {
+       else if (is_ia32_CopyB(pred) || is_ia32_CopyB_i(pred)) {
                return nr;
        }
-       else if (get_irn_opcode(pred) == iro_Start) {
+       else if (is_ia32_Leave(pred)) {
                return nr;
        }
 
 //     assert(0 && "unsupported Proj(X)");
-       return nr;
+       return 0;
 }