X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbenode.c;h=cbe54c0ae33fe9c8280dc79519e4698a6a68ad1b;hb=f2c2e45eb4e677fef5bf6a8e418b2a22441172d5;hp=0489ec16fdd7798e793446d4fe1efcbeae32b751;hpb=44e6732d113683617bdef5f8b5d0fd7f97bbf8f9;p=libfirm diff --git a/ir/be/benode.c b/ir/be/benode.c index 0489ec16f..cbe54c0ae 100644 --- a/ir/be/benode.c +++ b/ir/be/benode.c @@ -64,11 +64,7 @@ typedef struct { arch_register_req_t req; -} be_req_t; - -typedef struct { - be_req_t req; - be_req_t in_req; + arch_register_req_t in_req; } be_reg_data_t; /** The generic be nodes attribute type. */ @@ -144,29 +140,20 @@ static const ir_op_ops be_node_op_ops; #define K irop_flag_keep #define M irop_flag_uses_memory -static int be_reqs_equal(const be_req_t *req1, const be_req_t *req2) -{ - if(!reg_reqs_equal(&req1->req, &req2->req)) - return 0; - - return 1; -} - /** * Compare two be node attributes. * * @return zero if both attributes are identically */ static int _node_cmp_attr(const be_node_attr_t *a, const be_node_attr_t *b) { - int i, len; + int i, len = ARR_LEN(a->reg_data); - if (ARR_LEN(a->reg_data) != ARR_LEN(b->reg_data)) + if (len != ARR_LEN(b->reg_data)) return 1; - len = ARR_LEN(a->reg_data); - for (i = 0; i < len; ++i) { - if (!be_reqs_equal(&a->reg_data[i].in_req, &b->reg_data[i].in_req) || - !be_reqs_equal(&a->reg_data[i].req, &b->reg_data[i].req)) + for (i = len - 1; i >= 0; --i) { + if (!reg_reqs_equal(&a->reg_data[i].in_req, &b->reg_data[i].in_req) || + !reg_reqs_equal(&a->reg_data[i].req, &b->reg_data[i].req)) return 1; } @@ -182,7 +169,7 @@ static int node_cmp_attr(ir_node *a, ir_node *b) { const be_node_attr_t *a_attr = get_irn_attr_const(a); const be_node_attr_t *b_attr = get_irn_attr_const(b); - if(_node_cmp_attr(a_attr, b_attr) != 0) + if (_node_cmp_attr(a_attr, b_attr) != 0) return 1; return !be_info_equal(a, b); @@ -247,13 +234,13 @@ static int Call_cmp_attr(ir_node *a, ir_node *b) { const be_call_attr_t *b_attr = get_irn_attr_const(b); if (a_attr->ent != b_attr->ent || - a_attr->call_tp != b_attr->call_tp) + a_attr->call_tp != b_attr->call_tp) return 1; return _node_cmp_attr(&a_attr->node_attr, &b_attr->node_attr); } -static inline be_req_t *get_be_req(const ir_node *node, int pos) +static inline arch_register_req_t *get_be_req(const ir_node *node, int pos) { int idx; const be_node_attr_t *attr; @@ -262,7 +249,7 @@ static inline be_req_t *get_be_req(const ir_node *node, int pos) assert(is_be_node(node)); attr = get_irn_attr_const(node); - if(pos < 0) { + if (pos < 0) { idx = -(pos + 1); } else { idx = pos; @@ -274,14 +261,8 @@ static inline be_req_t *get_be_req(const ir_node *node, int pos) return pos < 0 ? &rd->req : &rd->in_req; } -static inline arch_register_req_t *get_req(const ir_node *node, int pos) -{ - be_req_t *bereq = get_be_req(node, pos); - return &bereq->req; -} - /** - * Initializes the generic attribute of all be nodes and return ir. + * Initializes the generic attribute of all be nodes and return it. */ static void *init_node_attr(ir_node *node, int max_reg_data) { @@ -348,11 +329,12 @@ static int redir_proj(const ir_node **node) } ir_node *be_new_Spill(const arch_register_class_t *cls, const arch_register_class_t *cls_frame, - ir_graph *irg, ir_node *bl, ir_node *frame, ir_node *to_spill) + ir_node *bl, ir_node *frame, ir_node *to_spill) { be_frame_attr_t *a; ir_node *in[2]; ir_node *res; + ir_graph *irg = get_Block_irg(bl); in[0] = frame; in[1] = to_spill; @@ -367,11 +349,12 @@ ir_node *be_new_Spill(const arch_register_class_t *cls, const arch_register_clas } ir_node *be_new_Reload(const arch_register_class_t *cls, - const arch_register_class_t *cls_frame, ir_graph *irg, ir_node *block, + const arch_register_class_t *cls_frame, ir_node *block, ir_node *frame, ir_node *mem, ir_mode *mode) { - ir_node *in[2]; - ir_node *res; + ir_node *in[2]; + ir_node *res; + ir_graph *irg = get_Block_irg(block); in[0] = frame; in[1] = mem; @@ -408,13 +391,14 @@ ir_node *be_get_Spill_frame(const ir_node *irn) return get_irn_n(irn, be_pos_Spill_frame); } -ir_node *be_new_Perm(const arch_register_class_t *cls, ir_graph *irg, - ir_node *block, int n, ir_node *in[]) +ir_node *be_new_Perm(const arch_register_class_t *cls, ir_node *block, int n, ir_node *in[]) { - int i; + int i; + ir_graph *irg = get_Block_irg(block); + ir_node *irn = new_ir_node(NULL, irg, block, op_be_Perm, mode_T, n, in); init_node_attr(irn, n); - for(i = 0; i < n; ++i) { + for (i = 0; i < n; ++i) { be_node_set_reg_class_in(irn, i, cls); be_node_set_reg_class_out(irn, i, cls); } @@ -453,8 +437,9 @@ void be_Perm_reduce(ir_node *perm, int new_size, int *map) set_irn_in(perm, new_size, new_in); } -ir_node *be_new_MemPerm(const arch_env_t *arch_env, ir_graph *irg, ir_node *bl, int n, ir_node *in[]) +ir_node *be_new_MemPerm(const arch_env_t *arch_env, ir_node *bl, int n, ir_node *in[]) { + ir_graph *irg = get_Block_irg(bl); ir_node *frame = get_irg_frame(irg); const arch_register_class_t *cls_frame = arch_get_irn_reg_class_out(frame); const arch_register_t *sp = arch_env->sp; @@ -487,11 +472,12 @@ ir_node *be_new_MemPerm(const arch_env_t *arch_env, ir_graph *irg, ir_node *bl, } -ir_node *be_new_Copy(const arch_register_class_t *cls, ir_graph *irg, ir_node *bl, ir_node *op) +ir_node *be_new_Copy(const arch_register_class_t *cls, ir_node *bl, ir_node *op) { ir_node *in[1]; ir_node *res; arch_register_req_t *req; + ir_graph *irg = get_Block_irg(bl); in[0] = op; res = new_ir_node(NULL, irg, bl, op_be_Copy, get_irn_mode(op), 1, in); @@ -499,7 +485,7 @@ ir_node *be_new_Copy(const arch_register_class_t *cls, ir_graph *irg, ir_node *b be_node_set_reg_class_in(res, 0, cls); be_node_set_reg_class_out(res, 0, cls); - req = get_req(res, BE_OUT_POS(0)); + req = get_be_req(res, BE_OUT_POS(0)); req->cls = cls; req->type = arch_register_req_type_should_be_same; req->other_same = 1U << 0; @@ -515,10 +501,11 @@ void be_set_Copy_op(ir_node *cpy, ir_node *op) { set_irn_n(cpy, be_pos_Copy_op, op); } -ir_node *be_new_Keep(const arch_register_class_t *cls, ir_graph *irg, ir_node *bl, int n, ir_node *in[]) +ir_node *be_new_Keep(const arch_register_class_t *cls, ir_node *bl, int n, ir_node *in[]) { int i; ir_node *res; + ir_graph *irg = get_Block_irg(bl); res = new_ir_node(NULL, irg, bl, op_be_Keep, mode_ANY, -1, NULL); init_node_attr(res, -1); @@ -660,12 +647,13 @@ int be_Return_append_node(ir_node *ret, ir_node *node) { return pos; } -ir_node *be_new_IncSP(const arch_register_t *sp, ir_graph *irg, ir_node *bl, +ir_node *be_new_IncSP(const arch_register_t *sp, ir_node *bl, ir_node *old_sp, int offset, int align) { be_incsp_attr_t *a; ir_node *irn; ir_node *in[1]; + ir_graph *irg = get_Block_irg(bl); in[0] = old_sp; irn = new_ir_node(NULL, irg, bl, op_be_IncSP, sp->reg_class->mode, @@ -681,16 +669,18 @@ ir_node *be_new_IncSP(const arch_register_t *sp, ir_graph *irg, ir_node *bl, return irn; } -ir_node *be_new_AddSP(const arch_register_t *sp, ir_graph *irg, ir_node *bl, ir_node *old_sp, ir_node *sz) +ir_node *be_new_AddSP(const arch_register_t *sp, ir_node *bl, ir_node *old_sp, ir_node *sz) { be_node_attr_t *a; ir_node *irn; ir_node *in[be_pos_AddSP_last]; const arch_register_class_t *cls; + ir_graph *irg; in[be_pos_AddSP_old_sp] = old_sp; in[be_pos_AddSP_size] = sz; + irg = get_Block_irg(bl); irn = new_ir_node(NULL, irg, bl, op_be_AddSP, mode_T, be_pos_AddSP_last, in); a = init_node_attr(irn, be_pos_AddSP_last); @@ -704,15 +694,17 @@ ir_node *be_new_AddSP(const arch_register_t *sp, ir_graph *irg, ir_node *bl, ir_ return irn; } -ir_node *be_new_SubSP(const arch_register_t *sp, ir_graph *irg, ir_node *bl, ir_node *old_sp, ir_node *sz) +ir_node *be_new_SubSP(const arch_register_t *sp, ir_node *bl, ir_node *old_sp, ir_node *sz) { be_node_attr_t *a; ir_node *irn; ir_node *in[be_pos_SubSP_last]; + ir_graph *irg; in[be_pos_SubSP_old_sp] = old_sp; in[be_pos_SubSP_size] = sz; + irg = get_Block_irg(bl); irn = new_ir_node(NULL, irg, bl, op_be_SubSP, mode_T, be_pos_SubSP_last, in); a = init_node_attr(irn, be_pos_SubSP_last); @@ -724,10 +716,11 @@ ir_node *be_new_SubSP(const arch_register_t *sp, ir_graph *irg, ir_node *bl, ir_ return irn; } -ir_node *be_new_RegParams(ir_graph *irg, ir_node *bl, int n_outs) +ir_node *be_new_RegParams(ir_node *bl, int n_outs) { ir_node *res; int i; + ir_graph *irg = get_Block_irg(bl); res = new_ir_node(NULL, irg, bl, op_be_RegParams, mode_T, 0, NULL); init_node_attr(res, -1); @@ -737,11 +730,12 @@ ir_node *be_new_RegParams(ir_graph *irg, ir_node *bl, int n_outs) return res; } -ir_node *be_new_FrameAddr(const arch_register_class_t *cls_frame, ir_graph *irg, ir_node *bl, ir_node *frame, ir_entity *ent) +ir_node *be_new_FrameAddr(const arch_register_class_t *cls_frame, ir_node *bl, ir_node *frame, ir_entity *ent) { be_frame_attr_t *a; ir_node *irn; ir_node *in[1]; + ir_graph *irg = get_Block_irg(bl); in[0] = frame; irn = new_ir_node(NULL, irg, bl, op_be_FrameAddr, get_irn_mode(frame), 1, in); @@ -765,10 +759,11 @@ ir_entity *be_get_FrameAddr_entity(const ir_node *node) return attr->ent; } -ir_node *be_new_CopyKeep(const arch_register_class_t *cls, ir_graph *irg, ir_node *bl, ir_node *src, int n, ir_node *in_keep[], ir_mode *mode) +ir_node *be_new_CopyKeep(const arch_register_class_t *cls, ir_node *bl, ir_node *src, int n, ir_node *in_keep[], ir_mode *mode) { ir_node *irn; ir_node **in = ALLOCAN(ir_node*, n + 1); + ir_graph *irg = get_Block_irg(bl); in[0] = src; memcpy(&in[1], in_keep, n * sizeof(in[0])); @@ -780,9 +775,9 @@ ir_node *be_new_CopyKeep(const arch_register_class_t *cls, ir_graph *irg, ir_nod return irn; } -ir_node *be_new_CopyKeep_single(const arch_register_class_t *cls, ir_graph *irg, ir_node *bl, ir_node *src, ir_node *keep, ir_mode *mode) +ir_node *be_new_CopyKeep_single(const arch_register_class_t *cls, ir_node *bl, ir_node *src, ir_node *keep, ir_mode *mode) { - return be_new_CopyKeep(cls, irg, bl, src, 1, &keep, mode); + return be_new_CopyKeep(cls, bl, src, 1, &keep, mode); } ir_node *be_get_CopyKeep_op(const ir_node *cpy) { @@ -793,10 +788,11 @@ void be_set_CopyKeep_op(ir_node *cpy, ir_node *op) { set_irn_n(cpy, be_pos_CopyKeep_op, op); } -ir_node *be_new_Barrier(ir_graph *irg, ir_node *bl, int n, ir_node *in[]) +ir_node *be_new_Barrier(ir_node *bl, int n, ir_node *in[]) { ir_node *res; int i; + ir_graph *irg = get_Block_irg(bl); res = new_ir_node(NULL, irg, bl, op_be_Barrier, mode_T, -1, NULL); init_node_attr(res, -1); @@ -810,23 +806,23 @@ ir_node *be_new_Barrier(ir_graph *irg, ir_node *bl, int n, ir_node *in[]) ir_node *be_Barrier_append_node(ir_node *barrier, ir_node *node) { - ir_graph *irg = get_irn_irg(barrier); ir_node *block = get_nodes_block(barrier); ir_mode *mode = get_irn_mode(node); int n = add_irn_n(barrier, node); - ir_node *proj = new_r_Proj(irg, block, barrier, mode, n); + ir_node *proj = new_r_Proj(block, barrier, mode, n); add_register_req(barrier); return proj; } /* Construct a new be_Unwind. */ -ir_node *be_new_Unwind(dbg_info *dbg, ir_graph *irg, ir_node *block, +ir_node *be_new_Unwind(dbg_info *dbg, ir_node *block, ir_node *mem, ir_node *sp) { ir_node *res; ir_node *in[2]; + ir_graph *irg = get_Block_irg(block); in[be_pos_Unwind_mem] = mem; in[be_pos_Unwind_sp] = sp; @@ -930,7 +926,7 @@ static void set_req_single(struct obstack *obst, arch_register_req_t *req, void be_set_constr_single_reg_in(ir_node *node, int pos, const arch_register_t *reg, arch_register_req_type_t additional_types) { - arch_register_req_t *req = get_req(node, pos); + arch_register_req_t *req = get_be_req(node, pos); ir_graph *irg = get_irn_irg(node); struct obstack *obst = get_irg_obstack(irg); @@ -940,7 +936,7 @@ void be_set_constr_single_reg_in(ir_node *node, int pos, void be_set_constr_single_reg_out(ir_node *node, int pos, const arch_register_t *reg, arch_register_req_type_t additional_types) { - arch_register_req_t *req = get_req(node, BE_OUT_POS(pos)); + arch_register_req_t *req = get_be_req(node, BE_OUT_POS(pos)); ir_graph *irg = get_irn_irg(node); struct obstack *obst = get_irg_obstack(irg); @@ -957,7 +953,7 @@ void be_set_constr_limited(ir_node *node, int pos, const arch_register_req_t *re { ir_graph *irg = get_irn_irg(node); struct obstack *obst = get_irg_obstack(irg); - arch_register_req_t *r = get_req(node, pos); + arch_register_req_t *r = get_be_req(node, pos); assert(arch_register_req_is(req, limited)); assert(!(req->type & (arch_register_req_type_should_be_same | arch_register_req_type_must_be_different))); @@ -967,7 +963,7 @@ void be_set_constr_limited(ir_node *node, int pos, const arch_register_req_t *re void be_node_set_reg_class_in(ir_node *irn, int pos, const arch_register_class_t *cls) { - arch_register_req_t *req = get_req(irn, pos); + arch_register_req_t *req = get_be_req(irn, pos); req->cls = cls; @@ -980,7 +976,7 @@ void be_node_set_reg_class_in(ir_node *irn, int pos, const arch_register_class_t void be_node_set_reg_class_out(ir_node *irn, int pos, const arch_register_class_t *cls) { - arch_register_req_t *req = get_req(irn, BE_OUT_POS(pos)); + arch_register_req_t *req = get_be_req(irn, BE_OUT_POS(pos)); req->cls = cls; @@ -993,7 +989,7 @@ void be_node_set_reg_class_out(ir_node *irn, int pos, const arch_register_class_ void be_node_set_req_type(ir_node *irn, int pos, arch_register_req_type_t type) { - arch_register_req_t *req = get_req(irn, pos); + arch_register_req_t *req = get_be_req(irn, pos); req->type = type; } @@ -1030,13 +1026,13 @@ int be_get_IncSP_align(const ir_node *irn) ir_node *be_spill(ir_node *block, ir_node *irn) { - ir_graph *irg = get_irn_irg(block); + ir_graph *irg = get_Block_irg(block); ir_node *frame = get_irg_frame(irg); const arch_register_class_t *cls = arch_get_irn_reg_class_out(irn); const arch_register_class_t *cls_frame = arch_get_irn_reg_class_out(frame); ir_node *spill; - spill = be_new_Spill(cls, cls_frame, irg, block, frame, irn); + spill = be_new_Spill(cls, cls_frame, block, frame, irn); return spill; } @@ -1044,13 +1040,13 @@ ir_node *be_reload(const arch_register_class_t *cls, ir_node *insert, ir_mode *m { ir_node *reload; ir_node *bl = is_Block(insert) ? insert : get_nodes_block(insert); - ir_graph *irg = get_irn_irg(bl); + ir_graph *irg = get_Block_irg(bl); ir_node *frame = get_irg_frame(irg); const arch_register_class_t *cls_frame = arch_get_irn_reg_class_out(frame); assert(be_is_Spill(spill) || (is_Phi(spill) && get_irn_mode(spill) == mode_M)); - reload = be_new_Reload(cls, cls_frame, irg, bl, frame, spill, mode); + reload = be_new_Reload(cls, cls_frame, bl, frame, spill, mode); if (is_Block(insert)) { insert = sched_skip(insert, 0, sched_skip_cf_predicator, NULL); @@ -1078,11 +1074,11 @@ arch_register_req_t *get_out_reg_req(const ir_node *irn, int out_pos) { const be_node_attr_t *a = get_irn_attr_const(irn); - if(out_pos >= ARR_LEN(a->reg_data)) { + if (out_pos >= ARR_LEN(a->reg_data)) { return arch_no_register_req; } - return &a->reg_data[out_pos].req.req; + return &a->reg_data[out_pos].req; } static const @@ -1090,10 +1086,10 @@ arch_register_req_t *get_in_reg_req(const ir_node *irn, int pos) { const be_node_attr_t *a = get_irn_attr_const(irn); - if(pos >= get_irn_arity(irn) || pos >= ARR_LEN(a->reg_data)) + if (pos >= get_irn_arity(irn) || pos >= ARR_LEN(a->reg_data)) return arch_no_register_req; - return &a->reg_data[pos].in_req.req; + return &a->reg_data[pos].in_req; } static const arch_register_req_t * @@ -1114,8 +1110,8 @@ be_node_get_irn_reg_req(const ir_node *irn, int pos) * For spills and reloads, we return "none" as requirement for frame * pointer, so every input is ok. Some backends need this (e.g. STA). */ - if ((be_is_Spill(irn) && pos == be_pos_Spill_frame) || - (be_is_Reload(irn) && pos == be_pos_Reload_frame)) + if ((pos == be_pos_Spill_frame && be_is_Spill(irn)) || + (pos == be_pos_Reload_frame && be_is_Reload(irn))) return arch_no_register_req; return get_in_reg_req(irn, pos); @@ -1428,19 +1424,19 @@ static void dump_node_reqs(FILE *f, ir_node *node) int len = ARR_LEN(a->reg_data); fprintf(f, "registers: \n"); - for(i = 0; i < len; ++i) { + for (i = 0; i < len; ++i) { const arch_register_t *reg = arch_irn_get_register(node, i); fprintf(f, "#%d: %s\n", i, reg != NULL ? reg->name : "n/a"); } fprintf(f, "in requirements:\n"); - for(i = 0; i < len; ++i) { - dump_node_req(f, i, &a->reg_data[i].in_req.req, node); + for (i = 0; i < len; ++i) { + dump_node_req(f, i, &a->reg_data[i].in_req, node); } fprintf(f, "\nout requirements:\n"); - for(i = 0; i < len; ++i) { - dump_node_req(f, i, &a->reg_data[i].req.req, node); + for (i = 0; i < len; ++i) { + dump_node_req(f, i, &a->reg_data[i].req, node); } } @@ -1576,15 +1572,15 @@ static void copy_attr(const ir_node *old_node, ir_node *new_node) for(i = 0; i < len; ++i) { const be_reg_data_t *rd = &old_attr->reg_data[i]; be_reg_data_t *newrd = &new_attr->reg_data[i]; - if(arch_register_req_is(&rd->req.req, limited)) { - const arch_register_req_t *req = &rd->req.req; - arch_register_req_t *new_req = &newrd->req.req; + if (arch_register_req_is(&rd->req, limited)) { + const arch_register_req_t *req = &rd->req; + arch_register_req_t *new_req = &newrd->req; new_req->limited = rbitset_duplicate_obstack_alloc(obst, req->limited, req->cls->n_regs); } - if(arch_register_req_is(&rd->in_req.req, limited)) { - const arch_register_req_t *req = &rd->in_req.req; - arch_register_req_t *new_req = &newrd->in_req.req; + if(arch_register_req_is(&rd->in_req, limited)) { + const arch_register_req_t *req = &rd->in_req; + arch_register_req_t *new_req = &newrd->in_req; new_req->limited = rbitset_duplicate_obstack_alloc(obst, req->limited, req->cls->n_regs); } @@ -1618,14 +1614,8 @@ int is_be_node(const ir_node *irn) return get_op_ops(get_irn_op(irn))->be_ops == &be_node_irn_ops; } -void be_node_init(void) { - static int inited = 0; - - if(inited) - return; - - inited = 1; - +void be_init_op(void) +{ /* Acquire all needed opcodes. */ op_be_Spill = new_ir_op(beo_Spill, "be_Spill", op_pin_state_pinned, N, oparity_unary, 0, sizeof(be_frame_attr_t), &be_node_op_ops); op_be_Reload = new_ir_op(beo_Reload, "be_Reload", op_pin_state_pinned, N, oparity_zero, 0, sizeof(be_frame_attr_t), &be_node_op_ops);