X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbenode.c;h=48386ca08009fd970b09b4e4b081610691736cb4;hb=0a7d7324b9baa076d1322e82b92f8fc2c8f1892e;hp=fa2c136ae68ebeb15f0a2ba3147156068b8249c4;hpb=6bb28287b0f135a4dda410e2caa974997a5c6a21;p=libfirm diff --git a/ir/be/benode.c b/ir/be/benode.c index fa2c136ae..48386ca08 100644 --- a/ir/be/benode.c +++ b/ir/be/benode.c @@ -239,15 +239,6 @@ static void init_node_attr(ir_node *node, int n_inputs, int n_outputs) } } -static void add_register_req_out(ir_node *node) -{ - backend_info_t *info = be_get_info(node); - reg_out_info_t out_info; - memset(&out_info, 0, sizeof(out_info)); - out_info.req = arch_no_register_req; - ARR_APP1(reg_out_info_t, info->out_infos, out_info); -} - static void add_register_req_in(ir_node *node) { backend_info_t *info = be_get_info(node); @@ -572,14 +563,9 @@ ir_node *be_new_Return(dbg_info *dbg, ir_graph *irg, ir_node *block, int n_res, { be_return_attr_t *a; ir_node *res; - int i; - res = new_ir_node(dbg, irg, block, op_be_Return, mode_X, -1, NULL); - init_node_attr(res, -1, 1); - for (i = 0; i < n; ++i) { - add_irn_n(res, in[i]); - add_register_req_in(res); - } + res = new_ir_node(dbg, irg, block, op_be_Return, mode_X, n, in); + init_node_attr(res, n, 1); be_set_constr_out(res, 0, arch_no_register_req); a = (be_return_attr_t*)get_irn_generic_attr(res); @@ -615,16 +601,6 @@ void be_Return_set_emit_pop(ir_node *ret, int emit_pop) a->emit_pop = emit_pop; } -int be_Return_append_node(ir_node *ret, ir_node *node) -{ - int pos; - - pos = add_irn_n(ret, node); - add_register_req_in(ret); - - return pos; -} - ir_node *be_new_IncSP(const arch_register_t *sp, ir_node *bl, ir_node *old_sp, int offset, int align) { @@ -704,17 +680,13 @@ ir_node *be_new_SubSP(const arch_register_t *sp, ir_node *bl, ir_node *old_sp, i ir_node *be_new_Start(dbg_info *dbgi, ir_node *bl, int n_outs) { ir_node *res; - int i; ir_graph *irg = get_Block_irg(bl); be_node_attr_t *attr; res = new_ir_node(dbgi, irg, bl, op_be_Start, mode_T, 0, NULL); - init_node_attr(res, 0, -1); + init_node_attr(res, 0, n_outs); attr = (be_node_attr_t*) get_irn_generic_attr(res); attr->exc.pin_state = op_pin_state_pinned; - for (i = 0; i < n_outs; ++i) { - add_register_req_out(res); - } return res; } @@ -1039,7 +1011,6 @@ ir_node *be_get_initial_reg_value(ir_graph *irg, const arch_register_t *reg) int i = get_start_reg_index(irg, reg); ir_node *start = get_irg_start(irg); ir_mode *mode = arch_register_class_mode(arch_register_get_class(reg)); - const ir_edge_t *edge; foreach_out_edge(start, edge) { ir_node *proj = get_edge_src_irn(edge); @@ -1080,7 +1051,7 @@ static void dummy_set_frame_offset(ir_node *node, int bias) { (void) node; (void) bias; - panic("dummy_set_frame_offset() should not be called"); + panic("should not be called"); } static int dummy_get_sp_bias(const ir_node *node) @@ -1103,9 +1074,8 @@ static const arch_irn_ops_t dummy_be_irn_ops = { ir_node *be_new_Phi(ir_node *block, int n_ins, ir_node **ins, ir_mode *mode, - const arch_register_class_t *cls) + const arch_register_req_t *req) { - const arch_register_req_t *req; ir_graph *irg = get_irn_irg(block); struct obstack *obst = be_get_be_obst(irg); backend_info_t *info; @@ -1117,11 +1087,6 @@ ir_node *be_new_Phi(ir_node *block, int n_ins, ir_node **ins, ir_mode *mode, memset(info->out_infos, 0, 1 * sizeof(info->out_infos[0])); info->in_reqs = OALLOCN(obst, const arch_register_req_t*, n_ins); - if (cls == NULL) { - req = arch_no_register_req; - } else { - req = cls->class_req; - } info->out_infos[0].req = req; for (i = 0; i < n_ins; ++i) { info->in_reqs[i] = req; @@ -1305,31 +1270,21 @@ static void copy_attr(ir_graph *irg, 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, - NULL, - NULL, - copy_attr, - NULL, - NULL, - NULL, - NULL, - dump_node, - 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; } +static ir_op *new_be_op(unsigned code, const char *name, op_pin_state p, + irop_flags flags, op_arity opar, size_t attr_size) +{ + ir_op *res = new_ir_op(code, name, p, flags, opar, 0, attr_size); + res->ops.dump_node = dump_node; + res->ops.copy_attr = copy_attr; + res->ops.be_ops = &be_node_irn_ops; + return res; +} + void be_init_op(void) { unsigned opc; @@ -1337,22 +1292,22 @@ void be_init_op(void) assert(op_be_Spill == NULL); /* Acquire all needed opcodes. */ - op_be_Spill = new_ir_op(beo_Spill, "be_Spill", op_pin_state_exc_pinned, irop_flag_none, 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_exc_pinned, irop_flag_none, 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_exc_pinned, irop_flag_none, 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_exc_pinned, irop_flag_none, 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_exc_pinned, irop_flag_none, 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_exc_pinned, irop_flag_keep, 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_exc_pinned, irop_flag_keep, 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_exc_pinned, irop_flag_fragile|irop_flag_uses_memory, oparity_variable, 0, sizeof(be_call_attr_t), &be_node_op_ops); + op_be_Spill = new_be_op(beo_Spill, "be_Spill", op_pin_state_exc_pinned, irop_flag_none, oparity_unary, sizeof(be_frame_attr_t)); + op_be_Reload = new_be_op(beo_Reload, "be_Reload", op_pin_state_exc_pinned, irop_flag_none, oparity_zero, sizeof(be_frame_attr_t)); + op_be_Perm = new_be_op(beo_Perm, "be_Perm", op_pin_state_exc_pinned, irop_flag_none, oparity_variable, sizeof(be_node_attr_t)); + op_be_MemPerm = new_be_op(beo_MemPerm, "be_MemPerm", op_pin_state_exc_pinned, irop_flag_none, oparity_variable, sizeof(be_memperm_attr_t)); + op_be_Copy = new_be_op(beo_Copy, "be_Copy", op_pin_state_exc_pinned, irop_flag_none, oparity_unary, sizeof(be_node_attr_t)); + op_be_Keep = new_be_op(beo_Keep, "be_Keep", op_pin_state_exc_pinned, irop_flag_keep, oparity_dynamic, sizeof(be_node_attr_t)); + op_be_CopyKeep = new_be_op(beo_CopyKeep, "be_CopyKeep", op_pin_state_exc_pinned, irop_flag_keep, oparity_variable, sizeof(be_node_attr_t)); + op_be_Call = new_be_op(beo_Call, "be_Call", op_pin_state_exc_pinned, irop_flag_fragile|irop_flag_uses_memory, oparity_variable, sizeof(be_call_attr_t)); ir_op_set_memory_index(op_be_Call, n_be_Call_mem); ir_op_set_fragile_indices(op_be_Call, pn_be_Call_X_regular, pn_be_Call_X_except); - op_be_Return = new_ir_op(beo_Return, "be_Return", op_pin_state_exc_pinned, irop_flag_cfopcode, 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_exc_pinned, irop_flag_none, 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_exc_pinned, irop_flag_none, 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_exc_pinned, irop_flag_none, oparity_unary, 0, sizeof(be_incsp_attr_t), &be_node_op_ops); - op_be_Start = new_ir_op(beo_Start, "be_Start", op_pin_state_exc_pinned, irop_flag_none, 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_exc_pinned, irop_flag_none, oparity_unary, 0, sizeof(be_frame_attr_t), &be_node_op_ops); + op_be_Return = new_be_op(beo_Return, "be_Return", op_pin_state_exc_pinned, irop_flag_cfopcode, oparity_variable, sizeof(be_return_attr_t)); + op_be_AddSP = new_be_op(beo_AddSP, "be_AddSP", op_pin_state_exc_pinned, irop_flag_none, oparity_unary, sizeof(be_node_attr_t)); + op_be_SubSP = new_be_op(beo_SubSP, "be_SubSP", op_pin_state_exc_pinned, irop_flag_none, oparity_unary, sizeof(be_node_attr_t)); + op_be_IncSP = new_be_op(beo_IncSP, "be_IncSP", op_pin_state_exc_pinned, irop_flag_none, oparity_unary, sizeof(be_incsp_attr_t)); + op_be_Start = new_be_op(beo_Start, "be_Start", op_pin_state_exc_pinned, irop_flag_none, oparity_zero, sizeof(be_node_attr_t)); + op_be_FrameAddr = new_be_op(beo_FrameAddr, "be_FrameAddr", op_pin_state_exc_pinned, irop_flag_none, oparity_unary, sizeof(be_frame_attr_t)); op_be_Spill->ops.node_cmp_attr = FrameAddr_cmp_attr; op_be_Reload->ops.node_cmp_attr = FrameAddr_cmp_attr;