X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firop.c;h=2fec766312e57f62a894e21a20edbcd9f64ffabf;hb=169fd803ea2ed08171113c1fd7ab4e528e1ebc26;hp=fce150ab1b9798862ca7faef3e91735889c0f7db;hpb=516169c8a246f3e7e65a595b691877f8d7e90650;p=libfirm diff --git a/ir/ir/irop.c b/ir/ir/irop.c index fce150ab1..2fec76631 100644 --- a/ir/ir/irop.c +++ b/ir/ir/irop.c @@ -23,6 +23,7 @@ # include "irhooks.h" # include "iropt_t.h" /* for firm_set_default_operations */ +# include "irvrfy_t.h" # include "xmalloc.h" @@ -34,6 +35,7 @@ ir_op *op_Block; ir_op *get_op_Block (void) { return op_Block; } ir_op *op_Start; ir_op *get_op_Start (void) { return op_Start; } ir_op *op_End; ir_op *get_op_End (void) { return op_End; } ir_op *op_Jmp; ir_op *get_op_Jmp (void) { return op_Jmp; } +ir_op *op_IJmp; ir_op *get_op_IJmp (void) { return op_IJmp; } ir_op *op_Cond; ir_op *get_op_Cond (void) { return op_Cond; } ir_op *op_Return; ir_op *get_op_Return (void) { return op_Return; } ir_op *op_Raise; ir_op *get_op_Raise (void) { return op_Raise; } @@ -118,12 +120,21 @@ call_copy_attr(const ir_node *old_node, ir_node *new_node) { remove_Call_callee_arr(new_node); } +static void +block_copy_attr(const ir_node *old_node, ir_node *new_node) +{ + default_copy_attr(old_node, new_node); + INIT_LIST_HEAD(&new_node->attr.block.succ_head); +} + /** * 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 if (op->code == iro_Block) + op->copy_attr = block_copy_attr; else op->copy_attr = default_copy_attr; @@ -148,6 +159,7 @@ new_ir_op(opcode code, const char *name, op_pin_state p, unsigned flags, op_arit firm_set_default_operations(res); firm_set_default_copy_attr(res); + firm_set_default_verifyer(res); hook_new_ir_op(res); return res; @@ -168,18 +180,21 @@ init_op(void) #define I irop_flag_ip_cfopcode #define F irop_flag_fragile #define Y irop_flag_forking +#define H irop_flag_highlevel +#define c irop_flag_constlike op_Block = new_ir_op(iro_Block, "Block", op_pin_state_pinned, L, oparity_variable, -1, sizeof(block_attr)); op_Start = new_ir_op(iro_Start, "Start", op_pin_state_pinned, X, oparity_zero, -1, sizeof(start_attr)); op_End = new_ir_op(iro_End, "End", op_pin_state_pinned, X, oparity_dynamic, -1, 0); op_Jmp = new_ir_op(iro_Jmp, "Jmp", op_pin_state_pinned, X, oparity_zero, -1, 0); + op_IJmp = new_ir_op(iro_IJmp, "IJmp", op_pin_state_pinned, X, oparity_unary, -1, 0); op_Cond = new_ir_op(iro_Cond, "Cond", op_pin_state_pinned, L|X|Y, oparity_any, -1, sizeof(cond_attr)); 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, 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_Const = new_ir_op(iro_Const, "Const", op_pin_state_floats, c, oparity_zero, -1, sizeof(const_attr)); + op_SymConst = new_ir_op(iro_SymConst, "SymConst", op_pin_state_floats, c, 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)); @@ -204,7 +219,7 @@ init_op(void) 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, 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_Cast = new_ir_op(iro_Cast, "Cast", op_pin_state_floats, N|H, oparity_unary, 0, sizeof(cast_attr)); op_Phi = new_ir_op(iro_Phi, "Phi", op_pin_state_pinned, L, oparity_variable, -1, sizeof(int)); @@ -218,7 +233,7 @@ init_op(void) 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, 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)); + op_Confirm = new_ir_op(iro_Confirm, "Confirm", op_pin_state_floats, L|H, oparity_any, -1, sizeof(confirm_attr)); op_Unknown = new_ir_op(iro_Unknown, "Unknown", op_pin_state_pinned, X|F, oparity_zero, -1, 0); op_Filter = new_ir_op(iro_Filter, "Filter", op_pin_state_pinned, L, oparity_variable, -1, sizeof(filter_attr)); @@ -230,6 +245,7 @@ init_op(void) 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 H #undef Y #undef F #undef I @@ -309,11 +325,11 @@ const char *get_op_name (const ir_op *op) { } opcode (get_op_code)(const ir_op *op){ - return __get_op_code(op); + return _get_op_code(op); } ident *(get_op_ident)(const ir_op *op){ - return __get_op_ident(op); + return _get_op_ident(op); } const char *get_op_pin_state_name(op_pin_state s) { @@ -328,8 +344,8 @@ const char *get_op_pin_state_name(op_pin_state s) { return ""; } -op_pin_state (get_op_pinned)(const ir_op *op){ - return __get_op_pinned(op); +op_pin_state (get_op_pinned)(const ir_op *op) { + return _get_op_pinned(op); } /* Sets op_pin_state_pinned in the opcode. Setting it to floating has no effect @@ -339,6 +355,17 @@ void set_op_pinned(ir_op *op, op_pin_state op_pin_state_pinned) { op->op_pin_state_pinned = op_pin_state_pinned; } +/* retrieve the next free opcode */ unsigned get_next_ir_opcode(void) { return next_iro++; } + +/* Returns the generic function pointer from an ir operation. */ +op_func (get_generic_function_ptr)(const ir_op *op) { + return _get_generic_function_ptr(op); +} + +/* Store a generic function pointer into an ir operation. */ +void (set_generic_function_ptr)(ir_op *op, op_func func) { + _set_generic_function_ptr(op, func); +}