- Added 2 new blockschedulers, a greedy algorithm and an "optimal" ILP that

[libfirm] / ir / be / bearch.c

diff --git a/ir/be/bearch.c b/ir/be/bearch.c
index f25d0df..5ea988d 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;
 }
@@ -87,6 +88,10 @@ get_irn_ops(const arch_env_t *env, const ir_node *irn)
   return fallback_irn_ops;
 }
 
+const arch_irn_ops_t *arch_get_irn_ops(const arch_env_t *env, const ir_node *irn) {
+       return get_irn_ops(env, irn);
+}
+
 const arch_register_req_t *arch_get_register_req(const arch_env_t *env,
     arch_register_req_t *req, const ir_node *irn, int pos)
 {
@@ -113,6 +118,12 @@ void arch_set_frame_entity(const arch_env_t *env, ir_node *irn, entity *ent)
        ops->impl->set_frame_entity(ops, irn, ent);
 }
 
+int arch_get_sp_bias(const arch_env_t *env, ir_node *irn)
+{
+       const arch_irn_ops_t *ops = get_irn_ops(env, irn);
+       return ops->impl->get_sp_bias(ops, irn);
+}
+
 arch_inverse_t *arch_get_inverse(const arch_env_t *env, const ir_node *irn, int i, arch_inverse_t *inverse, struct obstack *obstack)
 {
   const arch_irn_ops_t *ops = get_irn_ops(env, irn);
@@ -132,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) {
+extern 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;
        }