share common phi code, fix missing phi input reqs

[libfirm] / ir / be / arm / arm_map_regs.c

diff --git a/ir/be/arm/arm_map_regs.c b/ir/be/arm/arm_map_regs.c
index be81948..5a2f1ea 100644 (file)
--- a/ir/be/arm/arm_map_regs.c
+++ b/ir/be/arm/arm_map_regs.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -21,11 +21,8 @@
  * @file
  * @brief   Register mapping for firm nodes. Stolen from bearch_firm :)
  * @author  Oliver Richter, Tobias Gneist
- * @version $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdlib.h>
 
@@ -36,93 +33,54 @@
 
 
 static const arch_register_t *gpreg_param_reg_std[] = {
-       &arm_gp_regs[REG_R0],
-       &arm_gp_regs[REG_R1],
-       &arm_gp_regs[REG_R2],
-       &arm_gp_regs[REG_R3],
+       &arm_registers[REG_R0],
+       &arm_registers[REG_R1],
+       &arm_registers[REG_R2],
+       &arm_registers[REG_R3],
 };
 
-const arch_register_t *arm_get_RegParam_reg(int n) {
+const arch_register_t *arm_get_RegParam_reg(int n)
+{
        assert(n < 4 && n >=0 && "register param > 3 angefordert");
        return gpreg_param_reg_std[n];
 }
 
 /* Mapping to store registers in firm nodes */
 
-struct arm_irn_reg_assoc {
+typedef struct arm_irn_reg_assoc {
        const ir_node *irn;
        const arch_register_t *reg;
-};
+} arm_irn_reg_assoc;
 
-int arm_cmp_irn_reg_assoc(const void *a, const void *b, size_t len) {
-       const struct arm_irn_reg_assoc *x = a;
-       const struct arm_irn_reg_assoc *y = b;
+int arm_cmp_irn_reg_assoc(const void *a, const void *b, size_t size)
+{
+       const arm_irn_reg_assoc *x = (const arm_irn_reg_assoc*)a;
+       const arm_irn_reg_assoc *y = (const arm_irn_reg_assoc*)b;
+       (void) size;
 
        return x->irn != y->irn;
 }
 
-static struct arm_irn_reg_assoc *get_irn_reg_assoc(const ir_node *irn, set *reg_set) {
-       struct arm_irn_reg_assoc templ;
+static arm_irn_reg_assoc *get_irn_reg_assoc(const ir_node *irn, set *reg_set)
+{
+       arm_irn_reg_assoc templ;
        unsigned int hash;
 
        templ.irn = irn;
        templ.reg = NULL;
-       hash = HASH_PTR(irn);
+       hash = hash_ptr(irn);
 
-       return set_insert(reg_set, &templ, sizeof(templ), hash);
+       return set_insert(arm_irn_reg_assoc, reg_set, &templ, sizeof(templ), hash);
 }
 
-void arm_set_firm_reg(ir_node *irn, const arch_register_t *reg, set *reg_set) {
-       struct arm_irn_reg_assoc *assoc = get_irn_reg_assoc(irn, reg_set);
+void arm_set_firm_reg(ir_node *irn, const arch_register_t *reg, set *reg_set)
+{
+       arm_irn_reg_assoc *assoc = get_irn_reg_assoc(irn, reg_set);
        assoc->reg = reg;
 }
 
-const arch_register_t *arm_get_firm_reg(const ir_node *irn, set *reg_set) {
-       struct arm_irn_reg_assoc *assoc = get_irn_reg_assoc(irn, reg_set);
+const arch_register_t *arm_get_firm_reg(const ir_node *irn, set *reg_set)
+{
+       const arm_irn_reg_assoc *assoc = get_irn_reg_assoc(irn, reg_set);
        return assoc->reg;
 }
-
-
-
-/**
- * Translates the proj number into a "real" argument position for register
- * requirements depended on the predecessor.
- */
-long arm_translate_proj_pos(const ir_node *proj) {
-       ir_node *pred = get_Proj_pred(proj);
-       long nr       = get_Proj_proj(proj);
-
-       if (is_irn_machine_op(pred)) {
-               switch (get_arm_irn_opcode(pred)) {
-
-               case iro_arm_Loadb:
-               case iro_arm_Loadbs:
-               case iro_arm_Loadh:
-               case iro_arm_Loadhs:
-               case iro_arm_Load:
-               case iro_arm_fpaLdf:
-                       if (nr == pn_Load_res)
-                               return 0;
-                       assert(0 && "unsupported Proj(Load) number");
-                       break;
-               case iro_arm_Storeb:
-               case iro_arm_Storebs:
-               case iro_arm_Storeh:
-               case iro_arm_Storehs:
-               case iro_arm_Store:
-               case iro_arm_fpaStf:
-                       return 0;
-               case iro_arm_fpaDiv:
-               case iro_arm_fpaRdv:
-                       if (nr == pn_Quot_res)
-                               return 0;
-                       assert(0 && "there should be no more Projs for a fDiv");
-                       break;
-               default:
-                       break;
-               }
-       }
-
-//     assert(0 && "unsupported Proj(X)");
-       return nr;
-}