fixed be_Return gen

[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 b8bc38e..2224ae4 100644 (file)
--- a/ir/be/ia32/ia32_map_regs.c
+++ b/ir/be/ia32/ia32_map_regs.c
@@ -1,5 +1,7 @@
 /**
  * Register mapping for firm nodes. Stolen from bearch_firm :)
+ * Calculate requirements for register parameter.
+ * @author Christian Wuerdig
  * $Id$
  */
 #ifdef HAVE_CONFIG_H
@@ -115,10 +117,14 @@ void ia32_build_8bit_reg_map(pmap *reg_map) {
        pmap_insert(reg_map, &ia32_gp_regs[REG_EDX], "dl");
 }
 
-char *ia32_get_mapped_reg_name(pmap *reg_map, const arch_register_t *reg) {
+const char *ia32_get_mapped_reg_name(pmap *reg_map, const arch_register_t *reg) {
        pmap_entry *e = pmap_find(reg_map, (void *)reg);
 
-       assert(e && "missing map init?");
+       //assert(e && "missing map init?");
+       if (! e) {
+               printf("FIXME: ia32map_regs.c:122: returning fake register name for ia32 with 32 register\n");
+               return reg->name;
+       }
 
        return e->value;
 }
@@ -235,16 +241,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)
@@ -257,22 +254,13 @@ 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 (is_Proj(pred)) {
+       else if (get_irn_opcode(pred) == iro_Start) {
                return nr;
        }
-       else if (get_irn_opcode(pred) == iro_Start) {
+       else if (is_ia32_CopyB(pred) || is_ia32_CopyB_i(pred)) {
                return nr;
        }
 
 //     assert(0 && "unsupported Proj(X)");
-       return nr;
+       return 0;
 }