adapted to new abi calls

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

diff --git a/ir/be/firm/bearch_firm.c b/ir/be/firm/bearch_firm.c
index 98677ba..3d76436 100644 (file)
--- a/ir/be/firm/bearch_firm.c
+++ b/ir/be/firm/bearch_firm.c
@@ -21,6 +21,7 @@
 #include "irgwalk.h"
 #include "type.h"
 
+#include "../be_t.h"
 #include "../bearch.h"
 #include "../besched.h"
 #include "../beutil.h"
@@ -205,8 +206,16 @@ static const arch_register_class_t *firm_get_reg_class_for_mode(const void *self
 
 static void firm_get_call_abi(const void *self, ir_type *method_type, be_abi_call_t *abi)
 {
+       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);
+       }
+
 
        for(i = 0, n = get_method_n_params(method_type); i < n; ++i) {
                ir_type *t = get_method_param_type(method_type, i);
@@ -222,7 +231,7 @@ 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, BE_ABI_NONE);
+       be_abi_call_set_flags(abi, call_flags, between_type);
 }
 
 
@@ -328,12 +337,23 @@ static arch_irn_flags_t firm_get_flags(const void *self, const ir_node *irn)
        return res;
 }
 
+static void firm_set_stack_bias(const void *self, ir_node *irn, int bias)
+{
+}
+
+static entity *firm_get_frame_entity(const void *self, const ir_node *irn)
+{
+       return NULL;
+}
+
 static const arch_irn_ops_if_t firm_irn_ops_if = {
        firm_get_irn_reg_req,
        firm_set_irn_reg,
        firm_get_irn_reg,
        firm_classify,
-       firm_get_flags
+       firm_get_flags,
+       firm_get_frame_entity,
+       firm_set_stack_bias
 };
 
 static const arch_irn_ops_t firm_irn_ops = {
@@ -523,33 +543,26 @@ static void firm_before_ra(void *self)
        irg_walk_graph(cg->irg, imm_scheduler, NULL, NULL);
 }
 
-static const arch_register_t *firm_get_stack_register(void *self) {
-       return &datab_regs[0];
-}
-
 static void firm_codegen_done(void *self)
 {
        free(self);
 }
 
-static void *firm_cg_init(FILE *file_handle, ir_graph *irg, const arch_env_t *env);
+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,
        firm_prepare_graph,
        firm_before_sched,
        firm_before_ra,
-       NULL,  /* lower spill */
-       NULL,  /* lower reload */
-       firm_get_stack_register,
        firm_codegen_done
 };
 
-static void *firm_cg_init(FILE *file_handle, ir_graph *irg, const arch_env_t *env)
+static void *firm_cg_init(FILE *file_handle, const be_irg_t *birg)
 {
        firm_code_gen_t *cg = xmalloc(sizeof(*cg));
        cg->impl = &firm_code_gen_if;
-       cg->irg  = irg;
+       cg->irg  = birg->irg;
        return cg;
 }
 
@@ -563,10 +576,6 @@ static const list_sched_selector_t *firm_get_list_sched_selector(const void *sel
        return trivial_selector;
 }
 
-static long firm_handle_call_proj(const void *self, ir_node *proj, int is_keep) {
-       return get_Proj_proj(proj);
-}
-
 #ifdef WITH_LIBCORE
 static void firm_register_options(lc_opt_entry_t *ent)
 {
@@ -585,6 +594,5 @@ const arch_isa_if_t firm_isa = {
        firm_get_call_abi,
        firm_get_irn_handler,
        firm_get_code_generator_if,
-       firm_get_list_sched_selector,
-       firm_handle_call_proj
+       firm_get_list_sched_selector
 };