Fixed initialization of option tables

[libfirm] / ir / be / bearch.c

diff --git a/ir/be/bearch.c b/ir/be/bearch.c
index 3fe1504..e9561dd 100644 (file)
--- a/ir/be/bearch.c
+++ b/ir/be/bearch.c
@@ -36,7 +36,6 @@
 
 #include "bitset.h"
 #include "pset.h"
-#include "entity.h"
 #include "raw_bitset.h"
 
 #include "irprintf.h"
@@ -116,7 +115,7 @@ void arch_set_frame_offset(const arch_env_t *env, ir_node *irn, int offset)
        ops->impl->set_frame_offset(ops, irn, offset);
 }
 
-ir_entity *arch_get_frame_entity(const arch_env_t *env, ir_node *irn)
+ir_entity *arch_get_frame_entity(const arch_env_t *env, const ir_node *irn)
 {
        const arch_irn_ops_t *ops = get_irn_ops(env, irn);
        return ops->impl->get_frame_entity(ops, irn);
@@ -329,13 +328,13 @@ extern char *arch_register_req_format(char *buf, size_t len,
        }
 
        if(arch_register_req_is(req, should_be_same)) {
-               const ir_node *same = get_irn_n(node, req->other_same);
+               const ir_node *same = get_irn_n(skip_Proj_const(node), req->other_same);
                ir_snprintf(tmp, sizeof(tmp), " same to: %+F", same);
                strncat(buf, tmp, len);
        }
 
        if(arch_register_req_is(req, should_be_different)) {
-               const ir_node *different = get_irn_n(node, req->other_different);
+               const ir_node *different = get_irn_n(skip_Proj_const(node), req->other_different);
                ir_snprintf(tmp, sizeof(tmp), " different to: %+F", different);
                strncat(buf, tmp, len);
        }