lower_mode_b: refactoring, make it more robust

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

diff --git a/ir/be/arm/arm_transform.c b/ir/be/arm/arm_transform.c
index 36e7da7..4c8f7b4 100644 (file)
--- a/ir/be/arm/arm_transform.c
+++ b/ir/be/arm/arm_transform.c
@@ -62,6 +62,7 @@ static const arch_register_t *sp_reg = &arm_registers[REG_SP];
 static ir_mode               *mode_gp;
 static ir_mode               *mode_fp;
 static beabi_helper_env_t    *abihelper;
+static be_stackorder_t       *stackorder;
 static calling_convention_t  *cconv = NULL;
 static arm_isa_t             *isa;
 
@@ -737,9 +738,13 @@ static ir_node *make_shift(ir_node *node, match_flags_t flags,
        ir_node  *op1   = get_binop_left(node);
        ir_node  *op2   = get_binop_right(node);
        dbg_info *dbgi  = get_irn_dbg_info(node);
+       ir_mode  *mode  = get_irn_mode(node);
        ir_node  *new_op1;
        ir_node  *new_op2;
 
+       if (get_mode_modulo_shift(mode) != 32)
+               panic("modulo shift!=32 not supported by arm backend");
+
        if (flags & MATCH_SIZE_NEUTRAL) {
                op1 = arm_skip_downconv(op1);
                op2 = arm_skip_downconv(op2);
@@ -1277,8 +1282,8 @@ static ir_node *gen_CopyB(ir_node *node)
        ir_node  *src_copy;
        ir_node  *dst_copy;
 
-       src_copy = be_new_Copy(&arm_reg_classes[CLASS_arm_gp], block, new_src);
-       dst_copy = be_new_Copy(&arm_reg_classes[CLASS_arm_gp], block, new_dst);
+       src_copy = be_new_Copy(block, new_src);
+       dst_copy = be_new_Copy(block, new_dst);
 
        return new_bd_arm_CopyB(dbg, block, dst_copy, src_copy,
                        new_bd_arm_EmptyReg(dbg, block),
@@ -1538,11 +1543,11 @@ static ir_node *gen_Proj_Proj_Start(ir_node *node)
  */
 static int find_out_for_reg(ir_node *node, const arch_register_t *reg)
 {
-       int n_outs = arch_irn_get_n_outs(node);
+       int n_outs = arch_get_irn_n_outs(node);
        int o;
 
        for (o = 0; o < n_outs; ++o) {
-               const arch_register_req_t *req = arch_get_out_register_req(node, o);
+               const arch_register_req_t *req = arch_get_irn_register_req_out(node, o);
                if (req == reg->single_req)
                        return o;
        }
@@ -1776,7 +1781,7 @@ static ir_node *gen_Start(ir_node *node)
 static ir_node *get_stack_pointer_for(ir_node *node)
 {
        /* get predecessor in stack_order list */
-       ir_node *stack_pred = be_get_stack_pred(abihelper, node);
+       ir_node *stack_pred = be_get_stack_pred(stackorder, node);
        ir_node *stack;
 
        if (stack_pred == NULL) {
@@ -2006,13 +2011,13 @@ static ir_node *gen_Call(ir_node *node)
                pmap_insert(node_to_stack, node, incsp);
        }
 
-       arch_set_in_register_reqs(res, in_req);
+       arch_set_irn_register_reqs_in(res, in_req);
 
        /* create output register reqs */
-       arch_set_out_register_req(res, 0, arch_no_register_req);
+       arch_set_irn_register_req_out(res, 0, arch_no_register_req);
        for (o = 0; o < n_caller_saves; ++o) {
                const arch_register_t *reg = caller_saves[o];
-               arch_set_out_register_req(res, o+1, reg->single_req);
+               arch_set_irn_register_req_out(res, o+1, reg->single_req);
        }
 
        /* copy pinned attribute */
@@ -2034,10 +2039,6 @@ static ir_node *gen_Sel(ir_node *node)
        /* must be the frame pointer all other sels must have been lowered
         * already */
        assert(is_Proj(ptr) && is_Start(get_Proj_pred(ptr)));
-       /* we should not have value types from parameters anymore - they should be
-          lowered */
-       assert(get_entity_owner(entity) !=
-                       get_method_value_param_type(get_entity_type(get_irg_entity(get_irn_irg(node)))));
 
        return new_bd_arm_FrameAddr(dbgi, new_block, new_ptr, entity, 0);
 }
@@ -2071,7 +2072,7 @@ static ir_node *gen_Phi(ir_node *node)
        copy_node_attr(irg, node, phi);
        be_duplicate_deps(node, phi);
 
-       arch_set_out_register_req(phi, 0, req);
+       arch_set_irn_register_req_out(phi, 0, req);
 
        be_enqueue_preds(node);
 
@@ -2177,7 +2178,7 @@ void arm_transform_graph(ir_graph *irg)
 
        assert(abihelper == NULL);
        abihelper = be_abihelper_prepare(irg);
-       be_collect_stacknodes(abihelper);
+       stackorder = be_collect_stacknodes(irg);
        assert(cconv == NULL);
        cconv = arm_decide_calling_convention(irg, get_entity_type(entity));
        create_stacklayout(irg);
@@ -2186,6 +2187,8 @@ void arm_transform_graph(ir_graph *irg)
 
        be_abihelper_finish(abihelper);
        abihelper = NULL;
+       be_free_stackorder(stackorder);
+       stackorder = NULL;
 
        arm_free_calling_convention(cconv);
        cconv = NULL;