bescripts: Copy all common node attributes into the constructor variants.

[libfirm] / ir / be / beabi.c

diff --git a/ir/be/beabi.c b/ir/be/beabi.c
index 832add9..2bf684a 100644 (file)
--- a/ir/be/beabi.c
+++ b/ir/be/beabi.c
@@ -34,7 +34,7 @@
 #include "iredges_t.h"
 #include "irgmod.h"
 #include "irgwalk.h"
-#include "irprintf_t.h"
+#include "irprintf.h"
 #include "irgopt.h"
 #include "iropt_t.h"
 #include "irtools.h"
@@ -47,6 +47,7 @@
 
 #include "be.h"
 #include "beabi.h"
+#include "beabihelper.h"
 #include "bearch.h"
 #include "benode.h"
 #include "belive_t.h"
@@ -489,11 +490,8 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp)
                                 * checking */
                                continue;
                        }
-                       if (arch_register_is_caller_save(arch_env, reg)) {
-                               if (!(reg->type & arch_register_type_ignore)) {
-                                       ARR_APP1(const arch_register_t*, destroyed_regs, reg);
-                               }
-                       }
+                       if (arch_register_is_caller_save(arch_env, reg))
+                               ARR_APP1(const arch_register_t*, destroyed_regs, reg);
                }
        }
 
@@ -1144,32 +1142,25 @@ static ir_type *compute_arg_type(ir_graph *irg, be_abi_call_t *call,
        return res;
 }
 
-typedef struct {
-       const arch_register_t *reg;
-       ir_node *irn;
-} reg_node_map_t;
-
 static int cmp_regs(const void *a, const void *b)
 {
-       const reg_node_map_t *p = (const reg_node_map_t*)a;
-       const reg_node_map_t *q = (const reg_node_map_t*)b;
+       arch_register_t const *const p = *(arch_register_t const**)a;
+       arch_register_t const *const q = *(arch_register_t const**)b;
 
-       if (p->reg->reg_class == q->reg->reg_class)
-               return p->reg->index - q->reg->index;
+       if (p->reg_class == q->reg_class)
+               return p->index - q->index;
        else
-               return p->reg->reg_class < q->reg->reg_class ? -1 : +1;
+               return p->reg_class < q->reg_class ? -1 : +1;
 }
 
-static void reg_map_to_arr(reg_node_map_t *res, pmap *reg_map)
+static void reg_map_to_arr(arch_register_t const **const res, pmap *const reg_map)
 {
        pmap_entry *ent;
        size_t n = pmap_count(reg_map);
        size_t i = 0;
 
        foreach_pmap(reg_map, ent) {
-               res[i].reg = (const arch_register_t*)ent->key;
-               res[i].irn = (ir_node*)ent->value;
-               i++;
+               res[i++] = (arch_register_t const*)ent->key;
        }
 
        qsort(res, n, sizeof(res[0]), cmp_regs);
@@ -1190,9 +1181,7 @@ static ir_node *create_be_return(be_abi_irg_t *const env, ir_node *const irn)
        pmap *reg_map  = pmap_create();
        ir_node *keep  = pmap_get(ir_node, env->keep_map, bl);
        size_t in_max;
-       ir_node *ret;
        int i, n;
-       unsigned pop;
        ir_node **in;
        ir_node *stack;
        const arch_register_t **regs;
@@ -1224,7 +1213,7 @@ static ir_node *create_be_return(be_abi_irg_t *const env, ir_node *const irn)
        /* Add uses of the callee save registers. */
        foreach_pmap(env->regs, ent) {
                const arch_register_t *reg = (const arch_register_t*)ent->key;
-               if ((reg->type & arch_register_type_ignore) || arch_register_is_callee_save(arch_env, reg))
+               if (arch_register_is_callee_save(arch_env, reg))
                        pmap_insert(reg_map, ent->key, ent->value);
        }
 
@@ -1267,9 +1256,7 @@ static ir_node *create_be_return(be_abi_irg_t *const env, ir_node *const irn)
 
        /* The in array for the new back end return is now ready. */
        dbg_info *const dbgi = get_irn_dbg_info(irn);
-       /* we have to pop the shadow parameter in in case of struct returns */
-       pop = call->pop;
-       ret = be_new_Return(dbgi, irg, bl, n_res, pop, n, in);
+       ir_node  *const ret  = be_new_Return(dbgi, irg, bl, n_res, call->pop, n, in);
 
        /* Set the register classes of the return's parameter accordingly. */
        for (i = 0; i < n; ++i) {
@@ -1364,7 +1351,6 @@ static void modify_irg(ir_graph *const irg, be_abi_irg_t *const env)
        int i, n;
        unsigned j;
 
-       reg_node_map_t *rm;
        const arch_register_t *fp_reg;
        ir_node *frame_pointer;
        ir_node *start_bl;
@@ -1466,10 +1452,10 @@ static void modify_irg(ir_graph *const irg, be_abi_irg_t *const env)
         * Note, that if a register corresponds to an argument, the regs map
         * contains the old Proj from start for that argument.
         */
-       rm = ALLOCAN(reg_node_map_t, pmap_count(env->regs));
-       reg_map_to_arr(rm, env->regs);
+       arch_register_t const **const regs = ALLOCAN(arch_register_t const*, pmap_count(env->regs));
+       reg_map_to_arr(regs, env->regs);
        for (i = 0, n = pmap_count(env->regs); i < n; ++i) {
-               const arch_register_t    *reg      = rm[i].reg;
+               const arch_register_t    *reg      = regs[i];
                ir_mode                  *mode     = reg->reg_class->mode;
                long                      nr       = i;
                arch_register_req_type_t  add_type = arch_register_req_type_none;