X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbenode.c;h=2e3df6aec0d74ab56a7d949816d23a948bc08e60;hb=8a8b2522aac4612a24d51fc514e782a1f8b6f3f4;hp=f4731f7977485b7f20caa41862b3ccc48e5d6f2d;hpb=7a689378511110240ac68f78e20316dc51814c1b;p=libfirm diff --git a/ir/be/benode.c b/ir/be/benode.c index f4731f797..2e3df6aec 100644 --- a/ir/be/benode.c +++ b/ir/be/benode.c @@ -163,23 +163,23 @@ void be_node_init(void) { /* Acquire all needed opcodes. */ beo_base = get_next_ir_opcodes(beo_Last - 1); - op_be_Spill = new_ir_op(beo_base + beo_Spill, "Spill", op_pin_state_mem_pinned, N, oparity_unary, 0, sizeof(be_spill_attr_t), &be_node_op_ops); - op_be_Reload = new_ir_op(beo_base + beo_Reload, "Reload", op_pin_state_mem_pinned, N, oparity_zero, 0, sizeof(be_frame_attr_t), &be_node_op_ops); - op_be_Perm = new_ir_op(beo_base + beo_Perm, "Perm", op_pin_state_pinned, N, oparity_variable, 0, sizeof(be_node_attr_t), &be_node_op_ops); - op_be_Copy = new_ir_op(beo_base + beo_Copy, "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, "Keep", op_pin_state_pinned, K, oparity_variable, 0, sizeof(be_node_attr_t), &be_node_op_ops); - op_be_CopyKeep = new_ir_op(beo_base + beo_CopyKeep, "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, "Call", op_pin_state_pinned, N, oparity_variable, 0, sizeof(be_call_attr_t), &be_node_op_ops); - op_be_Return = new_ir_op(beo_base + beo_Return, "Return", op_pin_state_pinned, X, oparity_variable, 0, sizeof(be_node_attr_t), &be_node_op_ops); - op_be_AddSP = new_ir_op(beo_base + beo_AddSP, "AddSP", op_pin_state_pinned, N, oparity_unary, 0, sizeof(be_node_attr_t), &be_node_op_ops); - op_be_SetSP = new_ir_op(beo_base + beo_SetSP, "SetSP", op_pin_state_pinned, N, oparity_binary, 0, sizeof(be_stack_attr_t), &be_node_op_ops); - op_be_IncSP = new_ir_op(beo_base + beo_IncSP, "IncSP", op_pin_state_pinned, N, oparity_binary, 0, sizeof(be_stack_attr_t), &be_node_op_ops); - op_be_RegParams = new_ir_op(beo_base + beo_RegParams, "RegParams", op_pin_state_pinned, N, oparity_zero, 0, sizeof(be_node_attr_t), &be_node_op_ops); - op_be_StackParam = new_ir_op(beo_base + beo_StackParam, "StackParam", op_pin_state_pinned, N, oparity_unary, 0, sizeof(be_frame_attr_t), &be_node_op_ops); - op_be_FrameAddr = new_ir_op(beo_base + beo_FrameAddr, "FrameAddr", op_pin_state_pinned, N, oparity_binary, 0, sizeof(be_frame_attr_t), &be_node_op_ops); - op_be_FrameLoad = new_ir_op(beo_base + beo_FrameLoad, "FrameLoad", op_pin_state_pinned, N, oparity_any, 0, sizeof(be_frame_attr_t), &be_node_op_ops); - op_be_FrameStore = new_ir_op(beo_base + beo_FrameStore, "FrameStore", op_pin_state_pinned, N, oparity_any, 0, sizeof(be_frame_attr_t), &be_node_op_ops); - op_be_Barrier = new_ir_op(beo_base + beo_Barrier, "Barrier", op_pin_state_pinned, N, oparity_any, 0, sizeof(be_node_attr_t), &be_node_op_ops); + op_be_Spill = new_ir_op(beo_base + beo_Spill, "be_Spill", op_pin_state_mem_pinned, N, oparity_unary, 0, sizeof(be_spill_attr_t), &be_node_op_ops); + op_be_Reload = new_ir_op(beo_base + beo_Reload, "be_Reload", op_pin_state_mem_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_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_variable, 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, N, 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_variable, 0, sizeof(be_node_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_SetSP = new_ir_op(beo_base + beo_SetSP, "be_SetSP", op_pin_state_pinned, N, oparity_binary, 0, sizeof(be_stack_attr_t), &be_node_op_ops); + op_be_IncSP = new_ir_op(beo_base + beo_IncSP, "be_IncSP", op_pin_state_pinned, N, oparity_binary, 0, sizeof(be_stack_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_StackParam = new_ir_op(beo_base + beo_StackParam, "be_StackParam", op_pin_state_pinned, N, oparity_unary, 0, sizeof(be_frame_attr_t), &be_node_op_ops); + op_be_FrameAddr = new_ir_op(beo_base + beo_FrameAddr, "be_FrameAddr", op_pin_state_pinned, N, oparity_binary, 0, sizeof(be_frame_attr_t), &be_node_op_ops); + op_be_FrameLoad = new_ir_op(beo_base + beo_FrameLoad, "be_FrameLoad", op_pin_state_pinned, N, oparity_any, 0, sizeof(be_frame_attr_t), &be_node_op_ops); + op_be_FrameStore = new_ir_op(beo_base + beo_FrameStore, "be_FrameStore", op_pin_state_pinned, N, oparity_any, 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_any, 0, sizeof(be_node_attr_t), &be_node_op_ops); set_op_tag(op_be_Spill, &be_node_tag); set_op_tag(op_be_Reload, &be_node_tag); @@ -335,6 +335,10 @@ ir_node *be_new_Copy(const arch_register_class_t *cls, ir_graph *irg, ir_node *b return res; } +ir_node *be_get_Copy_op(const ir_node *cpy) { + return get_irn_n(cpy, be_pos_Copy_op); +} + ir_node *be_new_Keep(const arch_register_class_t *cls, ir_graph *irg, ir_node *bl, int n, ir_node *in[]) { int i; @@ -611,9 +615,9 @@ int be_has_frame_entity(const ir_node *irn) case beo_FrameLoad: case beo_FrameAddr: return 1; + default: + return 0; } - - return 0; } entity *be_get_frame_entity(const ir_node *irn) @@ -705,6 +709,11 @@ void be_node_set_req_type(ir_node *irn, int pos, arch_register_req_type_t type) r->req.type = type; } +ir_node *be_get_IncSP_pred(ir_node *irn) { + assert(be_is_IncSP(irn)); + return get_irn_n(irn, 0); +} + void be_set_IncSP_offset(ir_node *irn, unsigned offset) { be_stack_attr_t *a = get_irn_attr(irn); @@ -787,8 +796,6 @@ static INLINE ir_node *find_a_spill(const ir_node *irn) entity *be_get_spill_entity(const ir_node *irn) { - int opc = get_irn_opcode(irn); - switch(be_get_irn_opcode(irn)) { case beo_Reload: { @@ -856,7 +863,7 @@ ir_node *be_spill(const arch_env_t *arch_env, ir_node *irn, ir_node *ctx) */ insert = sched_next(irn); - if(bl == get_irg_start_block(irg) && insert != bl && sched_get_time_step(frame) >= sched_get_time_step(insert)) + if(insert != bl && bl == get_irg_start_block(irg) && sched_get_time_step(frame) >= sched_get_time_step(insert)) insert = sched_next(frame); while((is_Phi(insert) || is_Proj(insert)) && !sched_is_end(insert)) @@ -910,7 +917,7 @@ static void *put_out_reg_req(arch_register_req_t *req, const ir_node *irn, int o if(be_is_Copy(irn)) { req->type |= arch_register_req_type_should_be_same; - req->other_same = get_irn_n(irn, be_pos_Copy_orig); + req->other_same = be_get_Copy_op(irn); } } else { @@ -924,7 +931,6 @@ static void *put_out_reg_req(arch_register_req_t *req, const ir_node *irn, int o static void *put_in_reg_req(arch_register_req_t *req, const ir_node *irn, int pos) { const be_node_attr_t *a = get_irn_attr(irn); - int n = get_irn_arity(irn); if(pos < get_irn_arity(irn) && pos < a->max_reg_data) memcpy(req, &a->reg_data[pos].in_req, sizeof(req[0])); @@ -977,11 +983,12 @@ static arch_irn_class_t be_node_classify(const void *_self, const ir_node *irn) redir_proj((const ir_node **) &irn, -1); 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) +#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); #undef XXX default: return 0; @@ -1083,7 +1090,6 @@ static const arch_register_req_t *get_Phi_reg_req_recursive(const phi_handler_t { int n = get_irn_arity(phi); ir_node *op; - int done = 0; int i; if(*visited && pset_find_ptr(*visited, phi)) @@ -1299,8 +1305,11 @@ static int dump_node(ir_node *irn, FILE *f, dump_reason_t reason) if(be_has_frame_entity(irn)) { be_frame_attr_t *a = (be_frame_attr_t *) at; - if (a->ent) - ir_fprintf(f, "frame entity: %+F offset %x (%d)\n", a->ent, a->offset, a->offset); + if (a->ent) { + int bits = get_type_size_bits(get_entity_type(a->ent)); + ir_fprintf(f, "frame entity: %+F offset 0x%x (%d) size 0x%x %d\n", + a->ent, a->offset, a->offset, bits, bits); + } } @@ -1319,6 +1328,8 @@ static int dump_node(ir_node *irn, FILE *f, dump_reason_t reason) fprintf(f, "direction: %s\n", a->dir == be_stack_dir_expand ? "expand" : "shrink"); } break; + default: + break; } }