fixed precedence constraint

[libfirm] / ir / be / bearch.c

diff --git a/ir/be/bearch.c b/ir/be/bearch.c
index 9aac6d3..3749ace 100644 (file)
--- a/ir/be/bearch.c
+++ b/ir/be/bearch.c
@@ -31,17 +31,18 @@
 #include "irprintf.h"
 
 /* Initialize the architecture environment struct. */
-arch_env_t *arch_env_init(arch_env_t *env, const arch_isa_if_t *isa_if, FILE *file_handle)
+arch_env_t *arch_env_init(arch_env_t *env, const arch_isa_if_t *isa_if, FILE *file_handle, be_main_env_t *main_env)
 {
   memset(env, 0, sizeof(*env));
-  env->isa = isa_if->init(file_handle);
+  env->isa                  = isa_if->init(file_handle);
+  env->isa->main_env        = main_env;
   return env;
 }
 
 arch_env_t *arch_env_push_irn_handler(arch_env_t *env,
     const arch_irn_handler_t *handler)
 {
-  assert(env->handlers_tos <= ARCH_MAX_HANDLERS);
+  assert(env->handlers_tos < ARCH_MAX_HANDLERS);
   env->handlers[env->handlers_tos++] = handler;
   return env;
 }
@@ -105,13 +106,13 @@ void arch_set_frame_offset(const arch_env_t *env, ir_node *irn, int offset)
   ops->impl->set_frame_offset(ops, irn, offset);
 }
 
-entity *arch_get_frame_entity(const arch_env_t *env, ir_node *irn)
+ir_entity *arch_get_frame_entity(const arch_env_t *env, ir_node *irn)
 {
   const arch_irn_ops_t *ops = get_irn_ops(env, irn);
   return ops->impl->get_frame_entity(ops, irn);
 }
 
-void arch_set_frame_entity(const arch_env_t *env, ir_node *irn, entity *ent)
+void arch_set_frame_entity(const arch_env_t *env, ir_node *irn, ir_entity *ent)
 {
        const arch_irn_ops_t *ops = get_irn_ops(env, irn);
        ops->impl->set_frame_entity(ops, irn, ent);
@@ -142,10 +143,10 @@ int arch_possible_memory_operand(const arch_env_t *env, const ir_node *irn, unsi
        }
 }
 
-extern void arch_perform_memory_operand(const arch_env_t *env, ir_node *irn, ir_node *reload, unsigned int i) {
+void arch_perform_memory_operand(const arch_env_t *env, ir_node *irn, ir_node *spill, unsigned int i) {
        const arch_irn_ops_t *ops = get_irn_ops(env, irn);
        if(ops->impl->perform_memory_operand) {
-               ops->impl->perform_memory_operand(ops, irn, reload, i);
+               ops->impl->perform_memory_operand(ops, irn, spill, i);
        } else {
                return;
        }