X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firop.c;h=3d1efc3ea1cfbe05895abe7d9bb303272cec68c9;hb=381b12255e4d00eef026acff738f24ebe8ea989b;hp=d78449b34837774e8527577333904eb741fc237d;hpb=a855b8f68c97cf18d2c7308bbc6157be9b72096f;p=libfirm diff --git a/ir/ir/irop.c b/ir/ir/irop.c index d78449b34..3d1efc3ea 100644 --- a/ir/ir/irop.c +++ b/ir/ir/irop.c @@ -20,9 +20,10 @@ # include "irop_t.h" # include "irnode_t.h" -# include "firmstat.h" +# include "irhooks.h" -# include "iropt.h" /* for firm_set_default_operations */ +# include "iropt_t.h" /* for firm_set_default_operations */ +# include "irvrfy_t.h" # include "xmalloc.h" @@ -88,8 +89,48 @@ ir_op *op_EndReg; ir_op *get_op_EndReg (void) { return op_EndReg; } ir_op *op_EndExcept; ir_op *get_op_EndExcept (void) { return op_EndExcept; } ir_op *op_NoMem; ir_op *get_op_NoMem (void) { return op_NoMem; } +ir_op *op_Mux; ir_op *get_op_Mux (void) { return op_Mux; } +/* + * Copies all attributes stored in the old node to the new node. + * Assumes both have the same opcode and sufficient size. + */ +void default_copy_attr(const ir_node *old_node, ir_node *new_node) { + unsigned size = firm_add_node_size; + + assert(get_irn_op(old_node) == get_irn_op(new_node)); + memcpy(&new_node->attr, &old_node->attr, get_op_attr_size(get_irn_op(old_node))); + + if (size > 0) { + /* copy additional node data */ + memcpy(get_irn_data(new_node, void, size), get_irn_data(old_node, void, size), size); + } +} + +/** + * Copies all attributes stored in the old node to the new node. + * Assumes both have the same opcode and sufficient size. + */ +static void +call_copy_attr(const ir_node *old_node, ir_node *new_node) { + default_copy_attr(old_node, new_node); + + remove_Call_callee_arr(new_node); +} + +/** + * Sets the copy_attr operation for an ir_op + */ +static ir_op *firm_set_default_copy_attr(ir_op *op) { + if (op->code == iro_Call) + op->copy_attr = call_copy_attr; + else + op->copy_attr = default_copy_attr; + + return op; +} + ir_op * new_ir_op(opcode code, const char *name, op_pin_state p, unsigned flags, op_arity opar, int op_index, size_t attr_size) { @@ -107,18 +148,22 @@ new_ir_op(opcode code, const char *name, op_pin_state p, unsigned flags, op_arit res->op_index = op_index; firm_set_default_operations(res); - stat_new_ir_op(res); + firm_set_default_copy_attr(res); + firm_set_default_verifyer(res); + + hook_new_ir_op(res); return res; } void free_ir_op(ir_op *code) { - stat_free_ir_op(code); + hook_free_ir_op(code); free(code); } void init_op(void) { +#define N irop_flag_none #define L irop_flag_labeled #define C irop_flag_commutative #define X irop_flag_cfopcode @@ -135,45 +180,45 @@ init_op(void) op_Return = new_ir_op(iro_Return, "Return", op_pin_state_pinned, L|X, oparity_zero, -1, 0); op_Raise = new_ir_op(iro_Raise, "Raise", op_pin_state_pinned, L|X, oparity_any, -1, 0); - op_Const = new_ir_op(iro_Const, "Const", op_pin_state_floats, 0, oparity_zero, -1, sizeof(const_attr)); - op_SymConst = new_ir_op(iro_SymConst, "SymConst", op_pin_state_floats, 0, oparity_zero, -1, sizeof(symconst_attr)); + op_Const = new_ir_op(iro_Const, "Const", op_pin_state_floats, N, oparity_zero, -1, sizeof(const_attr)); + op_SymConst = new_ir_op(iro_SymConst, "SymConst", op_pin_state_floats, N, oparity_zero, -1, sizeof(symconst_attr)); op_Sel = new_ir_op(iro_Sel, "Sel", op_pin_state_floats, L, oparity_any, -1, sizeof(sel_attr)); op_InstOf = new_ir_op(iro_InstOf, "InstOf", op_pin_state_floats, L, oparity_any, -1, sizeof(sel_attr)); op_Call = new_ir_op(iro_Call, "Call", op_pin_state_mem_pinned, L|F, oparity_variable, -1, sizeof(call_attr)); op_Add = new_ir_op(iro_Add, "Add", op_pin_state_floats, C, oparity_binary, 0, 0); - op_Minus = new_ir_op(iro_Minus, "Minus", op_pin_state_floats, 0, oparity_unary, 0, 0); + op_Minus = new_ir_op(iro_Minus, "Minus", op_pin_state_floats, N, oparity_unary, 0, 0); op_Sub = new_ir_op(iro_Sub, "Sub", op_pin_state_floats, L, oparity_binary, 0, 0); op_Mul = new_ir_op(iro_Mul, "Mul", op_pin_state_floats, C, oparity_binary, 0, 0); op_Quot = new_ir_op(iro_Quot, "Quot", op_pin_state_exc_pinned, L|F, oparity_binary, 1, sizeof(except_attr)); op_DivMod = new_ir_op(iro_DivMod, "DivMod", op_pin_state_exc_pinned, L|F, oparity_binary, 1, sizeof(except_attr)); op_Div = new_ir_op(iro_Div, "Div", op_pin_state_exc_pinned, L|F, oparity_binary, 1, sizeof(except_attr)); op_Mod = new_ir_op(iro_Mod, "Mod", op_pin_state_exc_pinned, L|F, oparity_binary, 1, sizeof(except_attr)); - op_Abs = new_ir_op(iro_Abs, "Abs", op_pin_state_floats, 0, oparity_unary, 0, 0); + op_Abs = new_ir_op(iro_Abs, "Abs", op_pin_state_floats, N, oparity_unary, 0, 0); op_And = new_ir_op(iro_And, "And", op_pin_state_floats, C, oparity_binary, 0, 0); op_Or = new_ir_op(iro_Or, "Or", op_pin_state_floats, C, oparity_binary, 0, 0); op_Eor = new_ir_op(iro_Eor, "Eor", op_pin_state_floats, C, oparity_binary, 0, 0); - op_Not = new_ir_op(iro_Not, "Not", op_pin_state_floats, 0, oparity_unary, 0, 0); + op_Not = new_ir_op(iro_Not, "Not", op_pin_state_floats, N, oparity_unary, 0, 0); op_Cmp = new_ir_op(iro_Cmp, "Cmp", op_pin_state_floats, L, oparity_binary, 0, 0); op_Shl = new_ir_op(iro_Shl, "Shl", op_pin_state_floats, L, oparity_binary, 0, 0); op_Shr = new_ir_op(iro_Shr, "Shr", op_pin_state_floats, L, oparity_binary, 0, 0); op_Shrs = new_ir_op(iro_Shrs, "Shrs", op_pin_state_floats, L, oparity_binary, 0, 0); op_Rot = new_ir_op(iro_Rot, "Rot", op_pin_state_floats, L, oparity_binary, 0, 0); - op_Conv = new_ir_op(iro_Conv, "Conv", op_pin_state_floats, 0, oparity_unary, 0, 0); - op_Cast = new_ir_op(iro_Cast, "Cast", op_pin_state_floats, 0, oparity_unary, 0, sizeof(cast_attr)); + op_Conv = new_ir_op(iro_Conv, "Conv", op_pin_state_floats, N, oparity_unary, 0, 0); + op_Cast = new_ir_op(iro_Cast, "Cast", op_pin_state_floats, N, oparity_unary, 0, sizeof(cast_attr)); op_Phi = new_ir_op(iro_Phi, "Phi", op_pin_state_pinned, L, oparity_variable, -1, sizeof(int)); op_Load = new_ir_op(iro_Load, "Load", op_pin_state_exc_pinned, L|F, oparity_any, -1, sizeof(load_attr)); op_Store = new_ir_op(iro_Store, "Store", op_pin_state_exc_pinned, L|F, oparity_any, -1, sizeof(store_attr)); op_Alloc = new_ir_op(iro_Alloc, "Alloc", op_pin_state_pinned, L|F, oparity_any, -1, sizeof(alloc_attr)); - op_Free = new_ir_op(iro_Free, "Free", op_pin_state_pinned, L, oparity_any, -1, sizeof(type *)); - op_Sync = new_ir_op(iro_Sync, "Sync", op_pin_state_pinned, 0, oparity_any, -1, 0); + op_Free = new_ir_op(iro_Free, "Free", op_pin_state_pinned, L, oparity_any, -1, sizeof(free_attr)); + op_Sync = new_ir_op(iro_Sync, "Sync", op_pin_state_pinned, N, oparity_any, -1, 0); - op_Proj = new_ir_op(iro_Proj, "Proj", op_pin_state_floats, 0, oparity_any, -1, sizeof(long)); + op_Proj = new_ir_op(iro_Proj, "Proj", op_pin_state_floats, N, oparity_any, -1, sizeof(long)); op_Tuple = new_ir_op(iro_Tuple, "Tuple", op_pin_state_floats, L, oparity_variable, -1, 0); - op_Id = new_ir_op(iro_Id, "Id", op_pin_state_floats, 0, oparity_any, -1, 0); + op_Id = new_ir_op(iro_Id, "Id", op_pin_state_floats, N, oparity_any, -1, 0); op_Bad = new_ir_op(iro_Bad, "Bad", op_pin_state_pinned, X|F, oparity_zero, -1, 0); op_Confirm = new_ir_op(iro_Confirm, "Confirm", op_pin_state_floats, L, oparity_any, -1, sizeof(confirm_attr)); @@ -184,7 +229,8 @@ init_op(void) op_EndReg = new_ir_op(iro_EndReg, "EndReg", op_pin_state_pinned, X|I, oparity_any, -1, sizeof(end_attr)); op_EndExcept = new_ir_op(iro_EndExcept, "EndExcept", op_pin_state_pinned, X|I, oparity_any, -1, sizeof(end_attr)); - op_NoMem = new_ir_op(iro_NoMem, "NoMem", op_pin_state_pinned, 0, oparity_zero, -1, 0); + op_NoMem = new_ir_op(iro_NoMem, "NoMem", op_pin_state_pinned, N, oparity_zero, -1, 0); + op_Mux = new_ir_op(iro_Mux, "Mux", op_pin_state_floats, N, oparity_trinary, -1, 0); #undef Y #undef F @@ -256,6 +302,7 @@ void finish_op(void) { free_ir_op (op_EndExcept); op_EndExcept = NULL; free_ir_op (op_NoMem ); op_NoMem = NULL; + free_ir_op (op_Mux ); op_Mux = NULL; } /* Returns the string for the opcode. */ @@ -267,7 +314,7 @@ opcode (get_op_code)(const ir_op *op){ return __get_op_code(op); } -ident *(get_op_ident)(ir_op *op){ +ident *(get_op_ident)(const ir_op *op){ return __get_op_ident(op); }