remove MacroBlock concept

[libfirm] / ir / be / bearch.c

diff --git a/ir/be/bearch.c b/ir/be/bearch.c
index 83c0661..e192057 100644 (file)
--- a/ir/be/bearch.c
+++ b/ir/be/bearch.c
@@ -72,16 +72,16 @@ static inline const arch_irn_ops_t *get_irn_ops(const ir_node *irn)
 const arch_register_req_t *arch_get_register_req(const ir_node *irn, int pos)
 {
        if (is_Proj(irn)) {
+               ir_node *pred = get_Proj_pred(irn);
+               long     pn   = get_Proj_proj(irn);
                assert(pos == -1);
-               pos = -1-get_Proj_proj(irn);
-               irn = get_Proj_pred(irn);
+               return arch_get_out_register_req(pred, pn);
        }
 
        if (pos < 0) {
                return arch_get_out_register_req(irn, -pos-1);
        } else {
-               const arch_irn_ops_t *ops = get_irn_ops_simple(irn);
-               return ops->get_irn_reg_req_in(irn, pos);
+               return arch_get_in_register_req(irn, pos);
        }
 }
 
@@ -97,12 +97,6 @@ ir_entity *arch_get_frame_entity(const ir_node *irn)
        return ops->get_frame_entity(irn);
 }
 
-void arch_set_frame_entity(ir_node *irn, ir_entity *ent)
-{
-       const arch_irn_ops_t *ops = get_irn_ops(irn);
-       ops->set_frame_entity(irn, ent);
-}
-
 int arch_get_sp_bias(ir_node *irn)
 {
        const arch_irn_ops_t *ops = get_irn_ops(irn);
@@ -113,7 +107,7 @@ arch_inverse_t *arch_get_inverse(const ir_node *irn, int i, arch_inverse_t *inve
 {
        const arch_irn_ops_t *ops = get_irn_ops(irn);
 
-       if(ops->get_inverse) {
+       if (ops->get_inverse) {
                return ops->get_inverse(irn, i, inverse, obstack);
        } else {
                return NULL;
@@ -124,7 +118,7 @@ int arch_possible_memory_operand(const ir_node *irn, unsigned int i)
 {
        const arch_irn_ops_t *ops = get_irn_ops(irn);
 
-       if(ops->possible_memory_operand) {
+       if (ops->possible_memory_operand) {
                return ops->possible_memory_operand(irn, i);
        } else {
                return 0;
@@ -135,7 +129,7 @@ void arch_perform_memory_operand(ir_node *irn, ir_node *spill, unsigned int i)
 {
        const arch_irn_ops_t *ops = get_irn_ops(irn);
 
-       if(ops->perform_memory_operand) {
+       if (ops->perform_memory_operand) {
                ops->perform_memory_operand(irn, spill, i);
        } else {
                return;
@@ -146,7 +140,7 @@ int arch_get_op_estimated_cost(const ir_node *irn)
 {
        const arch_irn_ops_t *ops = get_irn_ops(irn);
 
-       if(ops->get_op_estimated_cost) {
+       if (ops->get_op_estimated_cost) {
                return ops->get_op_estimated_cost(irn);
        } else {
                return 1;
@@ -157,8 +151,8 @@ void arch_put_non_ignore_regs(const arch_register_class_t *cls, bitset_t *bs)
 {
        unsigned i;
 
-       for(i = 0; i < cls->n_regs; ++i) {
-               if(!arch_register_type_is(&cls->regs[i], ignore))
+       for (i = 0; i < cls->n_regs; ++i) {
+               if (!arch_register_type_is(&cls->regs[i], ignore))
                        bitset_set(bs, i);
        }
 }
@@ -168,10 +162,10 @@ int arch_reg_is_allocatable(const ir_node *irn, int pos,
 {
        const arch_register_req_t *req = arch_get_register_req(irn, pos);
 
-       if(req->type == arch_register_req_type_none)
+       if (req->type == arch_register_req_type_none)
                return 0;
 
-       if(arch_register_req_is(req, limited)) {
+       if (arch_register_req_is(req, limited)) {
                if (arch_register_get_class(reg) != req->cls)
                        return 0;
                return rbitset_is_set(req->limited, arch_register_get_index(reg));
@@ -273,20 +267,20 @@ void arch_dump_register_req(FILE *F, const arch_register_req_t *req,
 
        fprintf(F, "%s", req->cls->name);
 
-       if(arch_register_req_is(req, limited)) {
+       if (arch_register_req_is(req, limited)) {
                unsigned n_regs = req->cls->n_regs;
                unsigned i;
 
                fprintf(F, " limited to");
-               for(i = 0; i < n_regs; ++i) {
-                       if(rbitset_is_set(req->limited, i)) {
+               for (i = 0; i < n_regs; ++i) {
+                       if (rbitset_is_set(req->limited, i)) {
                                const arch_register_t *reg = &req->cls->regs[i];
                                fprintf(F, " %s", reg->name);
                        }
                }
        }
 
-       if(arch_register_req_is(req, should_be_same)) {
+       if (arch_register_req_is(req, should_be_same)) {
                const unsigned other = req->other_same;
                int i;
 
@@ -310,6 +304,12 @@ void arch_dump_register_req(FILE *F, const arch_register_req_t *req,
                }
        }
 
+       if (req->width != 1) {
+               fprintf(F, " width:%u", req->width);
+       }
+       if (arch_register_req_is(req, aligned)) {
+               fprintf(F, " aligned");
+       }
        if (arch_register_req_is(req, ignore)) {
                fprintf(F, " ignore");
        }
@@ -367,6 +367,7 @@ static const arch_register_req_t no_requirement = {
        NULL,
        NULL,
        0,
+       0,
        0
 };
 const arch_register_req_t *arch_no_register_req = &no_requirement;