X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firop.c;h=dc4b9308a75e7fed96b84f2fcf4febef9b5c00ee;hb=7498ed3766f3f98604d96d1b75978a3a9e6768ed;hp=1971fd382fb032cd438a44dc3aa453701531ddb8;hpb=a17babab0fc930abd3cd3fe516015bd64437435a;p=libfirm diff --git a/ir/ir/irop.c b/ir/ir/irop.c index 1971fd382..dc4b9308a 100644 --- a/ir/ir/irop.c +++ b/ir/ir/irop.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1995-2007 University of Karlsruhe. All right reserved. + * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved. * * This file is part of libFirm. * @@ -65,6 +65,7 @@ ir_op *op_Add; ir_op *get_op_Add (void) { return op_Add; } ir_op *op_Sub; ir_op *get_op_Sub (void) { return op_Sub; } ir_op *op_Minus; ir_op *get_op_Minus (void) { return op_Minus; } ir_op *op_Mul; ir_op *get_op_Mul (void) { return op_Mul; } +ir_op *op_Mulh; ir_op *get_op_Mulh (void) { return op_Mulh; } ir_op *op_Quot; ir_op *get_op_Quot (void) { return op_Quot; } ir_op *op_DivMod; ir_op *get_op_DivMod (void) { return op_DivMod; } ir_op *op_Div; ir_op *get_op_Div (void) { return op_Div; } @@ -115,6 +116,9 @@ ir_op *op_Bound; ir_op *get_op_Bound (void) { return op_Bound; } ir_op *op_Pin; ir_op *get_op_Pin (void) { return op_Pin; } +ir_op *op_ASM; ir_op *get_op_ASM (void) { return op_ASM; } +ir_op *op_Anchor; ir_op *get_op_Anchor (void) { return op_Anchor; } + /* * Copies all attributes stored in the old node to the new node. * Assumes both have the same opcode and sufficient size. @@ -148,6 +152,7 @@ block_copy_attr(const ir_node *old_node, ir_node *new_node) { ir_graph *irg = current_ir_graph; default_copy_attr(old_node, new_node); + new_node->attr.block.phis = NULL; new_node->attr.block.cg_backedge = NULL; new_node->attr.block.backedge = new_backedge_arr(irg->obst, get_irn_arity(new_node)); INIT_LIST_HEAD(&new_node->attr.block.succ_head); @@ -161,7 +166,8 @@ phi_copy_attr(const ir_node *old_node, ir_node *new_node) { ir_graph *irg = current_ir_graph; default_copy_attr(old_node, new_node); - new_node->attr.phi_backedge = new_backedge_arr(irg->obst, get_irn_arity(new_node)); + new_node->attr.phi.next = NULL; + new_node->attr.phi.u.backedge = new_backedge_arr(irg->obst, get_irn_arity(new_node)); } /** @@ -175,6 +181,19 @@ filter_copy_attr(const ir_node *old_node, ir_node *new_node) { new_node->attr.filter.backedge = new_backedge_arr(irg->obst, get_irn_arity(new_node)); } +/** + * Copies all ASM attributes stored in old node to the new node + */ +static void +ASM_copy_attr(const ir_node *old_node, ir_node *new_node) { + ir_graph *irg = current_ir_graph; + + default_copy_attr(old_node, new_node); + new_node->attr.assem.inputs = DUP_ARR_D(ir_asm_constraint, irg->obst, old_node->attr.assem.inputs); + new_node->attr.assem.outputs = DUP_ARR_D(ir_asm_constraint, irg->obst, old_node->attr.assem.outputs); + new_node->attr.assem.clobber = DUP_ARR_D(ir_asm_constraint, irg->obst, old_node->attr.assem.clobber); +} + /** * Sets the default copy_attr operation for an ir_ops * @@ -185,15 +204,23 @@ filter_copy_attr(const ir_node *old_node, ir_node *new_node) { * The operations. */ static ir_op_ops *firm_set_default_copy_attr(ir_opcode code, ir_op_ops *ops) { - if (code == iro_Call) + switch(code) { + case iro_Call: ops->copy_attr = call_copy_attr; - else if (code == iro_Block) + break; + case iro_Block: ops->copy_attr = block_copy_attr; - else if (code == iro_Phi) + break; + case iro_Phi: ops->copy_attr = phi_copy_attr; - else if (code == iro_Filter) + break; + case iro_Filter: ops->copy_attr = filter_copy_attr; - else { + break; + case iro_ASM: + ops->copy_attr = ASM_copy_attr; + break; + default: /* not allowed to be NULL */ if (! ops->copy_attr) ops->copy_attr = default_copy_attr; @@ -203,7 +230,7 @@ static ir_op_ops *firm_set_default_copy_attr(ir_opcode code, ir_op_ops *ops) { /* Creates a new ir operation. */ ir_op * -new_ir_op(ir_opcode code, const char *name, op_pin_state p, +new_ir_op(unsigned code, const char *name, op_pin_state p, unsigned flags, op_arity opar, int op_index, size_t attr_size, const ir_op_ops *ops) { @@ -214,7 +241,7 @@ new_ir_op(ir_opcode code, const char *name, op_pin_state p, res->code = code; res->name = new_id_from_chars(name, strlen(name)); - res->op_pin_state_pinned = p; + res->pin_state = p; res->attr_size = attr_size; res->flags = flags; res->opar = opar; @@ -258,6 +285,7 @@ init_op(void) #define c irop_flag_constlike #define K irop_flag_keep #define S irop_flag_start_block +#define M irop_flag_uses_memory /* Caution: A great deal of Firm optimizations depend an right operations flags. */ op_Block = new_ir_op(iro_Block, "Block", op_pin_state_pinned, L, oparity_variable, -1, sizeof(block_attr), NULL); @@ -265,24 +293,25 @@ init_op(void) op_Start = new_ir_op(iro_Start, "Start", op_pin_state_pinned, X, oparity_zero, -1, 0, NULL); op_End = new_ir_op(iro_End, "End", op_pin_state_pinned, X, oparity_dynamic, -1, 0, NULL); op_Jmp = new_ir_op(iro_Jmp, "Jmp", op_pin_state_pinned, X, oparity_zero, -1, 0, NULL); - op_IJmp = new_ir_op(iro_IJmp, "IJmp", op_pin_state_pinned, X|K, oparity_unary, -1, 0, NULL); + op_IJmp = new_ir_op(iro_IJmp, "IJmp", op_pin_state_pinned, X|Y|K, oparity_unary, -1, 0, NULL); op_Cond = new_ir_op(iro_Cond, "Cond", op_pin_state_pinned, X|Y, oparity_any, -1, sizeof(cond_attr), NULL); op_Return = new_ir_op(iro_Return, "Return", op_pin_state_pinned, X, oparity_variable, -1, 0, NULL); op_Const = new_ir_op(iro_Const, "Const", op_pin_state_floats, c|S, oparity_zero, -1, sizeof(const_attr), NULL); op_SymConst = new_ir_op(iro_SymConst, "SymConst", op_pin_state_floats, c|S, oparity_zero, -1, sizeof(symconst_attr), NULL); - op_Sel = new_ir_op(iro_Sel, "Sel", op_pin_state_floats, H, oparity_any, -1, sizeof(sel_attr), NULL); + op_Sel = new_ir_op(iro_Sel, "Sel", op_pin_state_floats, N, oparity_any, -1, sizeof(sel_attr), NULL); - op_Call = new_ir_op(iro_Call, "Call", op_pin_state_mem_pinned, F, oparity_variable, -1, sizeof(call_attr), NULL); + op_Call = new_ir_op(iro_Call, "Call", op_pin_state_mem_pinned, F|M, oparity_variable, -1, sizeof(call_attr), NULL); op_Add = new_ir_op(iro_Add, "Add", op_pin_state_floats, C, oparity_binary, 0, 0, NULL); - op_Minus = new_ir_op(iro_Minus, "Minus", op_pin_state_floats, N, oparity_unary, 0, 0, NULL); op_Sub = new_ir_op(iro_Sub, "Sub", op_pin_state_floats, N, oparity_binary, 0, 0, NULL); + op_Minus = new_ir_op(iro_Minus, "Minus", op_pin_state_floats, N, oparity_unary, 0, 0, NULL); op_Mul = new_ir_op(iro_Mul, "Mul", op_pin_state_floats, C, oparity_binary, 0, 0, NULL); - op_Quot = new_ir_op(iro_Quot, "Quot", op_pin_state_exc_pinned, F, oparity_binary, 1, sizeof(divmod_attr), NULL); - op_DivMod = new_ir_op(iro_DivMod, "DivMod", op_pin_state_exc_pinned, F, oparity_binary, 1, sizeof(divmod_attr), NULL); - op_Div = new_ir_op(iro_Div, "Div", op_pin_state_exc_pinned, F, oparity_binary, 1, sizeof(divmod_attr), NULL); - op_Mod = new_ir_op(iro_Mod, "Mod", op_pin_state_exc_pinned, F, oparity_binary, 1, sizeof(divmod_attr), NULL); + op_Mulh = new_ir_op(iro_Mulh, "Mulh", op_pin_state_floats, C, oparity_binary, 0, 0, NULL); + op_Quot = new_ir_op(iro_Quot, "Quot", op_pin_state_exc_pinned, F|M, oparity_binary, 1, sizeof(divmod_attr), NULL); + op_DivMod = new_ir_op(iro_DivMod, "DivMod", op_pin_state_exc_pinned, F|M, oparity_binary, 1, sizeof(divmod_attr), NULL); + op_Div = new_ir_op(iro_Div, "Div", op_pin_state_exc_pinned, F|M, oparity_binary, 1, sizeof(divmod_attr), NULL); + op_Mod = new_ir_op(iro_Mod, "Mod", op_pin_state_exc_pinned, F|M, oparity_binary, 1, sizeof(divmod_attr), NULL); op_Abs = new_ir_op(iro_Abs, "Abs", op_pin_state_floats, N, oparity_unary, 0, 0, NULL); op_And = new_ir_op(iro_And, "And", op_pin_state_floats, C, oparity_binary, 0, 0, NULL); op_Or = new_ir_op(iro_Or, "Or", op_pin_state_floats, C, oparity_binary, 0, 0, NULL); @@ -294,17 +323,17 @@ init_op(void) op_Shrs = new_ir_op(iro_Shrs, "Shrs", op_pin_state_floats, N, oparity_binary, 0, 0, NULL); op_Rot = new_ir_op(iro_Rot, "Rot", op_pin_state_floats, N, oparity_binary, 0, 0, NULL); op_Conv = new_ir_op(iro_Conv, "Conv", op_pin_state_floats, N, oparity_unary, 0, sizeof(conv_attr), NULL); - op_Cast = new_ir_op(iro_Cast, "Cast", op_pin_state_floats, N|H, oparity_unary, 0, sizeof(cast_attr), NULL); + op_Cast = new_ir_op(iro_Cast, "Cast", op_pin_state_floats, H, oparity_unary, 0, sizeof(cast_attr), NULL); op_Carry = new_ir_op(iro_Carry, "Carry", op_pin_state_floats, C, oparity_binary, 0, 0, NULL); op_Borrow = new_ir_op(iro_Borrow, "Borrow", op_pin_state_floats, N, oparity_binary, 0, 0, NULL); - op_Phi = new_ir_op(iro_Phi, "Phi", op_pin_state_pinned, N, oparity_variable, -1, sizeof(phi0_attr), NULL); + op_Phi = new_ir_op(iro_Phi, "Phi", op_pin_state_pinned, N, oparity_variable, -1, sizeof(phi_attr), NULL); - op_Load = new_ir_op(iro_Load, "Load", op_pin_state_exc_pinned, F, oparity_any, -1, sizeof(load_attr), NULL); - op_Store = new_ir_op(iro_Store, "Store", op_pin_state_exc_pinned, F, oparity_any, -1, sizeof(store_attr), NULL); - op_Alloc = new_ir_op(iro_Alloc, "Alloc", op_pin_state_pinned, F, oparity_any, -1, sizeof(alloc_attr), NULL); - op_Free = new_ir_op(iro_Free, "Free", op_pin_state_pinned, N, oparity_any, -1, sizeof(free_attr), NULL); - op_Sync = new_ir_op(iro_Sync, "Sync", op_pin_state_pinned, N, oparity_dynamic, -1, 0, NULL); + op_Load = new_ir_op(iro_Load, "Load", op_pin_state_exc_pinned, F|M, oparity_any, -1, sizeof(load_attr), NULL); + op_Store = new_ir_op(iro_Store, "Store", op_pin_state_exc_pinned, F|M, oparity_any, -1, sizeof(store_attr), NULL); + op_Alloc = new_ir_op(iro_Alloc, "Alloc", op_pin_state_pinned, F|M, oparity_any, -1, sizeof(alloc_attr), NULL); + op_Free = new_ir_op(iro_Free, "Free", op_pin_state_pinned, N|M, oparity_any, -1, sizeof(free_attr), NULL); + op_Sync = new_ir_op(iro_Sync, "Sync", op_pin_state_floats, N, oparity_dynamic, -1, 0, NULL); op_Proj = new_ir_op(iro_Proj, "Proj", op_pin_state_floats, N, oparity_unary, -1, sizeof(long), NULL); op_Tuple = new_ir_op(iro_Tuple, "Tuple", op_pin_state_floats, L, oparity_variable, -1, 0, NULL); @@ -312,7 +341,7 @@ init_op(void) op_Bad = new_ir_op(iro_Bad, "Bad", op_pin_state_pinned, X|F|S, oparity_zero, -1, 0, NULL); op_Confirm = new_ir_op(iro_Confirm, "Confirm", op_pin_state_pinned, H, oparity_any, -1, sizeof(confirm_attr), NULL); - op_Unknown = new_ir_op(iro_Unknown, "Unknown", op_pin_state_pinned, X|F|S, oparity_zero, -1, 0, NULL); + op_Unknown = new_ir_op(iro_Unknown, "Unknown", op_pin_state_pinned, X|F|S|c, oparity_zero, -1, 0, NULL); op_Filter = new_ir_op(iro_Filter, "Filter", op_pin_state_pinned, N, oparity_variable, -1, sizeof(filter_attr), NULL); op_Break = new_ir_op(iro_Break, "Break", op_pin_state_pinned, X, oparity_zero, -1, 0, NULL); op_CallBegin = new_ir_op(iro_CallBegin, "CallBegin", op_pin_state_pinned, X|I, oparity_any, -1, sizeof(callbegin_attr), NULL); @@ -322,7 +351,7 @@ init_op(void) op_NoMem = new_ir_op(iro_NoMem, "NoMem", op_pin_state_pinned, N, oparity_zero, -1, 0, NULL); op_Mux = new_ir_op(iro_Mux, "Mux", op_pin_state_floats, N, oparity_trinary, -1, 0, NULL); op_Psi = new_ir_op(iro_Psi, "Psi", op_pin_state_floats, N, oparity_variable, -1, 0, NULL); - op_CopyB = new_ir_op(iro_CopyB, "CopyB", op_pin_state_mem_pinned, F|H, oparity_trinary, -1, sizeof(copyb_attr), NULL); + op_CopyB = new_ir_op(iro_CopyB, "CopyB", op_pin_state_mem_pinned, F|H|M, oparity_trinary, -1, sizeof(copyb_attr), NULL); op_InstOf = new_ir_op(iro_InstOf, "InstOf", op_pin_state_mem_pinned, H, oparity_unary, -1, sizeof(io_attr), NULL); op_Raise = new_ir_op(iro_Raise, "Raise", op_pin_state_pinned, H|X, oparity_any, -1, 0, NULL); @@ -330,6 +359,10 @@ init_op(void) op_Pin = new_ir_op(iro_Pin, "Pin", op_pin_state_pinned, H, oparity_unary, -1, 0, NULL); + op_ASM = new_ir_op(iro_ASM, "ASM", op_pin_state_mem_pinned, K|M, oparity_variable, -1, sizeof(asm_attr), NULL); + + op_Anchor = new_ir_op(iro_Anchor, "Anchor", op_pin_state_pinned, N, oparity_variable, -1, 0, NULL); + #undef S #undef H #undef Y @@ -338,6 +371,7 @@ init_op(void) #undef X #undef C #undef L +#undef E } /* init_op */ @@ -361,6 +395,7 @@ void finish_op(void) { free_ir_op (op_Minus ); op_Minus = NULL; free_ir_op (op_Sub ); op_Sub = NULL; free_ir_op (op_Mul ); op_Mul = NULL; + free_ir_op (op_Mulh ); op_Mulh = NULL; free_ir_op (op_Quot ); op_Quot = NULL; free_ir_op (op_DivMod ); op_DivMod = NULL; free_ir_op (op_Div ); op_Div = NULL; @@ -411,6 +446,8 @@ void finish_op(void) { free_ir_op (op_Bound ); op_Bound = NULL; free_ir_op (op_Pin ); op_Pin = NULL; + free_ir_op (op_ASM ); op_ASM = NULL; + free_ir_op (op_Anchor ); op_Anchor = NULL; } /* Returns the string for the opcode. */ @@ -418,7 +455,7 @@ const char *get_op_name (const ir_op *op) { return get_id_str(op->name); } /* get_op_name */ -ir_opcode (get_op_code)(const ir_op *op){ +unsigned (get_op_code)(const ir_op *op){ return _get_op_code(op); } /* get_op_code */ @@ -444,9 +481,9 @@ op_pin_state (get_op_pinned)(const ir_op *op) { /* Sets op_pin_state_pinned in the opcode. Setting it to floating has no effect for Phi, Block and control flow nodes. */ -void set_op_pinned(ir_op *op, op_pin_state op_pin_state_pinned) { - if (op == op_Block || op == op_Phi || is_cfopcode(op)) return; - op->op_pin_state_pinned = op_pin_state_pinned; +void set_op_pinned(ir_op *op, op_pin_state pinned) { + if (op == op_Block || op == op_Phi || is_op_cfopcode(op)) return; + op->pin_state = pinned; } /* set_op_pinned */ /* retrieve the next free opcode */