renamed type opcode to ir_opcode

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

diff --git a/ir/be/firm/bearch_firm.c b/ir/be/firm/bearch_firm.c
index f940b56..2c51f8d 100644 (file)
--- a/ir/be/firm/bearch_firm.c
+++ b/ir/be/firm/bearch_firm.c
@@ -357,12 +357,12 @@ 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, const ir_node *irn, entity *ent)
+static void firm_set_frame_entity(const void *self, const ir_node *irn, ir_entity *ent)
 {
 }
 
@@ -434,7 +434,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))
@@ -491,8 +491,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
@@ -578,6 +578,7 @@ 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,
@@ -602,6 +603,10 @@ static const list_sched_selector_t *firm_get_list_sched_selector(const void *sel
        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.
  */
@@ -646,12 +651,6 @@ static const backend_params *firm_get_libfirm_params(void) {
        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,
@@ -662,11 +661,9 @@ 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,
        firm_get_allowed_execution_units,
        firm_get_machine,
-#ifdef WITH_LIBCORE
-       firm_register_options,
-#endif
 };