X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbenode.c;h=f26ec00550906b9d6a93ae6001ab4f3f5a9d08b8;hb=78680bc76e5e6d7c8a63390fefdf085b342d1b6d;hp=fe56913bc70b476ae53e794faab4059bbc57b209;hpb=816e7e0779021990465292820aa997d2af768c72;p=libfirm diff --git a/ir/be/benode.c b/ir/be/benode.c index fe56913bc..f26ec0055 100644 --- a/ir/be/benode.c +++ b/ir/be/benode.c @@ -64,8 +64,6 @@ #define get_irn_attr(irn) get_irn_generic_attr(irn) #define get_irn_attr_const(irn) get_irn_generic_attr_const(irn) -static unsigned be_node_tag = FOURCC('B', 'E', 'N', 'O'); - typedef struct { arch_register_req_t req; arch_irn_flags_t flags; @@ -87,14 +85,15 @@ typedef struct { be_node_attr_t node_attr; /**< base attributes of every be node. */ int num_ret_vals; /**< number of return values */ unsigned pop; /**< number of bytes that should be popped */ + int emit_pop; /**< if set, emit pop bytes, even if pop = 0 */ } be_return_attr_t; /** The be_IncSP attribute type. */ typedef struct { be_node_attr_t node_attr; /**< base attributes of every be node. */ int offset; /**< The offset by which the stack shall be expanded/shrinked. */ - int align; /**< wether stack should be aligned after the - IncSP */ + int align; /**< whether stack should be aligned after the + IncSP */ } be_incsp_attr_t; /** The be_Frame attribute type. */ @@ -107,9 +106,9 @@ typedef struct { /** The be_Call attribute type. */ typedef struct { be_node_attr_t node_attr; /**< base attributes of every be node. */ - ir_entity *ent; /**< The called entity if this is a static call. */ + ir_entity *ent; /**< The called entity if this is a static call. */ unsigned pop; - ir_type *call_tp; /**< The call type, copied from the original Call node. */ + ir_type *call_tp; /**< The call type, copied from the original Call node. */ } be_call_attr_t; typedef struct { @@ -135,8 +134,6 @@ ir_op *op_be_FrameAddr; ir_op *op_be_Barrier; ir_op *op_be_Unwind; -static int beo_base = -1; - static const ir_op_ops be_node_op_ops; #define N irop_flag_none @@ -151,6 +148,15 @@ 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; + if(req1->flags != req2->flags) + return 0; + + return 1; +} /** * Compare two be node attributes. @@ -166,8 +172,8 @@ static int _node_cmp_attr(const be_node_attr_t *a, const be_node_attr_t *b) { len = ARR_LEN(a->reg_data); for (i = 0; i < len; ++i) { if (a->reg_data[i].reg != b->reg_data[i].reg || - memcmp(&a->reg_data[i].in_req, &b->reg_data[i].in_req, sizeof(b->reg_data[i].in_req)) || - memcmp(&a->reg_data[i].req, &b->reg_data[i].req, sizeof(a->reg_data[i].req))) + !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)) return 1; } @@ -214,6 +220,8 @@ static int Return_cmp_attr(ir_node *a, ir_node *b) { return 1; if (a_attr->pop != b_attr->pop) return 1; + if (a_attr->emit_pop != b_attr->emit_pop) + return 1; return _node_cmp_attr(&a_attr->node_attr, &b_attr->node_attr); } @@ -276,68 +284,6 @@ static INLINE arch_register_req_t *get_req(const ir_node *node, int pos) return &bereq->req; } -void be_node_init(void) { - static int inited = 0; - - if(inited) - return; - - inited = 1; - - /* Acquire all needed opcodes. */ - beo_base = get_next_ir_opcodes(beo_Last); - - op_be_Spill = new_ir_op(beo_base + 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_base + beo_Reload, "be_Reload", op_pin_state_pinned, N, oparity_zero, 0, sizeof(be_frame_attr_t), &be_node_op_ops); - op_be_Perm = new_ir_op(beo_base + beo_Perm, "be_Perm", op_pin_state_pinned, N, oparity_variable, 0, sizeof(be_node_attr_t), &be_node_op_ops); - op_be_MemPerm = new_ir_op(beo_base + beo_MemPerm, "be_MemPerm", op_pin_state_pinned, N, oparity_variable, 0, sizeof(be_memperm_attr_t), &be_node_op_ops); - 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|M, 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); - op_be_IncSP = new_ir_op(beo_base + beo_IncSP, "be_IncSP", op_pin_state_pinned, N, oparity_unary, 0, sizeof(be_incsp_attr_t), &be_node_op_ops); - op_be_RegParams = new_ir_op(beo_base + beo_RegParams, "be_RegParams", op_pin_state_pinned, N, oparity_zero, 0, sizeof(be_node_attr_t), &be_node_op_ops); - op_be_FrameAddr = new_ir_op(beo_base + beo_FrameAddr, "be_FrameAddr", op_pin_state_floats, N, oparity_unary, 0, sizeof(be_frame_attr_t), &be_node_op_ops); - op_be_Barrier = new_ir_op(beo_base + beo_Barrier, "be_Barrier", op_pin_state_pinned, N, oparity_dynamic, 0, sizeof(be_node_attr_t), &be_node_op_ops); - op_be_Unwind = new_ir_op(beo_base + beo_Unwind, "be_Unwind", op_pin_state_pinned, X, oparity_zero, 0, sizeof(be_node_attr_t), &be_node_op_ops); - - set_op_tag(op_be_Spill, &be_node_tag); - op_be_Spill->ops.node_cmp_attr = FrameAddr_cmp_attr; - set_op_tag(op_be_Reload, &be_node_tag); - op_be_Reload->ops.node_cmp_attr = FrameAddr_cmp_attr; - set_op_tag(op_be_Perm, &be_node_tag); - op_be_Perm->ops.node_cmp_attr = node_cmp_attr; - set_op_tag(op_be_MemPerm, &be_node_tag); - op_be_MemPerm->ops.node_cmp_attr = node_cmp_attr; - set_op_tag(op_be_Copy, &be_node_tag); - op_be_Copy->ops.node_cmp_attr = node_cmp_attr; - set_op_tag(op_be_Keep, &be_node_tag); - op_be_Keep->ops.node_cmp_attr = node_cmp_attr; - set_op_tag(op_be_CopyKeep, &be_node_tag); - op_be_CopyKeep->ops.node_cmp_attr = node_cmp_attr; - set_op_tag(op_be_Call, &be_node_tag); - op_be_Call->ops.node_cmp_attr = Call_cmp_attr; - set_op_tag(op_be_Return, &be_node_tag); - op_be_Return->ops.node_cmp_attr = Return_cmp_attr; - set_op_tag(op_be_AddSP, &be_node_tag); - op_be_AddSP->ops.node_cmp_attr = node_cmp_attr; - set_op_tag(op_be_SubSP, &be_node_tag); - op_be_SubSP->ops.node_cmp_attr = node_cmp_attr; - set_op_tag(op_be_IncSP, &be_node_tag); - op_be_IncSP->ops.node_cmp_attr = IncSP_cmp_attr; - set_op_tag(op_be_RegParams, &be_node_tag); - op_be_RegParams->ops.node_cmp_attr = node_cmp_attr; - set_op_tag(op_be_FrameAddr, &be_node_tag); - op_be_FrameAddr->ops.node_cmp_attr = FrameAddr_cmp_attr; - set_op_tag(op_be_Barrier, &be_node_tag); - op_be_Barrier->ops.node_cmp_attr = node_cmp_attr; - set_op_tag(op_be_Unwind, &be_node_tag); - op_be_Unwind->ops.node_cmp_attr = node_cmp_attr; -} - /** * Initializes the generic attribute of all be nodes and return ir. */ @@ -367,16 +313,6 @@ static void add_register_req(ir_node *node) ARR_APP1(be_reg_data_t, a->reg_data, regreq); } -int is_be_node(const ir_node *irn) -{ - return get_op_tag(get_irn_op(irn)) == &be_node_tag; -} - -be_opcode_t be_get_irn_opcode(const ir_node *irn) -{ - return is_be_node(irn) ? (be_opcode_t) get_irn_opcode(irn) - beo_base : beo_NoBeOp; -} - /** * Skip Proj nodes and return their Proj numbers. * @@ -422,10 +358,9 @@ static be_reg_data_t *retrieve_reg_data(const ir_node *node) } static void -be_node_set_irn_reg(const void *self, ir_node *irn, const arch_register_t *reg) +be_node_set_irn_reg(ir_node *irn, const arch_register_t *reg) { be_reg_data_t *r = retrieve_reg_data(irn); - (void) self; r->reg = reg; } @@ -534,7 +469,7 @@ ir_node *be_new_MemPerm(const arch_env_t *arch_env, ir_graph *irg, ir_node *bl, ir_node *frame = get_irg_frame(irg); const arch_register_class_t *cls_frame = arch_get_irn_reg_class(arch_env, frame, -1); ir_node *irn; - const arch_register_t *sp = arch_env->isa->sp; + const arch_register_t *sp = arch_env->sp; be_memperm_attr_t *attr; ir_node **real_in; @@ -697,25 +632,36 @@ ir_node *be_new_Return(dbg_info *dbg, ir_graph *irg, ir_node *block, int n_res, a = get_irn_attr(res); a->num_ret_vals = n_res; a->pop = pop; + a->emit_pop = 0; return res; } /* Returns the number of real returns values */ -int be_Return_get_n_rets(const ir_node *ret) -{ +int be_Return_get_n_rets(const ir_node *ret) { const be_return_attr_t *a = get_irn_generic_attr_const(ret); return a->num_ret_vals; } -unsigned be_Return_get_pop(const ir_node *ret) -{ +/* return the number of bytes that should be popped from stack when executing the Return. */ +unsigned be_Return_get_pop(const ir_node *ret) { const be_return_attr_t *a = get_irn_generic_attr_const(ret); return a->pop; } -int be_Return_append_node(ir_node *ret, ir_node *node) -{ +/* return non-zero, if number of popped bytes must be always emitted */ +int be_Return_get_emit_pop(const ir_node *ret) { + const be_return_attr_t *a = get_irn_generic_attr_const(ret); + return a->emit_pop; +} + +/* return non-zero, if number of popped bytes must be always emitted */ +void be_Return_set_emit_pop(ir_node *ret, int emit_pop) { + be_return_attr_t *a = get_irn_generic_attr(ret); + a->emit_pop = emit_pop; +} + +int be_Return_append_node(ir_node *ret, ir_node *node) { int pos; pos = add_irn_n(ret, node); @@ -743,7 +689,7 @@ ir_node *be_new_IncSP(const arch_register_t *sp, ir_graph *irg, ir_node *bl, /* Set output constraint to stack register. */ be_node_set_reg_class(irn, 0, sp->reg_class); be_set_constr_single_reg(irn, BE_OUT_POS(0), sp); - be_node_set_irn_reg(NULL, irn, sp); + be_node_set_irn_reg(irn, sp); return irn; } @@ -753,7 +699,7 @@ ir_node *be_new_AddSP(const arch_register_t *sp, ir_graph *irg, ir_node *bl, ir_ be_node_attr_t *a; ir_node *irn; ir_node *in[be_pos_AddSP_last]; - const arch_register_class_t *class; + const arch_register_class_t *cls; in[be_pos_AddSP_old_sp] = old_sp; in[be_pos_AddSP_size] = sz; @@ -770,8 +716,8 @@ ir_node *be_new_AddSP(const arch_register_t *sp, ir_graph *irg, ir_node *bl, ir_ be_set_constr_single_reg(irn, OUT_POS(pn_be_AddSP_sp), sp); a->reg_data[pn_be_AddSP_sp].reg = sp; - class = arch_register_get_class(sp); - be_node_set_reg_class(irn, OUT_POS(pn_be_AddSP_res), class); + cls = arch_register_get_class(sp); + be_node_set_reg_class(irn, OUT_POS(pn_be_AddSP_res), cls); return irn; } @@ -935,26 +881,9 @@ ir_node *be_new_Unwind(dbg_info *dbg, ir_graph *irg, ir_node *block, return res; } -int be_is_Spill (const ir_node *irn) { return be_get_irn_opcode(irn) == beo_Spill ; } -int be_is_Reload (const ir_node *irn) { return be_get_irn_opcode(irn) == beo_Reload ; } -int be_is_Copy (const ir_node *irn) { return be_get_irn_opcode(irn) == beo_Copy ; } -int be_is_CopyKeep (const ir_node *irn) { return be_get_irn_opcode(irn) == beo_CopyKeep ; } -int be_is_Perm (const ir_node *irn) { return be_get_irn_opcode(irn) == beo_Perm ; } -int be_is_MemPerm (const ir_node *irn) { return be_get_irn_opcode(irn) == beo_MemPerm ; } -int be_is_Keep (const ir_node *irn) { return be_get_irn_opcode(irn) == beo_Keep ; } -int be_is_Call (const ir_node *irn) { return be_get_irn_opcode(irn) == beo_Call ; } -int be_is_Return (const ir_node *irn) { return be_get_irn_opcode(irn) == beo_Return ; } -int be_is_IncSP (const ir_node *irn) { return be_get_irn_opcode(irn) == beo_IncSP ; } -int be_is_AddSP (const ir_node *irn) { return be_get_irn_opcode(irn) == beo_AddSP ; } -int be_is_SubSP (const ir_node *irn) { return be_get_irn_opcode(irn) == beo_SubSP ; } -int be_is_RegParams (const ir_node *irn) { return be_get_irn_opcode(irn) == beo_RegParams ; } -int be_is_FrameAddr (const ir_node *irn) { return be_get_irn_opcode(irn) == beo_FrameAddr ; } -int be_is_Barrier (const ir_node *irn) { return be_get_irn_opcode(irn) == beo_Barrier ; } -int be_is_Unwind (const ir_node *irn) { return be_get_irn_opcode(irn) == beo_Unwind ; } - int be_has_frame_entity(const ir_node *irn) { - switch (be_get_irn_opcode(irn)) { + switch (get_irn_opcode(irn)) { case beo_Spill: case beo_Reload: case beo_FrameAddr: @@ -1055,7 +984,7 @@ void be_set_constr_limited(ir_node *node, int pos, const arch_register_req_t *re arch_register_req_t *r = get_req(node, pos); assert(arch_register_req_is(req, limited)); - assert(! (req->type & (arch_register_req_type_should_be_same | arch_register_req_type_should_be_different))); + assert(!(req->type & (arch_register_req_type_should_be_same | arch_register_req_type_must_be_different))); memcpy(r, req, sizeof(r[0])); r->limited = rbitset_duplicate_obstack_alloc(obst, req->limited, req->cls->n_regs); } @@ -1191,11 +1120,10 @@ arch_register_req_t *get_in_reg_req(const ir_node *irn, int pos) } static const arch_register_req_t * -be_node_get_irn_reg_req(const void *self, const ir_node *irn, int pos) +be_node_get_irn_reg_req(const ir_node *irn, int pos) { int out_pos = pos; - (void) self; if (pos < 0) { if (get_irn_mode(irn) == mode_T) return arch_no_register_req; @@ -1219,42 +1147,46 @@ be_node_get_irn_reg_req(const void *self, const ir_node *irn, int pos) } const arch_register_t * -be_node_get_irn_reg(const void *self, const ir_node *irn) +be_node_get_irn_reg(const ir_node *irn) { be_reg_data_t *r; - (void) self; if (get_irn_mode(irn) == mode_T) return NULL; r = retrieve_reg_data(irn); return r->reg; } -static arch_irn_class_t be_node_classify(const void *self, const ir_node *irn) +static arch_irn_class_t be_node_classify(const ir_node *irn) { - redir_proj((const ir_node **) &irn); - - (void) self; - switch(be_get_irn_opcode(irn)) { -#define XXX(a,b) case beo_ ## a: return arch_irn_class_ ## b - XXX(Spill, spill); - XXX(Reload, reload); - XXX(Perm, perm); - XXX(Copy, copy); - XXX(Return, branch); +restart: + switch (get_irn_opcode(irn)) { +#define XXX(a,b) case a: return b + XXX(beo_Spill, arch_irn_class_spill); + XXX(beo_Reload, arch_irn_class_reload); + XXX(beo_Perm, arch_irn_class_perm); + XXX(beo_Copy, arch_irn_class_copy); + XXX(beo_Return, arch_irn_class_branch); #undef XXX + case iro_Proj: + irn = get_Proj_pred(irn); + if (is_Proj(irn)) { + assert(get_irn_mode(irn) == mode_T); + irn = get_Proj_pred(irn); + } + goto restart; + break; default: - return arch_irn_class_normal; + return arch_irn_class_normal; } return 0; } -static arch_irn_flags_t be_node_get_flags(const void *self, const ir_node *node) +static arch_irn_flags_t be_node_get_flags(const ir_node *node) { be_req_t *bereq; int pos = -1; - (void) self; if(is_Proj(node)) { pos = OUT_POS(get_Proj_proj(node)); @@ -1266,16 +1198,14 @@ static arch_irn_flags_t be_node_get_flags(const void *self, const ir_node *node) return bereq->flags; } -static ir_entity *be_node_get_frame_entity(const void *self, const ir_node *irn) +static ir_entity *be_node_get_frame_entity(const ir_node *irn) { - (void) self; return be_get_frame_entity(irn); } -static void be_node_set_frame_entity(const void *self, ir_node *irn, ir_entity *ent) +static void be_node_set_frame_entity(ir_node *irn, ir_entity *ent) { be_frame_attr_t *a; - (void) self; assert(be_has_frame_entity(irn)); @@ -1283,18 +1213,16 @@ static void be_node_set_frame_entity(const void *self, ir_node *irn, ir_entity * a->ent = ent; } -static void be_node_set_frame_offset(const void *self, ir_node *irn, int offset) +static void be_node_set_frame_offset(ir_node *irn, int offset) { - (void) self; if(be_has_frame_entity(irn)) { be_frame_attr_t *a = get_irn_attr(irn); a->offset = offset; } } -static int be_node_get_sp_bias(const void *self, const ir_node *irn) +static int be_node_get_sp_bias(const ir_node *irn) { - (void) self; if(be_is_IncSP(irn)) return be_get_IncSP_offset(irn); if(be_is_Call(irn)) @@ -1312,7 +1240,7 @@ static int be_node_get_sp_bias(const void *self, const ir_node *irn) */ -static const arch_irn_ops_if_t be_node_irn_ops_if = { +static const arch_irn_ops_t be_node_irn_ops = { be_node_get_irn_reg_req, be_node_set_irn_reg, be_node_get_irn_reg, @@ -1328,21 +1256,6 @@ static const arch_irn_ops_if_t be_node_irn_ops_if = { NULL, /* perform_memory_operand */ }; -static const arch_irn_ops_t be_node_irn_ops = { - &be_node_irn_ops_if -}; - -const void *be_node_get_irn_ops(const arch_irn_handler_t *self, const ir_node *irn) -{ - redir_proj((const ir_node **) &irn); - (void) self; - return is_be_node(irn) ? &be_node_irn_ops : NULL; -} - -const arch_irn_handler_t be_node_irn_handler = { - be_node_get_irn_ops -}; - /* ____ _ _ ___ ____ _ _ _ _ _ _ | _ \| |__ (_) |_ _| _ \| \ | | | | | | __ _ _ __ __| | | ___ _ __ @@ -1358,38 +1271,23 @@ typedef struct { arch_irn_flags_t flags; } phi_attr_t; -typedef struct { - arch_irn_handler_t irn_handler; - arch_irn_ops_t irn_ops; - const arch_env_t *arch_env; - pmap *phi_attrs; -} phi_handler_t; +struct { + arch_env_t *arch_env; + pmap *phi_attrs; +} phi_handler; -#define get_phi_handler_from_handler(h) container_of(h, phi_handler_t, irn_handler) #define get_phi_handler_from_ops(h) container_of(h, phi_handler_t, irn_ops) -static -const void *phi_get_irn_ops(const arch_irn_handler_t *handler, - const ir_node *irn) -{ - const phi_handler_t *h; - if(!is_Phi(irn) || !mode_is_datab(get_irn_mode(irn))) - return NULL; - - h = get_phi_handler_from_handler(handler); - return &h->irn_ops; -} - static INLINE -phi_attr_t *get_Phi_attr(const phi_handler_t *handler, const ir_node *phi) +phi_attr_t *get_Phi_attr(const ir_node *phi) { - phi_attr_t *attr = pmap_get(handler->phi_attrs, (void*) phi); + phi_attr_t *attr = pmap_get(phi_handler.phi_attrs, (void*) phi); if(attr == NULL) { ir_graph *irg = get_irn_irg(phi); struct obstack *obst = get_irg_obstack(irg); attr = obstack_alloc(obst, sizeof(attr[0])); memset(attr, 0, sizeof(attr[0])); - pmap_insert(handler->phi_attrs, phi, attr); + pmap_insert(phi_handler.phi_attrs, phi, attr); } return attr; @@ -1399,8 +1297,7 @@ phi_attr_t *get_Phi_attr(const phi_handler_t *handler, const ir_node *phi) * Get register class of a Phi. */ static -const arch_register_req_t *get_Phi_reg_req_recursive(const phi_handler_t *h, - const ir_node *phi, +const arch_register_req_t *get_Phi_reg_req_recursive(const ir_node *phi, pset **visited) { int n = get_irn_arity(phi); @@ -1415,7 +1312,7 @@ const arch_register_req_t *get_Phi_reg_req_recursive(const phi_handler_t *h, /* Matze: don't we unnecessary constraint our phis with this? * we only need to take the regclass IMO*/ if(!is_Phi(op)) - return arch_get_register_req(h->arch_env, op, BE_OUT_POS(0)); + return arch_get_register_req(phi_handler.arch_env, op, BE_OUT_POS(0)); } /* @@ -1430,7 +1327,7 @@ const arch_register_req_t *get_Phi_reg_req_recursive(const phi_handler_t *h, for(i = 0; i < n; ++i) { const arch_register_req_t *req; op = get_irn_n(phi, i); - req = get_Phi_reg_req_recursive(h, op, visited); + req = get_Phi_reg_req_recursive(op, visited); if(req != NULL) return req; } @@ -1439,23 +1336,20 @@ const arch_register_req_t *get_Phi_reg_req_recursive(const phi_handler_t *h, } static -const arch_register_req_t *phi_get_irn_reg_req(const void *self, - const ir_node *irn, int pos) +const arch_register_req_t *phi_get_irn_reg_req(const ir_node *irn, int pos) { - phi_handler_t *phi_handler = get_phi_handler_from_ops(self); phi_attr_t *attr; - (void) self; (void) pos; if(!mode_is_datab(get_irn_mode(irn))) return arch_no_register_req; - attr = get_Phi_attr(phi_handler, irn); + attr = get_Phi_attr(irn); if(attr->req.type == arch_register_req_type_none) { pset *visited = NULL; const arch_register_req_t *req; - req = get_Phi_reg_req_recursive(phi_handler, irn, &visited); + req = get_Phi_reg_req_recursive(irn, &visited); memcpy(&attr->req, req, sizeof(req[0])); assert(attr->req.cls != NULL); @@ -1471,98 +1365,78 @@ const arch_register_req_t *phi_get_irn_reg_req(const void *self, void be_set_phi_reg_req(const arch_env_t *arch_env, ir_node *node, const arch_register_req_t *req) { - const arch_irn_ops_t *ops = arch_get_irn_ops(arch_env, node); - const phi_handler_t *handler = get_phi_handler_from_ops(ops); phi_attr_t *attr; + (void) arch_env; assert(mode_is_datab(get_irn_mode(node))); - attr = get_Phi_attr(handler, node); + attr = get_Phi_attr(node); memcpy(&attr->req, req, sizeof(req[0])); } void be_set_phi_flags(const arch_env_t *arch_env, ir_node *node, arch_irn_flags_t flags) { - const arch_irn_ops_t *ops = arch_get_irn_ops(arch_env, node); - const phi_handler_t *handler = get_phi_handler_from_ops(ops); phi_attr_t *attr; + (void) arch_env; assert(mode_is_datab(get_irn_mode(node))); - attr = get_Phi_attr(handler, node); + attr = get_Phi_attr(node); attr->flags = flags; } -static -void phi_set_irn_reg(const void *self, ir_node *irn, const arch_register_t *reg) +static void phi_set_irn_reg(ir_node *irn, const arch_register_t *reg) { - phi_handler_t *h = get_phi_handler_from_ops(self); - phi_attr_t *attr = get_Phi_attr(h, irn); + phi_attr_t *attr = get_Phi_attr(irn); attr->reg = reg; } -static -const arch_register_t *phi_get_irn_reg(const void *self, const ir_node *irn) +static const arch_register_t *phi_get_irn_reg(const ir_node *irn) { - phi_handler_t *h = get_phi_handler_from_ops(self); - phi_attr_t *attr = get_Phi_attr(h, irn); + phi_attr_t *attr = get_Phi_attr(irn); return attr->reg; } -static -arch_irn_class_t phi_classify(const void *self, const ir_node *irn) +static arch_irn_class_t phi_classify(const ir_node *irn) { - (void) self; (void) irn; return arch_irn_class_normal; } -static -arch_irn_flags_t phi_get_flags(const void *self, const ir_node *irn) +static arch_irn_flags_t phi_get_flags(const ir_node *irn) { - phi_handler_t *h = get_phi_handler_from_ops(self); - phi_attr_t *attr = get_Phi_attr(h, irn); - (void) self; + phi_attr_t *attr = get_Phi_attr(irn); return attr->flags; } -static -ir_entity *phi_get_frame_entity(const void *self, const ir_node *irn) +static ir_entity *phi_get_frame_entity(const ir_node *irn) { - (void) self; (void) irn; return NULL; } -static -void phi_set_frame_entity(const void *self, ir_node *irn, ir_entity *ent) +static void phi_set_frame_entity(ir_node *irn, ir_entity *ent) { - (void) self; (void) irn; (void) ent; assert(0); } -static -void phi_set_frame_offset(const void *self, ir_node *irn, int bias) +static void phi_set_frame_offset(ir_node *irn, int bias) { - (void) self; (void) irn; (void) bias; assert(0); } -static -int phi_get_sp_bias(const void* self, const ir_node *irn) +static int phi_get_sp_bias(const ir_node *irn) { - (void) self; (void) irn; return 0; } -static -const arch_irn_ops_if_t phi_irn_ops = { +static const arch_irn_ops_t phi_irn_ops = { phi_get_irn_reg_req, phi_set_irn_reg, phi_get_irn_reg, @@ -1578,30 +1452,25 @@ const arch_irn_ops_if_t phi_irn_ops = { NULL, /* perform_memory_operand */ }; -arch_irn_handler_t *be_phi_handler_new(const arch_env_t *arch_env) +void be_phi_handler_new(be_main_env_t *env) { - phi_handler_t *h = xmalloc(sizeof(h[0])); - h->irn_handler.get_irn_ops = phi_get_irn_ops; - h->irn_ops.impl = &phi_irn_ops; - h->arch_env = arch_env; - h->phi_attrs = pmap_create(); - return (arch_irn_handler_t *) h; + phi_handler.arch_env = env->arch_env; + phi_handler.phi_attrs = pmap_create(); + op_Phi->ops.be_ops = &phi_irn_ops; } -void be_phi_handler_free(arch_irn_handler_t *handler) +void be_phi_handler_free(void) { - phi_handler_t *h = get_phi_handler_from_handler(handler); - pmap_destroy(h->phi_attrs); - h->phi_attrs = NULL; - free(handler); + pmap_destroy(phi_handler.phi_attrs); + phi_handler.phi_attrs = NULL; + op_Phi->ops.be_ops = NULL; } -void be_phi_handler_reset(arch_irn_handler_t *handler) +void be_phi_handler_reset(void) { - phi_handler_t *h = get_phi_handler_from_handler(handler); - if(h->phi_attrs) - pmap_destroy(h->phi_attrs); - h->phi_attrs = pmap_create(); + if(phi_handler.phi_attrs) + pmap_destroy(phi_handler.phi_attrs); + phi_handler.phi_attrs = pmap_create(); } /* @@ -1713,7 +1582,7 @@ static int dump_node(ir_node *irn, FILE *f, dump_reason_t reason) } - switch(be_get_irn_opcode(irn)) { + switch (get_irn_opcode(irn)) { case beo_IncSP: { be_incsp_attr_t *a = (be_incsp_attr_t *) at; @@ -1809,6 +1678,10 @@ static void copy_attr(const ir_node *old_node, ir_node *new_node) } static const ir_op_ops be_node_op_ops = { + firm_default_hash, + NULL, + NULL, + NULL, NULL, NULL, NULL, @@ -1821,5 +1694,55 @@ static const ir_op_ops be_node_op_ops = { NULL, NULL, dump_node, - NULL + NULL, + &be_node_irn_ops }; + +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; + + /* 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); + op_be_Perm = new_ir_op(beo_Perm, "be_Perm", op_pin_state_pinned, N, oparity_variable, 0, sizeof(be_node_attr_t), &be_node_op_ops); + op_be_MemPerm = new_ir_op(beo_MemPerm, "be_MemPerm", op_pin_state_pinned, N, oparity_variable, 0, sizeof(be_memperm_attr_t), &be_node_op_ops); + op_be_Copy = new_ir_op(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_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_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_Call, "be_Call", op_pin_state_pinned, F|M, oparity_variable, 0, sizeof(be_call_attr_t), &be_node_op_ops); + op_be_Return = new_ir_op(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_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_SubSP, "be_SubSP", op_pin_state_pinned, N, oparity_unary, 0, sizeof(be_node_attr_t), &be_node_op_ops); + op_be_IncSP = new_ir_op(beo_IncSP, "be_IncSP", op_pin_state_pinned, N, oparity_unary, 0, sizeof(be_incsp_attr_t), &be_node_op_ops); + op_be_RegParams = new_ir_op(beo_RegParams, "be_RegParams", op_pin_state_pinned, N, oparity_zero, 0, sizeof(be_node_attr_t), &be_node_op_ops); + op_be_FrameAddr = new_ir_op(beo_FrameAddr, "be_FrameAddr", op_pin_state_floats, N, oparity_unary, 0, sizeof(be_frame_attr_t), &be_node_op_ops); + op_be_Barrier = new_ir_op(beo_Barrier, "be_Barrier", op_pin_state_pinned, N, oparity_dynamic, 0, sizeof(be_node_attr_t), &be_node_op_ops); + op_be_Unwind = new_ir_op(beo_Unwind, "be_Unwind", op_pin_state_pinned, X, oparity_zero, 0, sizeof(be_node_attr_t), &be_node_op_ops); + + op_be_Spill->ops.node_cmp_attr = FrameAddr_cmp_attr; + op_be_Reload->ops.node_cmp_attr = FrameAddr_cmp_attr; + op_be_Perm->ops.node_cmp_attr = node_cmp_attr; + op_be_MemPerm->ops.node_cmp_attr = node_cmp_attr; + op_be_Copy->ops.node_cmp_attr = node_cmp_attr; + op_be_Keep->ops.node_cmp_attr = node_cmp_attr; + op_be_CopyKeep->ops.node_cmp_attr = node_cmp_attr; + op_be_Call->ops.node_cmp_attr = Call_cmp_attr; + op_be_Return->ops.node_cmp_attr = Return_cmp_attr; + op_be_AddSP->ops.node_cmp_attr = node_cmp_attr; + op_be_SubSP->ops.node_cmp_attr = node_cmp_attr; + op_be_IncSP->ops.node_cmp_attr = IncSP_cmp_attr; + op_be_RegParams->ops.node_cmp_attr = node_cmp_attr; + op_be_FrameAddr->ops.node_cmp_attr = FrameAddr_cmp_attr; + op_be_Barrier->ops.node_cmp_attr = node_cmp_attr; + op_be_Unwind->ops.node_cmp_attr = node_cmp_attr; +}