X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbenode.c;h=7c55b6a64eaa5fe89f0711b7dfed316604614ea6;hb=c996ec162f5e73d316884ab4d8feb35ac2e48896;hp=a189252a7408e89843671b5cc714248f736be9c8;hpb=8535fe8732b0acf822be252812a7158ce5b8134a;p=libfirm diff --git a/ir/be/benode.c b/ir/be/benode.c index a189252a7..7c55b6a64 100644 --- a/ir/be/benode.c +++ b/ir/be/benode.c @@ -1,17 +1,34 @@ -/** - * @file benode.c - * @date 17.05.2005 - * @author Sebastian Hack +/* + * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved. * - * Backend node support. + * This file is part of libFirm. * - * This file provides Perm, Copy, Spill and Reload nodes. + * This file may be distributed and/or modified under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation and appearing in the file LICENSE.GPL included in the + * packaging of this file. + * + * Licensees holding valid libFirm Professional Edition licenses may use + * this file in accordance with the libFirm Commercial License. + * Agreement provided with the Software. + * + * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE + * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE. + */ + +/** + * @file + * @brief Backend node support for generic backend nodes. + * @author Sebastian Hack + * @date 17.05.2005 + * @version $Id$ * - * Copyright (C) 2005-2006 Universitaet Karlsruhe - * Released under the GPL + * Backend node support for generic backend nodes. + * This file provides Perm, Copy, Spill and Reload nodes. */ #ifdef HAVE_CONFIG_H -#include +#include "config.h" #endif #include @@ -38,13 +55,14 @@ #include "belive_t.h" #include "besched_t.h" #include "benode_t.h" +#include "bearch_t.h" #include "beirgmod.h" #define OUT_POS(x) (-((x) + 1)) -/* Sometimes we want to put const nodes into get_irn_generic_attr ... */ -#define get_irn_attr(irn) get_irn_generic_attr((ir_node *) (irn)) +#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'); @@ -55,45 +73,50 @@ typedef struct { typedef struct { const arch_register_t *reg; - be_req_t req; - be_req_t in_req; + be_req_t req; + be_req_t in_req; } be_reg_data_t; /** The generic be nodes attribute type. */ typedef struct { - be_reg_data_t *reg_data; + be_reg_data_t *reg_data; } be_node_attr_t; /** The be_Return nodes attribute type. */ typedef struct { - be_node_attr_t node_attr; + 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_Stack attribute type. */ +/** The be_IncSP attribute type. */ typedef struct { - be_node_attr_t node_attr; - int offset; /**< The offset by which the stack shall be expanded/shrinked. */ -} be_stack_attr_t; + 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; /**< whether stack should be aligned after the + IncSP */ +} be_incsp_attr_t; /** The be_Frame attribute type. */ typedef struct { - be_node_attr_t node_attr; - ir_entity *ent; - int offset; + be_node_attr_t node_attr; /**< base attributes of every be node. */ + ir_entity *ent; + int offset; } be_frame_attr_t; /** The be_Call attribute type. */ typedef struct { - be_node_attr_t node_attr; - ir_entity *ent; /**< The called entity if this is a static call. */ - ir_type *call_tp; /**< The call type, copied from the original Call node. */ + be_node_attr_t node_attr; /**< base attributes of every be node. */ + 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. */ } be_call_attr_t; typedef struct { - be_node_attr_t node_attr; - ir_entity **in_entities; - ir_entity **out_entities; + be_node_attr_t node_attr; /**< base attributes of every be node. */ + ir_entity **in_entities; + ir_entity **out_entities; } be_memperm_attr_t; ir_op *op_be_Spill; @@ -108,13 +131,10 @@ ir_op *op_be_Return; ir_op *op_be_IncSP; ir_op *op_be_AddSP; ir_op *op_be_SubSP; -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; ir_op *op_be_Barrier; +ir_op *op_be_Unwind; static int beo_base = -1; @@ -130,25 +150,34 @@ static const ir_op_ops be_node_op_ops; #define H irop_flag_highlevel #define c irop_flag_constlike #define K irop_flag_keep -#define M irop_flag_machine +#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 node attributes. + * Compare two be node attributes. * * @return zero if both attributes are identically */ -static int cmp_node_attr(be_node_attr_t *a, be_node_attr_t *b) { +static int _node_cmp_attr(const be_node_attr_t *a, const be_node_attr_t *b) { int i, len; - if(ARR_LEN(a->reg_data) != ARR_LEN(b->reg_data)) + if (ARR_LEN(a->reg_data) != ARR_LEN(b->reg_data)) return 1; 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; } @@ -156,27 +185,90 @@ static int cmp_node_attr(be_node_attr_t *a, be_node_attr_t *b) { } /** - * Compare the attributes of two FrameAddr nodes. + * Compare the node attributes of two be_node's. * - * @return zero if both attributes are identically + * @return zero if both nodes have identically attributes + */ +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); + + return _node_cmp_attr(a_attr, b_attr); +} + +/** + * Compare the attributes of two be_FrameAddr nodes. + * + * @return zero if both nodes have identically attributes */ static int FrameAddr_cmp_attr(ir_node *a, ir_node *b) { - be_frame_attr_t *a_attr = get_irn_attr(a); - be_frame_attr_t *b_attr = get_irn_attr(b); + const be_frame_attr_t *a_attr = get_irn_attr_const(a); + const be_frame_attr_t *b_attr = get_irn_attr_const(b); - if (a_attr->ent == b_attr->ent && a_attr->offset == b_attr->offset) - return cmp_node_attr(&a_attr->node_attr, &b_attr->node_attr); - return 1; + if (a_attr->ent != b_attr->ent || a_attr->offset != b_attr->offset) + return 1; + + return _node_cmp_attr(&a_attr->node_attr, &b_attr->node_attr); +} + +/** + * Compare the attributes of two be_Return nodes. + * + * @return zero if both nodes have identically attributes + */ +static int Return_cmp_attr(ir_node *a, ir_node *b) { + const be_return_attr_t *a_attr = get_irn_attr_const(a); + const be_return_attr_t *b_attr = get_irn_attr_const(b); + + if (a_attr->num_ret_vals != b_attr->num_ret_vals) + 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); +} + +/** + * Compare the attributes of two be_IncSP nodes. + * + * @return zero if both nodes have identically attributes + */ +static int IncSP_cmp_attr(ir_node *a, ir_node *b) { + const be_incsp_attr_t *a_attr = get_irn_attr_const(a); + const be_incsp_attr_t *b_attr = get_irn_attr_const(b); + + if (a_attr->offset != b_attr->offset) + return 1; + + return _node_cmp_attr(&a_attr->node_attr, &b_attr->node_attr); +} + +/** + * Compare the attributes of two be_Call nodes. + * + * @return zero if both nodes have identically attributes + */ +static int Call_cmp_attr(ir_node *a, ir_node *b) { + const be_call_attr_t *a_attr = get_irn_attr_const(a); + 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) + 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) { int idx; - be_node_attr_t *attr; + const be_node_attr_t *attr; be_reg_data_t *rd; assert(is_be_node(node)); - attr = get_irn_attr(node); + attr = get_irn_attr_const(node); if(pos < 0) { idx = -(pos + 1); @@ -190,7 +282,7 @@ 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) +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; @@ -205,49 +297,57 @@ void be_node_init(void) { inited = 1; /* Acquire all needed opcodes. */ - beo_base = get_next_ir_opcodes(beo_Last - 1); - - op_be_Spill = new_ir_op(beo_base + beo_Spill, "be_Spill", op_pin_state_mem_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_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_MemPerm = new_ir_op(beo_base + beo_MemPerm, "be_MemPerm", op_pin_state_mem_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, 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_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_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_unary, 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_unary, 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_dynamic, 0, sizeof(be_node_attr_t), &be_node_op_ops); + 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); - set_op_tag(op_be_SetSP, &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); - 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); + op_be_RegParams->ops.node_cmp_attr = node_cmp_attr; set_op_tag(op_be_FrameAddr, &be_node_tag); - set_op_tag(op_be_Barrier, &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; } /** @@ -286,7 +386,7 @@ int is_be_node(const ir_node *irn) be_opcode_t be_get_irn_opcode(const ir_node *irn) { - return is_be_node(irn) ? get_irn_opcode(irn) - beo_base : beo_NoBeOp; + return is_be_node(irn) ? (be_opcode_t) get_irn_opcode(irn) - beo_base : beo_NoBeOp; } /** @@ -318,7 +418,7 @@ static int redir_proj(const ir_node **node) static be_reg_data_t *retrieve_reg_data(const ir_node *node) { - be_node_attr_t *attr; + const be_node_attr_t *attr; int pos = 0; if(is_Proj(node)) { @@ -327,16 +427,17 @@ static be_reg_data_t *retrieve_reg_data(const ir_node *node) } assert(is_be_node(node)); - attr = get_irn_attr(node); + attr = get_irn_attr_const(node); assert(pos >= 0 && pos < ARR_LEN(attr->reg_data) && "illegal proj number"); return &attr->reg_data[pos]; } static void -be_node_set_irn_reg(const void *_self, ir_node *irn, const arch_register_t *reg) +be_node_set_irn_reg(const void *self, ir_node *irn, const arch_register_t *reg) { be_reg_data_t *r = retrieve_reg_data(irn); + (void) self; r->reg = reg; } @@ -413,6 +514,32 @@ ir_node *be_new_Perm(const arch_register_class_t *cls, ir_graph *irg, ir_node *b return irn; } +void be_Perm_reduce(ir_node *perm, int new_size, int *map) +{ + ir_graph *irg = get_irn_irg(perm); + int arity = get_irn_arity(perm); + be_reg_data_t *old_data = alloca(arity * sizeof(old_data[0])); + be_node_attr_t *attr = get_irn_attr(perm); + ir_node **new_in = NEW_ARR_D(ir_node *, irg->obst, new_size); + + int i; + + assert(be_is_Perm(perm)); + assert(new_size <= arity); + + /* save the old register data */ + memcpy(old_data, attr->reg_data, arity * sizeof(old_data[0])); + + /* compose the new in array and set the new register data directly in place */ + for (i = 0; i < new_size; ++i) { + int idx = map[i]; + new_in[i] = get_irn_n(perm, idx); + attr->reg_data[i] = old_data[idx]; + } + + 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[]) { int i; @@ -431,7 +558,7 @@ ir_node *be_new_MemPerm(const arch_env_t *arch_env, ir_graph *irg, ir_node *bl, init_node_attr(irn, n + 1); be_node_set_reg_class(irn, 0, sp->reg_class); - for(i = 0; i < n; ++i) { + for (i = 0; i < n; ++i) { be_node_set_reg_class(irn, i + 1, cls_frame); be_node_set_reg_class(irn, OUT_POS(i), cls_frame); } @@ -462,7 +589,7 @@ ir_node *be_new_Copy(const arch_register_class_t *cls, ir_graph *irg, ir_node *b req = get_req(res, OUT_POS(0)); req->cls = cls; req->type = arch_register_req_type_should_be_same; - req->other_same = 0; + req->other_same = 1U << 0; return res; } @@ -503,6 +630,7 @@ void be_Keep_add_node(ir_node *keep, const arch_register_class_t *cls, ir_node * be_node_set_reg_class(keep, n, cls); } +/* creates a be_Call */ ir_node *be_new_Call(dbg_info *dbg, ir_graph *irg, ir_node *bl, ir_node *mem, ir_node *sp, ir_node *ptr, int n_outs, int n, ir_node *in[], ir_type *call_tp) { @@ -521,12 +649,13 @@ ir_node *be_new_Call(dbg_info *dbg, ir_graph *irg, ir_node *bl, ir_node *mem, ir a = init_node_attr(irn, (n_outs > real_n ? n_outs : real_n)); a->ent = NULL; a->call_tp = call_tp; + a->pop = 0; return irn; } /* Gets the call entity or NULL if this is no static call. */ ir_entity *be_Call_get_entity(const ir_node *call) { - be_call_attr_t *a = get_irn_attr(call); + const be_call_attr_t *a = get_irn_attr_const(call); assert(be_is_Call(call)); return a->ent; } @@ -540,7 +669,7 @@ void be_Call_set_entity(ir_node *call, ir_entity *ent) { /* Gets the call type. */ ir_type *be_Call_get_type(ir_node *call) { - be_call_attr_t *a = get_irn_attr(call); + const be_call_attr_t *a = get_irn_attr_const(call); assert(be_is_Call(call)); return a->call_tp; } @@ -552,35 +681,85 @@ void be_Call_set_type(ir_node *call, ir_type *call_tp) { a->call_tp = call_tp; } +void be_Call_set_pop(ir_node *call, unsigned pop) { + be_call_attr_t *a = get_irn_attr(call); + a->pop = pop; +} + +unsigned be_Call_get_pop(const ir_node *call) { + const be_call_attr_t *a = get_irn_attr_const(call); + return a->pop; +} + /* Construct a new be_Return. */ -ir_node *be_new_Return(dbg_info *dbg, ir_graph *irg, ir_node *bl, int n_res, int n, ir_node *in[]) +ir_node *be_new_Return(dbg_info *dbg, ir_graph *irg, ir_node *block, int n_res, + unsigned pop, int n, ir_node *in[]) { be_return_attr_t *a; - ir_node *irn = new_ir_node(dbg, irg, bl, op_be_Return, mode_X, n, in); - init_node_attr(irn, n); - a = get_irn_attr(irn); + ir_node *res; + int i; + + res = new_ir_node(dbg, irg, block, op_be_Return, mode_X, -1, NULL); + init_node_attr(res, -1); + for(i = 0; i < n; ++i) { + add_irn_n(res, in[i]); + add_register_req(res); + } + + a = get_irn_attr(res); a->num_ret_vals = n_res; + a->pop = pop; + a->emit_pop = 0; - return irn; + return res; } /* Returns the number of real returns values */ -int be_Return_get_n_rets(ir_node *ret) -{ - be_return_attr_t *a = get_irn_attr(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; } -ir_node *be_new_IncSP(const arch_register_t *sp, ir_graph *irg, ir_node *bl, ir_node *old_sp, int offset) +/* 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; +} + +/* 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); + add_register_req(ret); + + return pos; +} + +ir_node *be_new_IncSP(const arch_register_t *sp, ir_graph *irg, ir_node *bl, + ir_node *old_sp, int offset, int align) { - be_stack_attr_t *a; + be_incsp_attr_t *a; ir_node *irn; ir_node *in[1]; in[0] = old_sp; - irn = new_ir_node(NULL, irg, bl, op_be_IncSP, sp->reg_class->mode, sizeof(in) / sizeof(in[0]), in); + irn = new_ir_node(NULL, irg, bl, op_be_IncSP, sp->reg_class->mode, + sizeof(in) / sizeof(in[0]), in); a = init_node_attr(irn, 1); a->offset = offset; + a->align = align; be_node_set_flags(irn, -1, arch_irn_flags_ignore | arch_irn_flags_modify_sp); @@ -597,6 +776,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; in[be_pos_AddSP_old_sp] = old_sp; in[be_pos_AddSP_size] = sz; @@ -604,13 +784,17 @@ ir_node *be_new_AddSP(const arch_register_t *sp, ir_graph *irg, ir_node *bl, ir_ 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); - be_node_set_flags(irn, OUT_POS(pn_be_AddSP_res), arch_irn_flags_ignore | arch_irn_flags_modify_sp); + be_node_set_flags(irn, OUT_POS(pn_be_AddSP_sp), + arch_irn_flags_ignore | arch_irn_flags_modify_sp); /* Set output constraint to stack register. */ be_set_constr_single_reg(irn, be_pos_AddSP_old_sp, sp); be_node_set_reg_class(irn, be_pos_AddSP_size, arch_register_get_class(sp)); - be_set_constr_single_reg(irn, OUT_POS(pn_be_AddSP_res), sp); - a->reg_data[pn_be_AddSP_res].reg = sp; + 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); return irn; } @@ -627,52 +811,15 @@ ir_node *be_new_SubSP(const arch_register_t *sp, ir_graph *irg, ir_node *bl, ir_ 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); - be_node_set_flags(irn, OUT_POS(pn_be_SubSP_res), arch_irn_flags_ignore | arch_irn_flags_modify_sp); + be_node_set_flags(irn, OUT_POS(pn_be_SubSP_sp), + arch_irn_flags_ignore | arch_irn_flags_modify_sp); /* Set output constraint to stack register. */ be_set_constr_single_reg(irn, be_pos_SubSP_old_sp, sp); be_node_set_reg_class(irn, be_pos_SubSP_size, arch_register_get_class(sp)); - be_set_constr_single_reg(irn, OUT_POS(pn_be_SubSP_res), sp); - a->reg_data[pn_be_SubSP_res].reg = sp; - - return irn; -} - -ir_node *be_new_SetSP(const arch_register_t *sp, ir_graph *irg, ir_node *bl, ir_node *old_sp, ir_node *op, ir_node *mem) -{ - be_node_attr_t *a; - ir_node *irn; - ir_node *in[3]; - - in[0] = mem; - in[1] = old_sp; - in[2] = op; - 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 | arch_irn_flags_modify_sp); + be_set_constr_single_reg(irn, OUT_POS(pn_be_SubSP_sp), sp); + a->reg_data[pn_be_SubSP_sp].reg = sp; - /* Set output constraint to stack register. */ - be_set_constr_single_reg(irn, OUT_POS(0), sp); - be_node_set_reg_class(irn, be_pos_AddSP_size, sp->reg_class); - be_node_set_reg_class(irn, be_pos_AddSP_old_sp, sp->reg_class); - - return irn; -} - -ir_node *be_new_StackParam(const arch_register_class_t *cls, const arch_register_class_t *cls_frame, ir_graph *irg, ir_node *bl, ir_mode *mode, ir_node *frame_pointer, ir_entity *ent) -{ - be_frame_attr_t *a; - ir_node *irn; - ir_node *in[1]; - - in[0] = frame_pointer; - irn = new_ir_node(NULL, irg, bl, op_be_StackParam, mode, 1, in); - a = init_node_attr(irn, 1); - a->ent = ent; - - be_node_set_reg_class(irn, 0, cls_frame); - be_node_set_reg_class(irn, OUT_POS(0), cls); return irn; } @@ -704,7 +851,7 @@ ir_node *be_RegParams_append_out_reg(ir_node *regparams, assert(be_is_RegParams(regparams)); proj = new_r_Proj(irg, block, regparams, mode, n); add_register_req(regparams); - be_set_constr_single_reg(regparams, n, reg); + be_set_constr_single_reg(regparams, BE_OUT_POS(n), reg); arch_set_irn_register(arch_env, proj, reg); /* TODO decide, whether we need to set ignore/modify sp flags here? */ @@ -712,43 +859,6 @@ ir_node *be_RegParams_append_out_reg(ir_node *regparams, return proj; } -ir_node *be_new_FrameLoad(const arch_register_class_t *cls_frame, const arch_register_class_t *cls_data, - ir_graph *irg, ir_node *bl, ir_node *mem, ir_node *frame, ir_entity *ent) -{ - be_frame_attr_t *a; - ir_node *irn; - ir_node *in[2]; - - in[0] = mem; - in[1] = frame; - 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; - be_node_set_reg_class(irn, 1, cls_frame); - be_node_set_reg_class(irn, OUT_POS(pn_Load_res), cls_data); - return irn; -} - -ir_node *be_new_FrameStore(const arch_register_class_t *cls_frame, const arch_register_class_t *cls_data, - ir_graph *irg, ir_node *bl, ir_node *mem, ir_node *frame, ir_node *data, ir_entity *ent) -{ - be_frame_attr_t *a; - ir_node *irn; - ir_node *in[3]; - - in[0] = mem; - in[1] = frame; - in[2] = data; - 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; - be_node_set_reg_class(irn, 1, cls_frame); - be_node_set_reg_class(irn, 2, cls_data); - return irn; -} - ir_node *be_new_FrameAddr(const arch_register_class_t *cls_frame, ir_graph *irg, ir_node *bl, ir_node *frame, ir_entity *ent) { be_frame_attr_t *a; @@ -766,6 +876,17 @@ ir_node *be_new_FrameAddr(const arch_register_class_t *cls_frame, ir_graph *irg, return optimize_node(irn); } +ir_node *be_get_FrameAddr_frame(const ir_node *node) { + assert(be_is_FrameAddr(node)); + return get_irn_n(node, be_pos_FrameAddr_ptr); +} + +ir_entity *be_get_FrameAddr_entity(const ir_node *node) +{ + const be_frame_attr_t *attr = get_irn_generic_attr_const(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 *irn; @@ -783,10 +904,7 @@ ir_node *be_new_CopyKeep(const arch_register_class_t *cls, ir_graph *irg, ir_nod 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 *in[1]; - - in[0] = keep; - return be_new_CopyKeep(cls, irg, bl, src, 1, in, mode); + return be_new_CopyKeep(cls, irg, bl, src, 1, &keep, mode); } ir_node *be_get_CopyKeep_op(const ir_node *cpy) { @@ -818,12 +936,28 @@ ir_node *be_Barrier_append_node(ir_node *barrier, ir_node *node) 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); 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 *mem, ir_node *sp) +{ + ir_node *res; + ir_node *in[2]; + + in[be_pos_Unwind_mem] = mem; + in[be_pos_Unwind_sp] = sp; + res = new_ir_node(dbg, irg, block, op_be_Unwind, mode_X, 2, in); + init_node_attr(res, -1); + + 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 ; } @@ -834,24 +968,18 @@ int be_is_Keep (const ir_node *irn) { return be_get_irn_opcode(irn) == 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_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_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_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 ; } -int be_is_FrameLoad (const ir_node *irn) { return be_get_irn_opcode(irn) == beo_FrameLoad ; } -int be_is_FrameStore (const ir_node *irn) { return be_get_irn_opcode(irn) == beo_FrameStore ; } 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)) { - case beo_StackParam: + switch (be_get_irn_opcode(irn)) { case beo_Spill: case beo_Reload: - case beo_FrameStore: - case beo_FrameLoad: case beo_FrameAddr: return 1; default: @@ -862,7 +990,7 @@ int be_has_frame_entity(const ir_node *irn) ir_entity *be_get_frame_entity(const ir_node *irn) { if (be_has_frame_entity(irn)) { - be_frame_attr_t *a = get_irn_attr(irn); + const be_frame_attr_t *a = get_irn_attr_const(irn); return a->ent; } return NULL; @@ -872,7 +1000,7 @@ int be_get_frame_offset(const ir_node *irn) { assert(is_be_node(irn)); if (be_has_frame_entity(irn)) { - be_frame_attr_t *a = get_irn_attr(irn); + const be_frame_attr_t *a = get_irn_attr_const(irn); return a->offset; } return 0; @@ -880,7 +1008,7 @@ int be_get_frame_offset(const ir_node *irn) void be_set_MemPerm_in_entity(const ir_node *irn, int n, ir_entity *ent) { - be_memperm_attr_t *attr = get_irn_attr(irn); + const be_memperm_attr_t *attr = get_irn_attr_const(irn); assert(be_is_MemPerm(irn)); assert(n < be_get_MemPerm_entity_arity(irn)); @@ -890,7 +1018,7 @@ void be_set_MemPerm_in_entity(const ir_node *irn, int n, ir_entity *ent) ir_entity* be_get_MemPerm_in_entity(const ir_node* irn, int n) { - be_memperm_attr_t *attr = get_irn_attr(irn); + const be_memperm_attr_t *attr = get_irn_attr_const(irn); assert(be_is_MemPerm(irn)); assert(n < be_get_MemPerm_entity_arity(irn)); @@ -900,7 +1028,7 @@ ir_entity* be_get_MemPerm_in_entity(const ir_node* irn, int n) void be_set_MemPerm_out_entity(const ir_node *irn, int n, ir_entity *ent) { - be_memperm_attr_t *attr = get_irn_attr(irn); + const be_memperm_attr_t *attr = get_irn_attr_const(irn); assert(be_is_MemPerm(irn)); assert(n < be_get_MemPerm_entity_arity(irn)); @@ -910,7 +1038,7 @@ void be_set_MemPerm_out_entity(const ir_node *irn, int n, ir_entity *ent) ir_entity* be_get_MemPerm_out_entity(const ir_node* irn, int n) { - be_memperm_attr_t *attr = get_irn_attr(irn); + const be_memperm_attr_t *attr = get_irn_attr_const(irn); assert(be_is_MemPerm(irn)); assert(n < be_get_MemPerm_entity_arity(irn)); @@ -961,6 +1089,12 @@ void be_node_set_flags(ir_node *irn, int pos, arch_irn_flags_t flags) bereq->flags = flags; } +void be_node_add_flags(ir_node *irn, int pos, arch_irn_flags_t flags) +{ + be_req_t *bereq = get_be_req(irn, pos); + bereq->flags |= flags; +} + void be_node_set_reg_class(ir_node *irn, int pos, const arch_register_class_t *cls) { arch_register_req_t *req = get_req(irn, pos); @@ -990,35 +1124,36 @@ void be_set_IncSP_pred(ir_node *incsp, ir_node *pred) { set_irn_n(incsp, 0, pred); } -ir_node *be_get_IncSP_mem(ir_node *irn) { - assert(be_is_IncSP(irn)); - return get_irn_n(irn, 1); -} - void be_set_IncSP_offset(ir_node *irn, int offset) { - be_stack_attr_t *a = get_irn_attr(irn); + be_incsp_attr_t *a = get_irn_attr(irn); assert(be_is_IncSP(irn)); a->offset = offset; } int be_get_IncSP_offset(const ir_node *irn) { - be_stack_attr_t *a = get_irn_attr(irn); + const be_incsp_attr_t *a = get_irn_attr_const(irn); assert(be_is_IncSP(irn)); return a->offset; } -ir_node *be_spill(const arch_env_t *arch_env, ir_node *irn) +int be_get_IncSP_align(const ir_node *irn) { - ir_node *bl = get_nodes_block(irn); - ir_graph *irg = get_irn_irg(bl); + const be_incsp_attr_t *a = get_irn_attr_const(irn); + assert(be_is_IncSP(irn)); + return a->align; +} + +ir_node *be_spill(const arch_env_t *arch_env, ir_node *block, ir_node *irn) +{ + ir_graph *irg = get_irn_irg(block); ir_node *frame = get_irg_frame(irg); const arch_register_class_t *cls = arch_get_irn_reg_class(arch_env, irn, -1); const arch_register_class_t *cls_frame = arch_get_irn_reg_class(arch_env, frame, -1); ir_node *spill; - spill = be_new_Spill(cls, cls_frame, irg, bl, frame, irn); + spill = be_new_Spill(cls, cls_frame, irg, block, frame, irn); return spill; } @@ -1058,7 +1193,7 @@ ir_node *be_reload(const arch_env_t *arch_env, const arch_register_class_t *cls, static const arch_register_req_t *get_out_reg_req(const ir_node *irn, int out_pos) { - const be_node_attr_t *a = get_irn_attr(irn); + const be_node_attr_t *a = get_irn_attr_const(irn); if(out_pos >= ARR_LEN(a->reg_data)) { return arch_no_register_req; @@ -1070,7 +1205,7 @@ arch_register_req_t *get_out_reg_req(const ir_node *irn, int out_pos) static const arch_register_req_t *get_in_reg_req(const ir_node *irn, int pos) { - const be_node_attr_t *a = get_irn_attr(irn); + const be_node_attr_t *a = get_irn_attr_const(irn); if(pos >= get_irn_arity(irn) || pos >= ARR_LEN(a->reg_data)) return arch_no_register_req; @@ -1083,6 +1218,7 @@ be_node_get_irn_reg_req(const void *self, 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; @@ -1106,16 +1242,22 @@ 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 void *self, const ir_node *irn) { - be_reg_data_t *r = retrieve_reg_data(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 void *self, 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); @@ -1123,7 +1265,6 @@ static arch_irn_class_t be_node_classify(const void *_self, const ir_node *irn) XXX(Perm, perm); XXX(Copy, copy); XXX(Return, branch); - XXX(StackParam, stackparam); #undef XXX default: return arch_irn_class_normal; @@ -1132,10 +1273,11 @@ static arch_irn_class_t be_node_classify(const void *_self, const ir_node *irn) 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 void *self, const ir_node *node) { be_req_t *bereq; int pos = -1; + (void) self; if(is_Proj(node)) { pos = OUT_POS(get_Proj_proj(node)); @@ -1149,12 +1291,14 @@ static arch_irn_flags_t be_node_get_flags(const void *_self, const ir_node *node static ir_entity *be_node_get_frame_entity(const void *self, 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) { be_frame_attr_t *a; + (void) self; assert(be_has_frame_entity(irn)); @@ -1164,6 +1308,7 @@ static void be_node_set_frame_entity(const void *self, ir_node *irn, ir_entity * static void be_node_set_frame_offset(const void *self, 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; @@ -1172,7 +1317,13 @@ static void be_node_set_frame_offset(const void *self, ir_node *irn, int offset) static int be_node_get_sp_bias(const void *self, const ir_node *irn) { - return be_is_IncSP(irn) ? be_get_IncSP_offset(irn) : 0; + (void) self; + if(be_is_IncSP(irn)) + return be_get_IncSP_offset(irn); + if(be_is_Call(irn)) + return -(int)be_Call_get_pop(irn); + + return 0; } /* @@ -1207,6 +1358,7 @@ static const arch_irn_ops_t be_node_irn_ops = { 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; } @@ -1225,7 +1377,8 @@ const arch_irn_handler_t be_node_irn_handler = { typedef struct { const arch_register_t *reg; - arch_register_req_t req; + arch_register_req_t req; + arch_irn_flags_t flags; } phi_attr_t; typedef struct { @@ -1238,14 +1391,20 @@ typedef struct { #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) +static +const void *phi_get_irn_ops(const arch_irn_handler_t *handler, + const ir_node *irn) { - const phi_handler_t *h = get_phi_handler_from_handler(handler); - return is_Phi(irn) && mode_is_datab(get_irn_mode(irn)) ? &h->irn_ops : NULL; + 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) +static INLINE +phi_attr_t *get_Phi_attr(const phi_handler_t *handler, const ir_node *phi) { phi_attr_t *attr = pmap_get(handler->phi_attrs, (void*) phi); if(attr == NULL) { @@ -1308,6 +1467,8 @@ const arch_register_req_t *phi_get_irn_reg_req(const void *self, { 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; @@ -1330,49 +1491,101 @@ const arch_register_req_t *phi_get_irn_reg_req(const void *self, return &attr->req; } -static void phi_set_irn_reg(const void *self, ir_node *irn, const arch_register_t *reg) +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; + + assert(mode_is_datab(get_irn_mode(node))); + + attr = get_Phi_attr(handler, 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; + + assert(mode_is_datab(get_irn_mode(node))); + + attr = get_Phi_attr(handler, node); + attr->flags = flags; +} + +static +void phi_set_irn_reg(const void *self, 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); 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 void *self, const ir_node *irn) { phi_handler_t *h = get_phi_handler_from_ops(self); phi_attr_t *attr = get_Phi_attr(h, 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 void *self, 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 void *self, const ir_node *irn) { - return arch_irn_flags_none; + phi_handler_t *h = get_phi_handler_from_ops(self); + phi_attr_t *attr = get_Phi_attr(h, irn); + (void) self; + 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 void *self, 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(const void *self, 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(const void *self, 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 void* self, 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_if_t phi_irn_ops = { phi_get_irn_reg_req, phi_set_irn_reg, phi_get_irn_reg, @@ -1388,10 +1601,6 @@ static const arch_irn_ops_if_t phi_irn_ops = { NULL, /* perform_memory_operand */ }; -static const arch_irn_handler_t phi_irn_handler = { - phi_get_irn_ops -}; - arch_irn_handler_t *be_phi_handler_new(const arch_env_t *arch_env) { phi_handler_t *h = xmalloc(sizeof(h[0])); @@ -1404,17 +1613,12 @@ arch_irn_handler_t *be_phi_handler_new(const arch_env_t *arch_env) void be_phi_handler_free(arch_irn_handler_t *handler) { - phi_handler_t *h = (void *) handler; + phi_handler_t *h = get_phi_handler_from_handler(handler); pmap_destroy(h->phi_attrs); + h->phi_attrs = NULL; free(handler); } -const void *be_phi_get_irn_ops(const arch_irn_handler_t *self, const ir_node *irn) -{ - phi_handler_t *phi_handler = get_phi_handler_from_handler(self); - return is_Phi(irn) ? &phi_handler->irn_ops : NULL; -} - void be_phi_handler_reset(arch_irn_handler_t *handler) { phi_handler_t *h = get_phi_handler_from_handler(handler); @@ -1498,9 +1702,26 @@ static int dump_node(ir_node *irn, FILE *f, dump_reason_t reason) fprintf(f, get_op_name(get_irn_op(irn))); break; case dump_node_mode_txt: - fprintf(f, get_mode_name(get_irn_mode(irn))); + if(be_is_Perm(irn) || be_is_Copy(irn) || be_is_CopyKeep(irn)) { + fprintf(f, " %s", get_mode_name(get_irn_mode(irn))); + } break; case dump_node_nodeattr_txt: + if(be_is_Call(irn)) { + be_call_attr_t *a = (be_call_attr_t *) at; + if (a->ent) + fprintf(f, " [%s] ", get_entity_name(a->ent)); + } + if(be_is_IncSP(irn)) { + const be_incsp_attr_t *attr = get_irn_generic_attr_const(irn); + if(attr->offset == BE_STACK_FRAME_SIZE_EXPAND) { + fprintf(f, " [Setup Stackframe] "); + } else if(attr->offset == BE_STACK_FRAME_SIZE_SHRINK) { + fprintf(f, " [Destroy Stackframe] "); + } else { + fprintf(f, " [%d] ", attr->offset); + } + } break; case dump_node_info_txt: dump_node_reqs(f, irn); @@ -1508,9 +1729,9 @@ 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) { - 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) bits\n", - a->ent, a->offset, a->offset, bits, bits); + unsigned size = get_type_size_bytes(get_entity_type(a->ent)); + ir_fprintf(f, "frame entity: %+F, offset 0x%x (%d), size 0x%x (%d) bytes\n", + a->ent, a->offset, a->offset, size, size); } } @@ -1518,7 +1739,7 @@ static int dump_node(ir_node *irn, FILE *f, dump_reason_t reason) switch(be_get_irn_opcode(irn)) { case beo_IncSP: { - be_stack_attr_t *a = (be_stack_attr_t *) at; + be_incsp_attr_t *a = (be_incsp_attr_t *) at; if (a->offset == BE_STACK_FRAME_SIZE_EXPAND) fprintf(f, "offset: FRAME_SIZE\n"); else if(a->offset == BE_STACK_FRAME_SIZE_SHRINK) @@ -1566,7 +1787,7 @@ static int dump_node(ir_node *irn, FILE *f, dump_reason_t reason) */ static void copy_attr(const ir_node *old_node, ir_node *new_node) { - be_node_attr_t *old_attr = get_irn_attr(old_node); + const be_node_attr_t *old_attr = get_irn_attr_const(old_node); be_node_attr_t *new_attr = get_irn_attr(new_node); struct obstack *obst = get_irg_obstack(get_irn_irg(new_node)); unsigned i, len;