- various updates to sparc backend

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

diff --git a/ir/be/arm/bearch_arm.c b/ir/be/arm/bearch_arm.c
index 1143fd7..d4cf7a1 100644 (file)
--- a/ir/be/arm/bearch_arm.c
+++ b/ir/be/arm/bearch_arm.c
@@ -216,7 +216,7 @@ static void transform_Reload(ir_node *node)
        sched_add_after(sched_point, load);
        sched_remove(node);
 
-       proj = new_rd_Proj(dbgi, block, load, mode, pn_arm_Ldr_res);
+       proj = new_rd_Proj(dbgi, load, mode, pn_arm_Ldr_res);
 
        reg = arch_get_irn_register(node);
        arch_set_irn_register(proj, reg);
@@ -324,9 +324,9 @@ static ir_node *convert_dbl_to_int(ir_node *bl, ir_node *arg, ir_node *mem,
 
                conv = new_bd_arm_fpaDbl2GP(NULL, bl, arg, mem);
                /* move high/low */
-               *resL = new_r_Proj(bl, conv, mode_Is, pn_arm_fpaDbl2GP_low);
-               *resH = new_r_Proj(bl, conv, mode_Is, pn_arm_fpaDbl2GP_high);
-               mem   = new_r_Proj(bl, conv, mode_M,  pn_arm_fpaDbl2GP_M);
+               *resL = new_r_Proj(conv, mode_Is, pn_arm_fpaDbl2GP_low);
+               *resH = new_r_Proj(conv, mode_Is, pn_arm_fpaDbl2GP_high);
+               mem   = new_r_Proj(conv, mode_M,  pn_arm_fpaDbl2GP_M);
        }
        return mem;
 }
@@ -353,10 +353,6 @@ static ir_node *convert_sng_to_int(ir_node *bl, ir_node *arg)
                v = (v << 8) | get_tarval_sub_bits(tv, 1);
                v = (v << 8) | get_tarval_sub_bits(tv, 0);
                return new_Const_long(mode_Is, v);
-       } else if (is_Load(skip_Proj(arg))) {
-               ir_node *load;
-
-               load = skip_Proj(arg);
        }
        panic("Unimplemented convert_sng_to_int() case");
 }
@@ -520,8 +516,6 @@ static void *arm_cg_init(be_irg_t *birg)
        cg->birg         = birg;
        cg->int_tp       = int_tp;
        cg->have_fp_insn = 0;
-       cg->unknown_gp   = NULL;
-       cg->unknown_fpa  = NULL;
        cg->dump         = (birg->main_env->options->dump_flags & DUMP_BE) ? 1 : 0;
 
        FIRM_DBG_REGISTER(cg->mod, "firm.be.arm.cg");
@@ -763,7 +757,7 @@ static const arch_register_class_t *arm_get_reg_class(unsigned i)
  * @param mode The mode in question.
  * @return A register class which can hold values of the given mode.
  */
-const arch_register_class_t *arm_get_reg_class_for_mode(const ir_mode *mode)
+static const arch_register_class_t *arm_get_reg_class_for_mode(const ir_mode *mode)
 {
        if (mode_is_float(mode))
                return &arm_reg_classes[CLASS_arm_fpa];
@@ -855,9 +849,9 @@ static const arch_register_t *arm_abi_prologue(void *self, ir_node **mem, pmap *
        /* spill stuff */
        store = new_bd_arm_StoreStackM4Inc(NULL, block, sp, fp, ip, lr, pc, *mem);
 
-       sp = new_r_Proj(block, store, env->arch_env->sp->reg_class->mode, pn_arm_StoreStackM4Inc_ptr);
+       sp = new_r_Proj(store, env->arch_env->sp->reg_class->mode, pn_arm_StoreStackM4Inc_ptr);
        arch_set_irn_register(sp, env->arch_env->sp);
-       *mem = new_r_Proj(block, store, mode_M, pn_arm_StoreStackM4Inc_M);
+       *mem = new_r_Proj(store, mode_M, pn_arm_StoreStackM4Inc_M);
 
        /* frame pointer is ip-4 (because ip is our old sp value) */
        fp = new_bd_arm_Sub_imm(NULL, block, ip, 4, 0);
@@ -903,10 +897,10 @@ static void arm_abi_epilogue(void *self, ir_node *bl, ir_node **mem, pmap *reg_m
 
                load_node = new_bd_arm_LoadStackM3Epilogue(NULL, bl, curr_bp, *mem);
 
-               curr_bp = new_r_Proj(bl, load_node, env->arch_env->bp->reg_class->mode, pn_arm_LoadStackM3Epilogue_res0);
-               curr_sp = new_r_Proj(bl, load_node, env->arch_env->sp->reg_class->mode, pn_arm_LoadStackM3Epilogue_res1);
-               curr_pc = new_r_Proj(bl, load_node, mode_Iu, pn_arm_LoadStackM3Epilogue_res2);
-               *mem    = new_r_Proj(bl, load_node, mode_M, pn_arm_LoadStackM3Epilogue_M);
+               curr_bp = new_r_Proj(load_node, env->arch_env->bp->reg_class->mode, pn_arm_LoadStackM3Epilogue_res0);
+               curr_sp = new_r_Proj(load_node, env->arch_env->sp->reg_class->mode, pn_arm_LoadStackM3Epilogue_res1);
+               curr_pc = new_r_Proj(load_node, mode_Iu, pn_arm_LoadStackM3Epilogue_res2);
+               *mem    = new_r_Proj(load_node, mode_M, pn_arm_LoadStackM3Epilogue_M);
                arch_set_irn_register(curr_bp, env->arch_env->bp);
                arch_set_irn_register(curr_sp, env->arch_env->sp);
                arch_set_irn_register(curr_pc, &arm_gp_regs[REG_PC]);
@@ -932,7 +926,7 @@ static const be_abi_callbacks_t arm_abi_callbacks = {
  * @param method_type The type of the method (procedure) in question.
  * @param abi         The abi object to be modified
  */
-void arm_get_call_abi(const void *self, ir_type *method_type, be_abi_call_t *abi)
+static void arm_get_call_abi(const void *self, ir_type *method_type, be_abi_call_t *abi)
 {
        ir_type  *tp;
        ir_mode  *mode;
@@ -955,11 +949,11 @@ void arm_get_call_abi(const void *self, ir_type *method_type, be_abi_call_t *abi
                /* reg = get reg for param i;          */
                /* be_abi_call_param_reg(abi, i, reg); */
                if (i < 4) {
-                       be_abi_call_param_reg(abi, i, arm_get_RegParam_reg(i));
+                       be_abi_call_param_reg(abi, i, arm_get_RegParam_reg(i), ABI_CONTEXT_BOTH);
                } else {
                        tp   = get_method_param_type(method_type, i);
                        mode = get_type_mode(tp);
-                       be_abi_call_param_stack(abi, i, mode, 4, 0, 0);
+                       be_abi_call_param_stack(abi, i, mode, 4, 0, 0, ABI_CONTEXT_BOTH);
                }
        }
 
@@ -980,8 +974,8 @@ void arm_get_call_abi(const void *self, ir_type *method_type, be_abi_call_t *abi
 
                assert(!mode_is_float(mode) && "mixed INT, FP results not supported");
 
-               be_abi_call_res_reg(abi, 0, &arm_gp_regs[REG_R0]);
-               be_abi_call_res_reg(abi, 1, &arm_gp_regs[REG_R1]);
+               be_abi_call_res_reg(abi, 0, &arm_gp_regs[REG_R0], ABI_CONTEXT_BOTH);
+               be_abi_call_res_reg(abi, 1, &arm_gp_regs[REG_R1], ABI_CONTEXT_BOTH);
        } else if (n == 1) {
                const arch_register_t *reg;
 
@@ -990,14 +984,14 @@ void arm_get_call_abi(const void *self, ir_type *method_type, be_abi_call_t *abi
                mode = get_type_mode(tp);
 
                reg = mode_is_float(mode) ? &arm_fpa_regs[REG_F0] : &arm_gp_regs[REG_R0];
-               be_abi_call_res_reg(abi, 0, reg);
+               be_abi_call_res_reg(abi, 0, reg, ABI_CONTEXT_BOTH);
        }
 }
 
-int arm_to_appear_in_schedule(void *block_env, const ir_node *irn)
+static int arm_to_appear_in_schedule(void *block_env, const ir_node *irn)
 {
        (void) block_env;
-       if(!is_arm_irn(irn))
+       if (!is_arm_irn(irn))
                return -1;
 
        return 1;
@@ -1173,6 +1167,7 @@ const arch_isa_if_t arm_isa_if = {
        arm_is_valid_clobber
 };
 
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_arch_arm);
 void be_init_arch_arm(void)
 {
        lc_opt_entry_t *be_grp = lc_opt_get_grp(firm_opt_get_root(), "be");
@@ -1185,5 +1180,3 @@ void be_init_arch_arm(void)
        arm_init_transform();
        arm_init_emitter();
 }
-
-BE_REGISTER_MODULE_CONSTRUCTOR(be_init_arch_arm);