- Split bearch.h correctly into bearch.h and bearch_t.h

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

diff --git a/ir/be/firm/bearch_firm.c b/ir/be/firm/bearch_firm.c
index a61efbf..a808ad8 100644 (file)
--- a/ir/be/firm/bearch_firm.c
+++ b/ir/be/firm/bearch_firm.c
@@ -1,4 +1,3 @@
-
 /**
  * ISA implementation for Firm IR nodes.
  */
@@ -6,10 +5,6 @@
 #include "config.h"
 #endif
 
-#ifdef WITH_LIBCORE
-#include <libcore/lc_opts.h>
-#endif
-
 #include "bitset.h"
 #include "obst.h"
 
@@ -23,7 +18,7 @@
 #include "irtools.h"
 
 #include "../be_t.h"
-#include "../bearch.h"
+#include "../bearch_t.h"
 #include "../besched.h"
 #include "../beutil.h"
 #include "../beabi.h"
@@ -254,20 +249,17 @@ static void firm_get_call_abi(const void *self, ir_type *method_type, be_abi_cal
 static const arch_register_req_t firm_std_reg_req = {
   arch_register_req_type_normal,
   &reg_classes[CLS_DATAB],
-  NULL,
-  NULL
+  0,
+  0
 };
 
 static const arch_register_req_t *
-firm_get_irn_reg_req(const void *self,
-    arch_register_req_t *req, const ir_node *irn, int pos)
+firm_get_irn_reg_req(const void *self, const ir_node *irn, int pos)
 {
   if(is_firm_be_mode(get_irn_mode(irn)))
-    memcpy(req, &firm_std_reg_req, sizeof(*req));
-  else
-    req = NULL;
+         return &firm_std_reg_req;
 
-  return req;
+  return NULL;
 }
 
 struct irn_reg_assoc {
@@ -357,11 +349,15 @@ 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)
+static ir_entity *firm_get_frame_entity(const void *self, const ir_node *irn)
 {
        return NULL;
 }
 
+static void firm_set_frame_entity(const void *self, ir_node *irn, ir_entity *ent)
+{
+}
+
 static const arch_irn_ops_if_t firm_irn_ops_if = {
        firm_get_irn_reg_req,
        firm_set_irn_reg,
@@ -369,7 +365,12 @@ static const arch_irn_ops_if_t firm_irn_ops_if = {
        firm_classify,
        firm_get_flags,
        firm_get_frame_entity,
-       firm_set_stack_bias
+       firm_set_frame_entity,
+       firm_set_stack_bias,
+       NULL,    /* get_inverse             */
+       NULL,    /* get_op_estimated_cost   */
+       NULL,    /* possible_memory_operand */
+       NULL,    /* perform_memory_operand  */
 };
 
 static const arch_irn_ops_t firm_irn_ops = {
@@ -425,7 +426,7 @@ static ir_node *new_Imm(ir_graph *irg, ir_node *bl, ir_node *cnst) {
 
 static void prepare_walker(ir_node *irn, void *data)
 {
-       opcode opc = get_irn_opcode(irn);
+       ir_opcode opc = get_irn_opcode(irn);
 
        /* A replacement for this node has already been computed. */
        if(get_irn_link(irn))
@@ -482,8 +483,8 @@ static void localize_const_walker(ir_node *irn, void *data)
                ir_node *bl = get_nodes_block(irn);
 
                for(i = 0, n = get_irn_arity(irn); i < n; ++i) {
-                       ir_node *op    = get_irn_n(irn, i);
-                       opcode opc     = get_irn_opcode(op);
+                       ir_node *op   = get_irn_n(irn, i);
+                       ir_opcode opc = get_irn_opcode(op);
 
                        if(opc == iro_Const
                        || opc == iro_Unknown
@@ -563,23 +564,24 @@ static void firm_codegen_done(void *self)
        free(self);
 }
 
-static void *firm_cg_init(const be_irg_t *birg);
+static void *firm_cg_init(be_irg_t *birg);
 
 static const arch_code_generator_if_t firm_code_gen_if = {
        firm_cg_init,
        NULL,
        firm_prepare_graph,
+       NULL,                /* spill */
        firm_before_sched,
        firm_before_ra,
        firm_after_ra,
        firm_codegen_done
 };
 
-static void *firm_cg_init(const be_irg_t *birg)
+static void *firm_cg_init(be_irg_t *birg)
 {
        firm_code_gen_t *cg = xmalloc(sizeof(*cg));
        cg->impl = &firm_code_gen_if;
-       cg->irg  = birg->irg;
+       cg->irg  = be_get_birg_irg(birg);
        return cg;
 }
 
@@ -589,10 +591,14 @@ static const arch_code_generator_if_t *firm_get_code_generator_if(void *self)
        return &firm_code_gen_if;
 }
 
-static const list_sched_selector_t *firm_get_list_sched_selector(const void *self) {
+static const list_sched_selector_t *firm_get_list_sched_selector(const void *self, list_sched_selector_t *selector) {
        return trivial_selector;
 }
 
+static const ilp_sched_selector_t *firm_get_ilp_sched_selector(const void *self) {
+       return NULL;
+}
+
 /**
  * Returns the necessary byte alignment for storing a register of given class.
  */
@@ -601,6 +607,25 @@ static int firm_get_reg_class_alignment(const void *self, const arch_register_cl
        return get_mode_size_bytes(mode);
 }
 
+static const be_execution_unit_t ***firm_get_allowed_execution_units(const void *self, const ir_node *irn) {
+       /* TODO */
+       assert(0);
+       return NULL;
+}
+
+static const be_machine_t *firm_get_machine(const void *self) {
+       /* TODO */
+       assert(0);
+       return NULL;
+}
+
+/**
+ * Return irp irgs in the desired order.
+ */
+static ir_graph **firm_get_irg_list(const void *self, ir_graph ***irg_list) {
+       return NULL;
+}
+
 /**
  * Returns the libFirm configuration parameter for this backend.
  */
@@ -618,18 +643,13 @@ static const backend_params *firm_get_libfirm_params(void) {
                NULL,  /* will be set later */
                0,     /* no dword lowering */
                NULL,  /* no creator function */
+               NULL,  /* context for create_intrinsic_fkt */
        };
 
        p.dep_param = &ad;
        return &p;
 }
 
-#ifdef WITH_LIBCORE
-static void firm_register_options(lc_opt_entry_t *ent)
-{
-}
-#endif
-
 const arch_isa_if_t firm_isa = {
        firm_init,
        firm_done,
@@ -640,9 +660,10 @@ const arch_isa_if_t firm_isa = {
        firm_get_irn_handler,
        firm_get_code_generator_if,
        firm_get_list_sched_selector,
+       firm_get_ilp_sched_selector,
        firm_get_reg_class_alignment,
        firm_get_libfirm_params,
-#ifdef WITH_LIBCORE
-       firm_register_options,
-#endif
+       firm_get_allowed_execution_units,
+       firm_get_machine,
+       firm_get_irg_list,
 };