X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firnode.c;h=d2762252a4e64041c827d6bae2b7d127bf45dbe8;hb=357886575cb0becb5bd9be376fde49b57edd5385;hp=171b484efc428b32a65e95109fef0b87d90fb599;hpb=8b5aac95f0921dc70b53f2526f7a7413df3f6f85;p=libfirm diff --git a/ir/ir/irnode.c b/ir/ir/irnode.c index 171b484ef..d2762252a 100644 --- a/ir/ir/irnode.c +++ b/ir/ir/irnode.c @@ -43,6 +43,7 @@ #include "irhooks.h" #include "irtools.h" +#include "util.h" #include "beinfo.h" @@ -54,47 +55,43 @@ #define RETURN_RESULT_OFFSET 1 /* mem is not a result */ #define END_KEEPALIVE_OFFSET 0 -static const char *pnc_name_arr [] = { - "pn_Cmp_False", "pn_Cmp_Eq", "pn_Cmp_Lt", "pn_Cmp_Le", - "pn_Cmp_Gt", "pn_Cmp_Ge", "pn_Cmp_Lg", "pn_Cmp_Leg", - "pn_Cmp_Uo", "pn_Cmp_Ue", "pn_Cmp_Ul", "pn_Cmp_Ule", - "pn_Cmp_Ug", "pn_Cmp_Uge", "pn_Cmp_Ne", "pn_Cmp_True" +static const char *relation_names [] = { + "false", + "equal", + "less", + "less_equal", + "greater", + "greater_equal", + "less_greater", + "less_equal_greater", + "unordered", + "unordered_equal", + "unordered_less", + "unordered_less_equal", + "unordered_greater", + "unordered_greater_equal", + "not_equal", + "true" }; -/** - * returns the pnc name from an pnc constant - */ -const char *get_pnc_string(int pnc) +const char *get_relation_string(ir_relation relation) { - assert(pnc >= 0 && pnc < - (int) (sizeof(pnc_name_arr)/sizeof(pnc_name_arr[0]))); - return pnc_name_arr[pnc]; + assert(relation < (ir_relation)ARRAY_SIZE(relation_names)); + return relation_names[relation]; } -/* - * Calculates the negated (Complement(R)) pnc condition. - */ -pn_Cmp get_negated_pnc(long pnc, ir_mode *mode) +ir_relation get_negated_relation(ir_relation relation) { - pnc ^= pn_Cmp_True; - - /* do NOT add the Uo bit for non-floating point values */ - if (! mode_is_float(mode)) - pnc &= ~pn_Cmp_Uo; - - return (pn_Cmp) pnc; + return relation ^ ir_relation_true; } -/* Calculates the inversed (R^-1) pnc condition, i.e., "<" --> ">" */ -pn_Cmp get_inversed_pnc(long pnc) +ir_relation get_inversed_relation(ir_relation relation) { - long code = pnc & ~(pn_Cmp_Lt|pn_Cmp_Gt); - long lesser = pnc & pn_Cmp_Lt; - long greater = pnc & pn_Cmp_Gt; - - code |= (lesser ? pn_Cmp_Gt : 0) | (greater ? pn_Cmp_Lt : 0); - - return (pn_Cmp) code; + ir_relation code = relation & ~(ir_relation_less|ir_relation_greater); + bool less = relation & ir_relation_less; + bool greater = relation & ir_relation_greater; + code |= (less ? ir_relation_greater : 0) | (greater ? ir_relation_less : 0); + return code; } /** @@ -254,6 +251,10 @@ void set_irn_in(ir_node *node, int arity, ir_node **in) fix_backedges(irg->obst, node); memcpy((*pOld_in) + 1, in, sizeof(ir_node *) * arity); + + /* update irg flags */ + set_irg_outs_inconsistent(irg); + set_irg_loopinfo_inconsistent(irg); } ir_node *(get_irn_n)(const ir_node *node, int n) @@ -276,6 +277,10 @@ void set_irn_n(ir_node *node, int n, ir_node *in) edges_notify_edge(node, n, in, node->in[n + 1], irg); node->in[n + 1] = in; + + /* update irg flags */ + set_irg_outs_inconsistent(irg); + set_irg_loopinfo_inconsistent(irg); } int add_irn_n(ir_node *node, ir_node *in) @@ -519,19 +524,6 @@ ir_type *is_frame_pointer(const ir_node *n) return NULL; } -/* Test whether arbitrary node is tls pointer, i.e. Proj(pn_Start_P_tls) - * from Start. If so returns tls type, else Null. */ -ir_type *is_tls_pointer(const ir_node *n) -{ - if (is_Proj(n) && (get_Proj_proj(n) == pn_Start_P_tls)) { - ir_node *start = get_Proj_pred(n); - if (is_Start(start)) { - return get_tls_type(); - } - } - return NULL; -} - ir_node **get_Block_cfgpred_arr(ir_node *node) { assert(is_Block(node)); @@ -602,16 +594,6 @@ int (Block_block_visited)(const ir_node *node) return _Block_block_visited(node); } -ir_node *(set_Block_dead)(ir_node *block) -{ - return _set_Block_dead(block); -} - -int (is_Block_dead)(const ir_node *block) -{ - return _is_Block_dead(block); -} - ir_extblk *get_Block_extbb(const ir_node *block) { ir_extblk *res; @@ -743,6 +725,9 @@ void set_End_keepalives(ir_node *end, int n, ir_node *in[]) end->in[1 + END_KEEPALIVE_OFFSET + i] = in[i]; edges_notify_edge(end, END_KEEPALIVE_OFFSET + i, end->in[1 + END_KEEPALIVE_OFFSET + i], NULL, irg); } + + /* update irg flags */ + set_irg_outs_inconsistent(irg); } /* Set new keep-alives from old keep-alives, skipping irn */ @@ -778,6 +763,9 @@ found: } /* now n - 1 keeps, 1 block input */ ARR_RESIZE(ir_node *, end->in, (n - 1) + 1 + END_KEEPALIVE_OFFSET); + + /* update irg flags */ + set_irg_outs_inconsistent(irg); } /* remove Bads, NoMems and doublets from the keep-alive set */ @@ -786,6 +774,7 @@ void remove_End_Bads_and_doublets(ir_node *end) pset_new_t keeps; int idx, n = get_End_n_keepalives(end); ir_graph *irg; + bool changed = false; if (n <= 0) return; @@ -797,6 +786,7 @@ void remove_End_Bads_and_doublets(ir_node *end) ir_node *ka = get_End_keepalive(end, idx); if (is_Bad(ka) || is_NoMem(ka) || pset_new_contains(&keeps, ka)) { + changed = true; /* remove the edge */ edges_notify_edge(end, idx, NULL, ka, irg); @@ -816,6 +806,10 @@ void remove_End_Bads_and_doublets(ir_node *end) ARR_RESIZE(ir_node *, end->in, n + 1 + END_KEEPALIVE_OFFSET); pset_new_destroy(&keeps); + + if (changed) { + set_irg_outs_inconsistent(irg); + } } void free_End(ir_node *end) @@ -1048,19 +1042,19 @@ int Call_has_callees(const ir_node *node) (node->attr.call.callee_arr != NULL)); } -int get_Call_n_callees(const ir_node *node) +size_t get_Call_n_callees(const ir_node *node) { assert(is_Call(node) && node->attr.call.callee_arr); return ARR_LEN(node->attr.call.callee_arr); } -ir_entity *get_Call_callee(const ir_node *node, int pos) +ir_entity *get_Call_callee(const ir_node *node, size_t pos) { - assert(pos >= 0 && pos < get_Call_n_callees(node)); + assert(pos < get_Call_n_callees(node)); return node->attr.call.callee_arr[pos]; } -void set_Call_callee_arr(ir_node *node, const int n, ir_entity ** arr) +void set_Call_callee_arr(ir_node *node, size_t n, ir_entity ** arr) { ir_graph *irg = get_irn_irg(node); @@ -1243,76 +1237,31 @@ int is_memop(const ir_node *node) ir_node *get_memop_mem(const ir_node *node) { assert(is_memop(node)); + assert(n_Load_mem == 0 && n_Store_mem == 0); return get_irn_n(node, 0); } void set_memop_mem(ir_node *node, ir_node *mem) { assert(is_memop(node)); + assert(n_Load_mem == 0 && n_Store_mem == 0); set_irn_n(node, 0, mem); } ir_node *get_memop_ptr(const ir_node *node) { assert(is_memop(node)); + assert(n_Load_mem == 1 && n_Store_mem == 1); return get_irn_n(node, 1); } void set_memop_ptr(ir_node *node, ir_node *ptr) { assert(is_memop(node)); + assert(n_Load_mem == 1 && n_Store_mem == 1); set_irn_n(node, 1, ptr); } -ir_volatility get_Load_volatility(const ir_node *node) -{ - assert(is_Load(node)); - return (ir_volatility)node->attr.load.volatility; -} - -void set_Load_volatility(ir_node *node, ir_volatility volatility) -{ - assert(is_Load(node)); - node->attr.load.volatility = volatility; -} - -ir_align get_Load_align(const ir_node *node) -{ - assert(is_Load(node)); - return (ir_align)node->attr.load.aligned; -} - -void set_Load_align(ir_node *node, ir_align align) -{ - assert(is_Load(node)); - node->attr.load.aligned = align; -} - - -ir_volatility get_Store_volatility(const ir_node *node) -{ - assert(is_Store(node)); - return (ir_volatility)node->attr.store.volatility; -} - -void set_Store_volatility(ir_node *node, ir_volatility volatility) -{ - assert(is_Store(node)); - node->attr.store.volatility = volatility; -} - -ir_align get_Store_align(const ir_node *node) -{ - assert(is_Store(node)); - return (ir_align)node->attr.store.aligned; -} - -void set_Store_align(ir_node *node, ir_align align) -{ - assert(is_Store(node)); - node->attr.store.aligned = align; -} - ir_node **get_Sync_preds_arr(ir_node *node) { @@ -1357,9 +1306,26 @@ int (is_arg_Proj)(const ir_node *node) return _is_arg_Proj(node); } -pn_Cmp (get_Proj_pn_cmp)(const ir_node *node) +int is_x_except_Proj(const ir_node *node) +{ + ir_node *pred; + if (!is_Proj(node)) + return false; + pred = get_Proj_pred(node); + if (!is_fragile_op(pred)) + return false; + return get_Proj_proj(node) == pred->op->pn_x_except; +} + +int is_x_regular_Proj(const ir_node *node) { - return _get_Proj_pn_cmp(node); + ir_node *pred; + if (!is_Proj(node)) + return false; + pred = get_Proj_pred(node); + if (!is_fragile_op(pred)) + return false; + return get_Proj_proj(node) == pred->op->pn_x_regular; } ir_node **get_Tuple_preds_arr(ir_node *node) @@ -1561,6 +1527,11 @@ int is_cfop(const ir_node *node) return is_op_cfopcode(get_irn_op(node)); } +int is_unknown_jump(const ir_node *node) +{ + return is_op_unknown_jump(get_irn_op(node)); +} + /* Returns true if the operation can change the control flow because of an exception. */ int is_fragile_op(const ir_node *node) @@ -1572,24 +1543,7 @@ int is_fragile_op(const ir_node *node) ir_node *get_fragile_op_mem(ir_node *node) { assert(node && is_fragile_op(node)); - - switch (get_irn_opcode(node)) { - case iro_Call : - case iro_Quot : - case iro_Div : - case iro_Mod : - case iro_Load : - case iro_Store : - case iro_Alloc : - case iro_Bound : - case iro_CopyB : - return get_irn_n(node, pn_Generic_M); - case iro_Bad : - case iro_Unknown: - return node; - default: - panic("should not be reached"); - } + return get_irn_n(node, node->op->fragile_mem_index); } /* Returns true if the operation is a forking control flow operation. */ @@ -1702,7 +1656,7 @@ static ir_type *get_Null_type(const ir_node *n) } /* Sets the get_type operation for an ir_op_ops. */ -ir_op_ops *firm_set_default_get_type_attr(ir_opcode code, ir_op_ops *ops) +ir_op_ops *firm_set_default_get_type_attr(unsigned code, ir_op_ops *ops) { switch (code) { case iro_SymConst: ops->get_type_attr = get_SymConst_attr_type; break; @@ -1727,7 +1681,7 @@ static ir_entity *get_Null_ent(const ir_node *n) } /* Sets the get_type operation for an ir_op_ops. */ -ir_op_ops *firm_set_default_get_entity_attr(ir_opcode code, ir_op_ops *ops) +ir_op_ops *firm_set_default_get_entity_attr(unsigned code, ir_op_ops *ops) { switch (code) { case iro_SymConst: ops->get_entity_attr = get_SymConst_attr_entity; break;