fixed addressmode bug

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

diff --git a/ir/be/arm/bearch_arm.c b/ir/be/arm/bearch_arm.c
index 189190c..64f0022 100644 (file)
--- a/ir/be/arm/bearch_arm.c
+++ b/ir/be/arm/bearch_arm.c
@@ -63,7 +63,7 @@ static const arch_register_req_t *arm_get_irn_reg_req(const void *self, arch_reg
        const arm_register_req_t *irn_req;
        long               node_pos = pos == -1 ? 0 : pos;
        ir_mode           *mode     = get_irn_mode(irn);
-       firm_dbg_module_t *mod      = firm_dbg_register(DEBUG_MODULE);
+       FIRM_DBG_REGISTER(firm_dbg_module_t *mod, DEBUG_MODULE);
 
        if (is_Block(irn) || mode == mode_X || mode == mode_M) {
                DBG((mod, LEVEL_1, "ignoring mode_T, mode_M node %+F\n", irn));
@@ -479,11 +479,11 @@ static void *arm_cg_init(FILE *F, const be_irg_t *birg) {
        cg->impl     = &arm_code_gen_if;
        cg->irg      = birg->irg;
        cg->reg_set  = new_set(arm_cmp_irn_reg_assoc, 1024);
-       cg->mod      = firm_dbg_register("firm.be.arm.cg");
        cg->out      = F;
        cg->arch_env = birg->main_env->arch_env;
        cg->birg     = birg;
        cg->int_tp   = int_tp;
+       FIRM_DBG_REGISTER(cg->mod, "firm.be.arm.cg");
 
        isa->num_codegens++;
 
@@ -535,7 +535,7 @@ void arm_global_init(void) {
 
     map_Div->kind     = INTRINSIC_INSTR;
     map_Div->op       = op_Div;
-    map_Div->i_mapper = i_mapper_RuntimeCall;
+    map_Div->i_mapper = (i_mapper_func)i_mapper_RuntimeCall;
     map_Div->ctx      = &rt_Div;
   }
   {
@@ -558,7 +558,7 @@ void arm_global_init(void) {
 
     map_Div->kind     = INTRINSIC_INSTR;
     map_Div->op       = op_Div;
-    map_Div->i_mapper = i_mapper_RuntimeCall;
+    map_Div->i_mapper = (i_mapper_func)i_mapper_RuntimeCall;
     map_Div->ctx      = &rt_Div;
   }
   {
@@ -581,7 +581,7 @@ void arm_global_init(void) {
 
     map_Mod->kind     = INTRINSIC_INSTR;
     map_Mod->op       = op_Mod;
-    map_Mod->i_mapper = i_mapper_RuntimeCall;
+    map_Mod->i_mapper = (i_mapper_func)i_mapper_RuntimeCall;
     map_Mod->ctx      = &rt_Mod;
   }
   {
@@ -604,7 +604,7 @@ void arm_global_init(void) {
 
     map_Mod->kind     = INTRINSIC_INSTR;
     map_Mod->op       = op_Mod;
-    map_Mod->i_mapper = i_mapper_RuntimeCall;
+    map_Mod->i_mapper = (i_mapper_func)i_mapper_RuntimeCall;
     map_Mod->ctx      = &rt_Mod;
   }
 
@@ -887,13 +887,14 @@ 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);
-//     const arch_register_t *reg;
        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, /* 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 */
+               }
        };
 
        /* set stack parameter passing style */
@@ -954,6 +955,14 @@ static const list_sched_selector_t *arm_get_list_sched_selector(const void *self
        return &arm_sched_selector;
 }
 
+/**
+ * Returns the necessary byte alignment for storing a register of given class.
+ */
+static int arm_get_reg_class_alignment(const void *self, const arch_register_class_t *cls) {
+       ir_mode *mode = arch_register_class_mode(cls);
+       return get_mode_size_bytes(mode);
+}
+
 #ifdef WITH_LIBCORE
 static void arm_register_options(lc_opt_entry_t *ent)
 {
@@ -973,4 +982,5 @@ const arch_isa_if_t arm_isa_if = {
        arm_get_irn_handler,
        arm_get_code_generator_if,
        arm_get_list_sched_selector,
+       arm_get_reg_class_alignment
 };