X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbenode.c;h=6fca119a62f79f90608904f7bf2cf6a9fa6cdfa7;hb=e6ad8ee4680a88db8652483c2c6f3124f3d9a888;hp=5f4a84865f4aa58d800e6370c4040c0267a9d26f;hpb=2ece86b79c276dafee7e751234292e6aa584f7cc;p=libfirm diff --git a/ir/be/benode.c b/ir/be/benode.c index 5f4a84865..6fca119a6 100644 --- a/ir/be/benode.c +++ b/ir/be/benode.c @@ -30,6 +30,7 @@ #include "irnode_t.h" #include "ircons_t.h" #include "irprintf.h" +#include "irgwalk.h" #include "be_t.h" #include "belive_t.h" @@ -99,26 +100,31 @@ typedef struct { int offset; } be_frame_attr_t; +typedef struct { + be_node_attr_t node_attr; + entity *ent; +} be_call_attr_t; + typedef struct { be_frame_attr_t frame_attr; ir_node *spill_ctx; /**< The node in whose context this spill was introduced. */ } be_spill_attr_t; -static ir_op *op_Spill; -static ir_op *op_Reload; -static ir_op *op_Perm; -static ir_op *op_Copy; -static ir_op *op_Keep; -static ir_op *op_Call; -static ir_op *op_Return; -static ir_op *op_IncSP; -static ir_op *op_AddSP; -static ir_op *op_SetSP; -static ir_op *op_RegParams; -static ir_op *op_StackParam; -static ir_op *op_FrameAddr; -static ir_op *op_FrameLoad; -static ir_op *op_FrameStore; +ir_op *op_be_Spill; +ir_op *op_be_Reload; +ir_op *op_be_Perm; +ir_op *op_be_Copy; +ir_op *op_be_Keep; +ir_op *op_be_Call; +ir_op *op_be_Return; +ir_op *op_be_IncSP; +ir_op *op_be_Alloca; +ir_op *op_be_SetSP; +ir_op *op_be_RegParams; +ir_op *op_be_StackParam; +ir_op *op_be_FrameAddr; +ir_op *op_be_FrameLoad; +ir_op *op_be_FrameStore; static int beo_base = -1; @@ -146,37 +152,37 @@ void be_node_init(void) { /* Acquire all needed opcodes. */ beo_base = get_next_ir_opcodes(beo_Last - 1); - op_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_Reload = new_ir_op(beo_base + beo_Reload, "Reload", op_pin_state_mem_pinned, N, oparity_zero, 0, sizeof(be_node_attr_t), &be_node_op_ops); - op_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_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_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_Call = new_ir_op(beo_base + beo_Call, "Call", op_pin_state_pinned, N, oparity_variable, 0, sizeof(be_node_attr_t), &be_node_op_ops); - op_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_AddSP = new_ir_op(beo_base + beo_AddSP, "AddSP", op_pin_state_pinned, N, oparity_unary, 0, sizeof(be_stack_attr_t), &be_node_op_ops); - op_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_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_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_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_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_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_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); - - set_op_tag(op_Spill, &be_node_tag); - set_op_tag(op_Reload, &be_node_tag); - set_op_tag(op_Perm, &be_node_tag); - set_op_tag(op_Copy, &be_node_tag); - set_op_tag(op_Keep, &be_node_tag); - set_op_tag(op_Call, &be_node_tag); - set_op_tag(op_Return, &be_node_tag); - set_op_tag(op_AddSP, &be_node_tag); - set_op_tag(op_SetSP, &be_node_tag); - set_op_tag(op_IncSP, &be_node_tag); - set_op_tag(op_RegParams, &be_node_tag); - set_op_tag(op_StackParam, &be_node_tag); - set_op_tag(op_FrameLoad, &be_node_tag); - set_op_tag(op_FrameStore, &be_node_tag); - set_op_tag(op_FrameAddr, &be_node_tag); + 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_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_Alloca = new_ir_op(beo_base + beo_Alloca, "Alloca", 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); + + set_op_tag(op_be_Spill, &be_node_tag); + set_op_tag(op_be_Reload, &be_node_tag); + set_op_tag(op_be_Perm, &be_node_tag); + set_op_tag(op_be_Copy, &be_node_tag); + set_op_tag(op_be_Keep, &be_node_tag); + set_op_tag(op_be_Call, &be_node_tag); + set_op_tag(op_be_Return, &be_node_tag); + set_op_tag(op_be_Alloca, &be_node_tag); + set_op_tag(op_be_SetSP, &be_node_tag); + set_op_tag(op_be_IncSP, &be_node_tag); + set_op_tag(op_be_RegParams, &be_node_tag); + set_op_tag(op_be_StackParam, &be_node_tag); + set_op_tag(op_be_FrameLoad, &be_node_tag); + set_op_tag(op_be_FrameStore, &be_node_tag); + set_op_tag(op_be_FrameAddr, &be_node_tag); } static void *init_node_attr(ir_node* irn, int max_reg_data) @@ -184,6 +190,7 @@ static void *init_node_attr(ir_node* irn, int max_reg_data) ir_graph *irg = get_irn_irg(irn); be_node_attr_t *a = get_irn_attr(irn); + memset(a, 0, sizeof(get_op_attr_size(get_irn_op(irn)))); a->max_reg_data = max_reg_data; a->reg_data = NULL; @@ -216,8 +223,14 @@ static int redir_proj(const ir_node **node, int pos) const ir_node *n = *node; if(is_Proj(n)) { + ir_node *irn; + assert(pos == -1 && "Illegal pos for a Proj"); - *node = get_Proj_pred(n); + *node = irn = get_Proj_pred(n); + if(is_Proj(irn)) { + assert(get_irn_mode(irn) == mode_T); + *node = get_Proj_pred(irn); + } return get_Proj_proj(n); } @@ -247,7 +260,7 @@ ir_node *be_new_Spill(const arch_register_class_t *cls, const arch_register_clas in[0] = frame; in[1] = to_spill; - res = new_ir_node(NULL, irg, bl, op_Spill, mode_M, 2, in); + res = new_ir_node(NULL, irg, bl, op_be_Spill, mode_M, 2, in); a = init_node_attr(res, 2); a->frame_attr.ent = NULL; a->frame_attr.offset = 0; @@ -265,7 +278,7 @@ ir_node *be_new_Reload(const arch_register_class_t *cls, const arch_register_cla in[0] = frame; in[1] = mem; - res = new_ir_node(NULL, irg, bl, op_Reload, mode, 2, in); + res = new_ir_node(NULL, irg, bl, op_be_Reload, mode, 2, in); init_node_attr(res, 2); be_node_set_reg_class(res, 0, cls_frame); be_node_set_reg_class(res, -1, cls); @@ -281,7 +294,7 @@ ir_node *(be_get_Reload_mem)(const ir_node *irn) ir_node *be_new_Perm(const arch_register_class_t *cls, ir_graph *irg, ir_node *bl, int n, ir_node *in[]) { int i; - ir_node *irn = new_ir_node(NULL, irg, bl, op_Perm, mode_T, n, in); + ir_node *irn = new_ir_node(NULL, irg, bl, op_be_Perm, mode_T, n, in); init_node_attr(irn, n); for(i = 0; i < n; ++i) { be_node_set_reg_class(irn, i, cls); @@ -297,7 +310,7 @@ ir_node *be_new_Copy(const arch_register_class_t *cls, ir_graph *irg, ir_node *b ir_node *res; in[0] = op; - res = new_ir_node(NULL, irg, bl, op_Copy, get_irn_mode(op), 1, in); + res = new_ir_node(NULL, irg, bl, op_be_Copy, get_irn_mode(op), 1, in); init_node_attr(res, 1); be_node_set_reg_class(res, 0, cls); be_node_set_reg_class(res, OUT_POS(0), cls); @@ -309,7 +322,7 @@ ir_node *be_new_Keep(const arch_register_class_t *cls, ir_graph *irg, ir_node *b int i; ir_node *irn; - irn = new_ir_node(NULL, irg, bl, op_Keep, mode_ANY, n, in); + irn = new_ir_node(NULL, irg, bl, op_be_Keep, mode_ANY, n, in); init_node_attr(irn, n); for(i = 0; i < n; ++i) { be_node_set_reg_class(irn, i, cls); @@ -331,14 +344,28 @@ ir_node *be_new_Call(ir_graph *irg, ir_node *bl, ir_node *mem, ir_node *sp, ir_n real_in[2] = ptr; memcpy(&real_in[3], in, n * sizeof(in[0])); - irn = new_ir_node(NULL, irg, bl, op_Call, mode_T, real_n, real_in); + irn = new_ir_node(NULL, irg, bl, op_be_Call, mode_T, real_n, real_in); init_node_attr(irn, (n_outs > real_n ? n_outs : real_n)); return irn; } +entity *be_Call_get_entity(const ir_node *call) +{ + be_call_attr_t *a = get_irn_attr(call); + assert(be_is_Call(call)); + return a->ent; +} + +void be_Call_set_entity(ir_node *call, entity *ent) +{ + be_call_attr_t *a = get_irn_attr(call); + assert(be_is_Call(call)); + a->ent = ent; +} + ir_node *be_new_Return(ir_graph *irg, ir_node *bl, int n, ir_node *in[]) { - ir_node *irn = new_ir_node(NULL, irg, bl, op_Return, mode_X, n, in); + ir_node *irn = new_ir_node(NULL, irg, bl, op_be_Return, mode_X, n, in); init_node_attr(irn, n); return irn; @@ -352,7 +379,7 @@ ir_node *be_new_IncSP(const arch_register_t *sp, ir_graph *irg, ir_node *bl, ir_ in[0] = old_sp; in[1] = mem; - irn = new_ir_node(NULL, irg, bl, op_IncSP, sp->reg_class->mode, 2, in); + irn = new_ir_node(NULL, irg, bl, op_be_IncSP, sp->reg_class->mode, 2, in); a = init_node_attr(irn, 1); a->dir = dir; a->offset = offset; @@ -367,22 +394,22 @@ ir_node *be_new_IncSP(const arch_register_t *sp, ir_graph *irg, ir_node *bl, ir_ return irn; } -ir_node *be_new_AddSP(const arch_register_t *sp, ir_graph *irg, ir_node *bl, ir_node *old_sp, ir_node *op) +ir_node *be_new_Alloca(const arch_register_t *sp, ir_graph *irg, ir_node *bl, ir_node *mem, ir_node *old_sp, ir_node *sz) { be_node_attr_t *a; ir_node *irn; - ir_node *in[2]; + ir_node *in[3]; - in[0] = old_sp; - in[1] = op; - irn = new_ir_node(NULL, irg, bl, op_AddSP, sp->reg_class->mode, 2, in); - a = init_node_attr(irn, 1); + in[0] = mem; + in[1] = old_sp; + in[2] = sz; + irn = new_ir_node(NULL, irg, bl, op_be_Alloca, mode_T, 3, in); + a = init_node_attr(irn, 3); - be_node_set_flags(irn, OUT_POS(0), arch_irn_flags_ignore); + be_node_set_flags(irn, OUT_POS(pn_Alloc_res), arch_irn_flags_ignore); /* Set output constraint to stack register. */ - be_set_constr_single_reg(irn, OUT_POS(0), sp); - be_node_set_irn_reg(NULL, irn, sp); + be_set_constr_single_reg(irn, OUT_POS(pn_Alloc_res), sp); return irn; } @@ -396,7 +423,7 @@ ir_node *be_new_SetSP(const arch_register_t *sp, ir_graph *irg, ir_node *bl, ir_ in[0] = mem; in[1] = old_sp; in[2] = op; - irn = new_ir_node(NULL, irg, bl, op_SetSP, get_irn_mode(old_sp), 3, in); + irn = new_ir_node(NULL, irg, bl, op_be_SetSP, get_irn_mode(old_sp), 3, in); a = init_node_attr(irn, 3); be_node_set_flags(irn, OUT_POS(0), arch_irn_flags_ignore); @@ -417,7 +444,7 @@ ir_node *be_new_StackParam(const arch_register_class_t *cls, const arch_register ir_node *in[1]; in[0] = frame_pointer; - irn = new_ir_node(NULL, irg, bl, op_StackParam, mode, 1, in); + irn = new_ir_node(NULL, irg, bl, op_be_StackParam, mode, 1, in); a = init_node_attr(irn, 1); a->ent = ent; @@ -431,7 +458,7 @@ ir_node *be_new_RegParams(ir_graph *irg, ir_node *bl, int n_outs) ir_node *irn; ir_node *in[1]; - irn = new_ir_node(NULL, irg, bl, op_RegParams, mode_T, 0, in); + irn = new_ir_node(NULL, irg, bl, op_be_RegParams, mode_T, 0, in); init_node_attr(irn, n_outs); return irn; } @@ -445,7 +472,7 @@ ir_node *be_new_FrameLoad(const arch_register_class_t *cls_frame, const arch_reg in[0] = mem; in[1] = frame; - irn = new_ir_node(NULL, irg, bl, op_FrameLoad, mode_T, 2, in); + irn = new_ir_node(NULL, irg, bl, op_be_FrameLoad, mode_T, 2, in); a = init_node_attr(irn, 3); a->ent = ent; a->offset = 0; @@ -464,7 +491,7 @@ ir_node *be_new_FrameStore(const arch_register_class_t *cls_frame, const arch_re in[0] = mem; in[1] = frame; in[2] = data; - irn = new_ir_node(NULL, irg, bl, op_FrameStore, mode_T, 3, in); + irn = new_ir_node(NULL, irg, bl, op_be_FrameStore, mode_T, 3, in); a = init_node_attr(irn, 3); a->ent = ent; a->offset = 0; @@ -480,7 +507,7 @@ ir_node *be_new_FrameAddr(const arch_register_class_t *cls_frame, ir_graph *irg, ir_node *in[1]; in[0] = frame; - irn = new_ir_node(NULL, irg, bl, op_FrameAddr, get_irn_mode(frame), 1, in); + irn = new_ir_node(NULL, irg, bl, op_be_FrameAddr, get_irn_mode(frame), 1, in); a = init_node_attr(irn, 1); a->ent = ent; a->offset = 0; @@ -498,7 +525,7 @@ int be_is_Call (const ir_node *irn) { return be_get_irn_opcode(irn) == 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_SetSP (const ir_node *irn) { return be_get_irn_opcode(irn) == beo_SetSP ; } -int be_is_AddSP (const ir_node *irn) { return be_get_irn_opcode(irn) == beo_AddSP ; } +int be_is_Alloca (const ir_node *irn) { return be_get_irn_opcode(irn) == beo_Alloca ; } int be_is_RegParams (const ir_node *irn) { return be_get_irn_opcode(irn) == beo_RegParams ; } int be_is_StackParam (const ir_node *irn) { return be_get_irn_opcode(irn) == beo_StackParam ; } int be_is_FrameAddr (const ir_node *irn) { return be_get_irn_opcode(irn) == beo_FrameAddr ; } @@ -510,6 +537,7 @@ int be_has_frame_entity(const ir_node *irn) switch(be_get_irn_opcode(irn)) { case beo_StackParam: case beo_Spill: + case beo_Reload: case beo_FrameStore: case beo_FrameLoad: case beo_FrameAddr: @@ -525,10 +553,6 @@ entity *be_get_frame_entity(const ir_node *irn) be_frame_attr_t *a = get_irn_attr(irn); return a->ent; } - - else if(be_get_irn_opcode(irn) == beo_Reload) - return be_get_spill_entity(irn); - return NULL; } @@ -613,7 +637,7 @@ void be_set_IncSP_offset(ir_node *irn, unsigned offset) a->offset = offset; } -unsigned be_get_IncSP_offset(ir_node *irn) +unsigned be_get_IncSP_offset(const ir_node *irn) { be_stack_attr_t *a = get_irn_attr(irn); assert(be_is_IncSP(irn)); @@ -627,7 +651,7 @@ void be_set_IncSP_direction(ir_node *irn, be_stack_dir_t dir) a->dir = dir; } -be_stack_dir_t be_get_IncSP_direction(ir_node *irn) +be_stack_dir_t be_get_IncSP_direction(const ir_node *irn) { be_stack_attr_t *a = get_irn_attr(irn); assert(be_is_IncSP(irn)); @@ -643,22 +667,24 @@ void be_set_Spill_entity(ir_node *irn, entity *ent) static ir_node *find_a_spill_walker(ir_node *irn, unsigned visited_nr) { - if(get_irn_visited(irn) < visited_nr) { - set_irn_visited(irn, visited_nr); + unsigned nr = get_irn_visited(irn); - if(is_Phi(irn)) { - int i, n; + set_irn_visited(irn, visited_nr); + + if(is_Phi(irn)) { + int i, n; + if(nr < visited_nr) { for(i = 0, n = get_irn_arity(irn); i < n; ++i) { ir_node *n = find_a_spill_walker(get_irn_n(irn, i), visited_nr); if(n != NULL) return n; } } - - else if(be_get_irn_opcode(irn) == beo_Spill) - return irn; } + else if(be_get_irn_opcode(irn) == beo_Spill) + return irn; + return NULL; } @@ -690,7 +716,10 @@ entity *be_get_spill_entity(const ir_node *irn) switch(be_get_irn_opcode(irn)) { case beo_Reload: - return be_get_spill_entity(find_a_spill(irn)); + { + ir_node *spill = find_a_spill(irn); + return be_get_spill_entity(spill); + } case beo_Spill: { be_spill_attr_t *a = get_irn_attr(irn); @@ -698,11 +727,34 @@ entity *be_get_spill_entity(const ir_node *irn) } default: assert(0 && "Must give spill/reload node"); + break; } return NULL; } +static void link_reload_walker(ir_node *irn, void *data) +{ + ir_node **root = (ir_node **) data; + if(be_is_Reload(irn)) { + set_irn_link(irn, *root); + *root = irn; + } +} + +void be_copy_entities_to_reloads(ir_graph *irg) +{ + ir_node *irn = NULL; + irg_walk_graph(irg, link_reload_walker, NULL, (void *) &irn); + + while(irn) { + be_frame_attr_t *a = get_irn_attr(irn); + entity *ent = be_get_spill_entity(irn); + a->ent = ent; + irn = get_irn_link(irn); + } +} + ir_node *be_spill(const arch_env_t *arch_env, ir_node *irn, ir_node *ctx) { ir_node *bl = get_nodes_block(irn); @@ -730,8 +782,10 @@ ir_node *be_spill(const arch_env_t *arch_env, ir_node *irn, ir_node *ctx) * Here's one special case: * If the spill is in the start block, the spill must be after the frame * pointer is set up. This is checked here and fixed. + * If the insertion point is already the block, everything is fine, since + * the Spill gets inserted at the end of the block. */ - if(bl == get_irg_start_block(irg)) + if(bl == get_irg_start_block(irg) && insert != bl && sched_comes_after(insert, frame)) insert = sched_next(frame); sched_add_before(insert, spill); @@ -742,7 +796,7 @@ ir_node *be_reload(const arch_env_t *arch_env, const arch_register_class_t *cls, { ir_node *reload; - ir_node *bl = get_nodes_block(reloader); + ir_node *bl = is_Block(reloader) ? reloader : get_nodes_block(reloader); ir_graph *irg = get_irn_irg(bl); ir_node *frame = get_irg_frame(irg); const arch_register_class_t *cls_frame = arch_get_irn_reg_class(arch_env, frame, -1);