adapted (some parts) to abi changes

[libfirm] / ir / be / firm / bearch_firm.c

diff --git a/ir/be/firm/bearch_firm.c b/ir/be/firm/bearch_firm.c
index 3d76436..3656585 100644 (file)
--- a/ir/be/firm/bearch_firm.c
+++ b/ir/be/firm/bearch_firm.c
@@ -204,18 +204,32 @@ static const arch_register_class_t *firm_get_reg_class_for_mode(const void *self
        return mode_is_datab(irm) ? &reg_classes[CLS_DATAB] : NULL;
 }
 
-static void firm_get_call_abi(const void *self, ir_type *method_type, be_abi_call_t *abi)
-{
+static ir_type *firm_abi_get_between_type(void *self) {
        static ir_type *between_type = NULL;
-       const arch_register_class_t *cls = &reg_classes[CLS_DATAB];
-       int i, n;
-       be_abi_call_flags_t call_flags = { 0, 0, 0, 0, 0 };
 
        if(!between_type) {
                between_type = new_type_class(new_id_from_str("firm_be_between"));
                set_type_size_bytes(between_type, 0);
        }
 
+       return between_type;
+}
+
+static const be_abi_callbacks_t firm_abi_callbacks = {
+       NULL,
+       NULL,
+       firm_abi_get_between_type,
+       NULL,
+       NULL,
+       NULL,
+};
+
+static void firm_get_call_abi(const void *self, ir_type *method_type, be_abi_call_t *abi)
+{
+       const arch_register_class_t *cls = &reg_classes[CLS_DATAB];
+       int i, n;
+       be_abi_call_flags_t flags = { { 0, 0, 0, 0, 0 } };
+
 
        for(i = 0, n = get_method_n_params(method_type); i < n; ++i) {
                ir_type *t = get_method_param_type(method_type, i);
@@ -231,7 +245,8 @@ static void firm_get_call_abi(const void *self, ir_type *method_type, be_abi_cal
                        be_abi_call_res_reg(abi, i, &cls->regs[i]);
        }
 
-       be_abi_call_set_flags(abi, call_flags, between_type);
+       flags.val = 0;
+       be_abi_call_set_flags(abi, flags, &firm_abi_callbacks);
 }
 
 
@@ -543,6 +558,10 @@ static void firm_before_ra(void *self)
        irg_walk_graph(cg->irg, imm_scheduler, NULL, NULL);
 }
 
+static void firm_after_ra(void *self)
+{
+}
+
 static void firm_codegen_done(void *self)
 {
        free(self);
@@ -552,9 +571,11 @@ static void *firm_cg_init(FILE *file_handle, const be_irg_t *birg);
 
 static const arch_code_generator_if_t firm_code_gen_if = {
        firm_cg_init,
+       NULL,
        firm_prepare_graph,
        firm_before_sched,
        firm_before_ra,
+       firm_after_ra,
        firm_codegen_done
 };