Fix warning in r15953.

[libfirm] / ir / be / bearch.c

diff --git a/ir/be/bearch.c b/ir/be/bearch.c
index 3fe1504..0f51dd1 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);
@@ -206,9 +205,11 @@ int arch_get_allocatable_regs(const arch_env_t *env, const ir_node *irn, int pos
        return req->cls->n_regs;
 }
 
-void arch_put_non_ignore_regs(const arch_env_t *env, const arch_register_class_t *cls, bitset_t *bs)
+void arch_put_non_ignore_regs(const arch_env_t *env,
+                              const arch_register_class_t *cls, bitset_t *bs)
 {
        int i;
+       (void) env;
 
        for(i = 0; i < cls->n_regs; ++i) {
                if(!arch_register_type_is(&cls->regs[i], ignore))
@@ -216,10 +217,12 @@ void arch_put_non_ignore_regs(const arch_env_t *env, const arch_register_class_t
        }
 }
 
-int arch_count_non_ignore_regs(const arch_env_t *env, const arch_register_class_t *cls)
+int arch_count_non_ignore_regs(const arch_env_t *env,
+                               const arch_register_class_t *cls)
 {
        int i;
        int result = 0;
+       (void) env;
 
        for(i = 0; i < cls->n_regs; ++i) {
                if(!arch_register_type_is(&cls->regs[i], ignore))
@@ -301,6 +304,7 @@ extern const char *arch_irn_flag_str(arch_irn_flags_t fl)
                XXX(ignore);
                XXX(rematerializable);
                XXX(modify_sp);
+               XXX(modify_flags);
                XXX(none);
 #undef XXX
        }
@@ -329,13 +333,18 @@ 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[0]);
                ir_snprintf(tmp, sizeof(tmp), " same to: %+F", same);
                strncat(buf, tmp, len);
+               if (req->other_same[1] != -1) {
+                       const ir_node *same2 = get_irn_n(skip_Proj_const(node), req->other_same[1]);
+                       ir_snprintf(tmp, sizeof(tmp), "or %+F", same2);
+                       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);
        }
@@ -347,7 +356,7 @@ static const arch_register_req_t no_requirement = {
        arch_register_req_type_none,
        NULL,
        NULL,
-       -1,
+       { -1, -1 },
        -1
 };
 const arch_register_req_t *arch_no_register_req = &no_requirement;