change color handling in dumper, tweak colors

[libfirm] / ir / be / benode.c

diff --git a/ir/be/benode.c b/ir/be/benode.c
index f3bd545..eb1b408 100644 (file)
--- a/ir/be/benode.c
+++ b/ir/be/benode.c
@@ -55,6 +55,7 @@
 #include "belive_t.h"
 #include "besched_t.h"
 #include "benode_t.h"
+#include "bearch_t.h"
 
 #include "beirgmod.h"
 
@@ -146,6 +147,7 @@ static const ir_op_ops be_node_op_ops;
 #define c   irop_flag_constlike
 #define K   irop_flag_keep
 #define M   irop_flag_machine
+#define E   irop_flag_side_effect
 
 
 /**
@@ -270,7 +272,7 @@ void be_node_init(void) {
        op_be_Copy       = new_ir_op(beo_base + beo_Copy,       "be_Copy",       op_pin_state_floats,     N, oparity_unary,    0, sizeof(be_node_attr_t),    &be_node_op_ops);
        op_be_Keep       = new_ir_op(beo_base + beo_Keep,       "be_Keep",       op_pin_state_pinned,     K, oparity_dynamic,  0, sizeof(be_node_attr_t),    &be_node_op_ops);
        op_be_CopyKeep   = new_ir_op(beo_base + beo_CopyKeep,   "be_CopyKeep",   op_pin_state_pinned,     K, oparity_variable, 0, sizeof(be_node_attr_t),    &be_node_op_ops);
-       op_be_Call       = new_ir_op(beo_base + beo_Call,       "be_Call",       op_pin_state_pinned,     F, oparity_variable, 0, sizeof(be_call_attr_t),    &be_node_op_ops);
+       op_be_Call       = new_ir_op(beo_base + beo_Call,       "be_Call",       op_pin_state_pinned,     F|E, oparity_variable, 0, sizeof(be_call_attr_t),    &be_node_op_ops);
        op_be_Return     = new_ir_op(beo_base + beo_Return,     "be_Return",     op_pin_state_pinned,     X, oparity_dynamic,  0, sizeof(be_return_attr_t),  &be_node_op_ops);
        op_be_AddSP      = new_ir_op(beo_base + beo_AddSP,      "be_AddSP",      op_pin_state_pinned,     N, oparity_unary,    0, sizeof(be_node_attr_t),    &be_node_op_ops);
        op_be_SubSP      = new_ir_op(beo_base + beo_SubSP,      "be_SubSP",      op_pin_state_pinned,     N, oparity_unary,    0, sizeof(be_node_attr_t),    &be_node_op_ops);
@@ -550,8 +552,7 @@ ir_node *be_new_Copy(const arch_register_class_t *cls, ir_graph *irg, ir_node *b
        req = get_req(res, OUT_POS(0));
        req->cls = cls;
        req->type = arch_register_req_type_should_be_same;
-       req->other_same[0] =  0;
-       req->other_same[1] = -1;
+       req->other_same = 1U << 0;
 
        return res;
 }
@@ -1073,16 +1074,15 @@ int be_get_IncSP_offset(const ir_node *irn)
        return a->offset;
 }
 
-ir_node *be_spill(const arch_env_t *arch_env, ir_node *irn)
+ir_node *be_spill(const arch_env_t *arch_env, ir_node *block, ir_node *irn)
 {
-       ir_node                     *bl        = get_nodes_block(irn);
-       ir_graph                    *irg       = get_irn_irg(bl);
+       ir_graph                    *irg       = get_irn_irg(block);
        ir_node                     *frame     = get_irg_frame(irg);
        const arch_register_class_t *cls       = arch_get_irn_reg_class(arch_env, irn, -1);
        const arch_register_class_t *cls_frame = arch_get_irn_reg_class(arch_env, frame, -1);
        ir_node                     *spill;
 
-       spill = be_new_Spill(cls, cls_frame, irg, bl, frame, irn);
+       spill = be_new_Spill(cls, cls_frame, irg, block, frame, irn);
        return spill;
 }
 
@@ -1250,7 +1250,7 @@ static int be_node_get_sp_bias(const void *self, const ir_node *irn)
        if(be_is_IncSP(irn))
                return be_get_IncSP_offset(irn);
        if(be_is_Call(irn))
-               return -be_Call_get_pop(irn);
+               return -(int)be_Call_get_pop(irn);
 
        return 0;
 }