shouldn't be here anymore

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

diff --git a/ir/be/arm/bearch_arm.c b/ir/be/arm/bearch_arm.c
index a5c05b8..3501895 100644 (file)
--- a/ir/be/arm/bearch_arm.c
+++ b/ir/be/arm/bearch_arm.c
@@ -947,8 +947,7 @@ static const arch_register_t *arm_abi_prologue(void *self, ir_node **mem, pmap *
        arch_set_irn_register(env->arch_env, keep, &arm_gp_regs[REG_R12]);
        be_set_constr_single_reg(keep, BE_OUT_POS(0), &arm_gp_regs[REG_R12] );
 
-       fp = new_rd_arm_Sub_i(NULL, irg, block, keep, get_irn_mode(fp),
-                             new_tarval_from_long(4, get_irn_mode(fp)));
+       fp = new_rd_arm_Sub_i(NULL, irg, block, keep, get_irn_mode(fp), 4);
        arch_set_irn_register(env->arch_env, fp, env->isa->bp);
 
        be_abi_reg_map_set(reg_map, env->isa->bp, fp);
@@ -987,8 +986,7 @@ static void arm_abi_epilogue(void *self, ir_node *bl, ir_node **mem, pmap *reg_m
        } else {
                ir_node *sub12_node;
                ir_node *load_node;
-               tarval *tv = new_tarval_from_long(12,mode_Iu);
-               sub12_node = new_rd_arm_Sub_i(NULL, env->irg, bl, curr_bp, mode_Iu, tv);
+               sub12_node = new_rd_arm_Sub_i(NULL, env->irg, bl, curr_bp, mode_Iu, 12);
                // FIXME
                //set_arm_req_out_all(sub12_node, sub12_req);
                arch_set_irn_register(env->arch_env, sub12_node, env->isa->sp);
@@ -1032,21 +1030,18 @@ void arm_get_call_abi(const void *self, ir_type *method_type, be_abi_call_t *abi
        ir_mode  *mode;
        int       i;
        int       n = get_method_n_params(method_type);
-       be_abi_call_flags_t flags = {
-               {
-                       0, /* store from left to right */
-                       0, /* store arguments sequential */
-                       1, /* try to omit the frame pointer */
-                       1, /* the function can use any register as frame pointer */
-                       1, /* a call can take the callee's address as an immediate */
-                       0, /* IRG is a leaf function */
-                       0  /* Set to one, if there is already enough room on the stack for call args. */
-               }
-       };
+       be_abi_call_flags_t call_flags = be_abi_call_get_flags(abi);
        (void) self;
 
+       /* set abi flags for calls */
+       call_flags.bits.left_to_right         = 0;
+       call_flags.bits.store_args_sequential = 0;
+       /* call_flags.bits.try_omit_fp     don't change this we can handle both */
+       call_flags.bits.fp_free               = 0;
+       call_flags.bits.call_has_imm          = 1;  /* IA32 calls can have immediate address */
+
        /* set stack parameter passing style */
-       be_abi_call_set_flags(abi, flags, &arm_abi_callbacks);
+       be_abi_call_set_flags(abi, call_flags, &arm_abi_callbacks);
 
        for (i = 0; i < n; i++) {
                /* reg = get reg for param i;          */