X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fia32%2Fia32_new_nodes.c;h=7452cb9ef0792bac58594a0d37f773ac3ed55924;hb=50b4ecceaf7e7d764244725e67912f97dcd3b577;hp=8937fe64ff389498494eb64c4f58fd746fc54f76;hpb=32ea6ea0320f551448bb66e534e3351977464d42;p=libfirm diff --git a/ir/be/ia32/ia32_new_nodes.c b/ir/be/ia32/ia32_new_nodes.c index 8937fe64f..7452cb9ef 100644 --- a/ir/be/ia32/ia32_new_nodes.c +++ b/ir/be/ia32/ia32_new_nodes.c @@ -38,7 +38,7 @@ #include "ircons_t.h" #include "iropt_t.h" #include "irop.h" -#include "irvrfy_t.h" +#include "irverify_t.h" #include "irprintf.h" #include "iredges.h" #include "error.h" @@ -55,17 +55,6 @@ #include "gen_ia32_regalloc_if.h" #include "gen_ia32_machine.h" -/*********************************************************************************** - * _ _ _ __ - * | | (_) | | / _| - * __| |_ _ _ __ ___ _ __ ___ _ __ _ _ __ | |_ ___ _ __| |_ __ _ ___ ___ - * / _` | | | | '_ ` _ \| '_ \ / _ \ '__| | | '_ \| __/ _ \ '__| _/ _` |/ __/ _ \ - * | (_| | |_| | | | | | | |_) | __/ | | | | | | || __/ | | || (_| | (_| __/ - * \__,_|\__,_|_| |_| |_| .__/ \___|_| |_|_| |_|\__\___|_| |_| \__,_|\___\___| - * | | - * |_| - ***********************************************************************************/ - /** * Dumper interface for dumping ia32 nodes in vcg. * @param n the node to dump @@ -73,28 +62,27 @@ * @param reason indicates which kind of information should be dumped * @return 0 on success or != 0 on failure */ -static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) +static void ia32_dump_node(FILE *F, ir_node *n, dump_reason_t reason) { - ir_mode *mode = NULL; - int bad = 0; + ir_mode *mode = NULL; switch (reason) { case dump_node_opcode_txt: fprintf(F, "%s", get_irn_opname(n)); - if(is_ia32_Immediate(n) || is_ia32_Const(n)) { + if (is_ia32_Immediate(n) || is_ia32_Const(n)) { const ia32_immediate_attr_t *attr = get_ia32_immediate_attr_const(n); fputc(' ', F); - if(attr->symconst) { - if(attr->sc_sign) { + if (attr->symconst) { + if (attr->sc_sign) { fputc('-', F); } fputs(get_entity_name(attr->symconst), F); } - if(attr->offset != 0 || attr->symconst == NULL) { - if(attr->offset > 0 && attr->symconst != NULL) { + if (attr->offset != 0 || attr->symconst == NULL) { + if (attr->offset > 0 && attr->symconst != NULL) { fputc('+', F); } fprintf(F, "%ld", attr->offset); @@ -106,26 +94,26 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) else { const ia32_attr_t *attr = get_ia32_attr_const(n); - if(attr->am_sc != NULL || attr->am_offs != 0) + if (attr->am_sc != NULL || attr->am_offs != 0) fputs(" [", F); - if(attr->am_sc != NULL) { - if(attr->data.am_sc_sign) { + if (attr->am_sc != NULL) { + if (attr->data.am_sc_sign) { fputc('-', F); } fputs(get_entity_name(attr->am_sc), F); - if(attr->data.am_sc_no_pic_adjust) { + if (attr->data.am_sc_no_pic_adjust) { fputs("(no_pic_adjust)", F); } } - if(attr->am_offs != 0) { - if(attr->am_offs > 0 && attr->am_sc != NULL) { + if (attr->am_offs != 0) { + if (attr->am_offs > 0 && attr->am_sc != NULL) { fputc('+', F); } fprintf(F, "%d", attr->am_offs); } - if(attr->am_sc != NULL || attr->am_offs != 0) + if (attr->am_sc != NULL || attr->am_offs != 0) fputc(']', F); } break; @@ -181,19 +169,19 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) } /* dump AM offset */ - if(get_ia32_am_offs_int(n) != 0) { + if (get_ia32_am_offs_int(n) != 0) { fprintf(F, "AM offset = %d\n", get_ia32_am_offs_int(n)); } /* dump AM symconst */ - if(get_ia32_am_sc(n) != NULL) { + if (get_ia32_am_sc(n) != NULL) { ir_entity *ent = get_ia32_am_sc(n); ident *id = get_entity_ld_ident(ent); fprintf(F, "AM symconst = %s\n", get_id_str(id)); } /* dump AM scale */ - fprintf(F, "AM scale = %d\n", get_ia32_am_scale(n)); + fprintf(F, "AM scale = %u\n", get_ia32_am_scale(n)); /* dump pn code */ if (is_ia32_SwitchJmp(n)) { @@ -201,7 +189,8 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) } else if (is_ia32_CMovcc(n) || is_ia32_Setcc(n) || is_ia32_Jcc(n)) { ia32_attr_t *attr = get_ia32_attr(n); long pnc = get_ia32_condcode(n); - fprintf(F, "pn_code = 0x%lX (%s)\n", pnc, get_pnc_string(pnc & pn_Cmp_True)); + fprintf(F, "pn_code = 0x%X (%s)\n", (unsigned) pnc, + get_pnc_string(pnc & pn_Cmp_True)); fprintf(F, "ins_permuted = %u \n", attr->data.ins_permuted); fprintf(F, "cmp_unsigned = %u \n", attr->data.cmp_unsigned); } @@ -213,7 +202,7 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) fprintf(F, "commutative = %d\n", is_ia32_commutative(n)); fprintf(F, "need stackent = %d\n", is_ia32_need_stackent(n)); fprintf(F, "is reload = %d\n", is_ia32_is_reload(n)); - fprintf(F, "latency = %d\n", get_ia32_latency(n)); + fprintf(F, "latency = %u\n", get_ia32_latency(n)); /* dump frame entity */ fprintf(F, "frame entity = "); @@ -249,23 +238,10 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) break; } - - return bad; } -/*************************************************************************************************** - * _ _ _ __ _ _ _ _ - * | | | | | | / / | | | | | | | | - * __ _| |_| |_ _ __ ___ ___| |_ / /_ _ ___| |_ _ __ ___ ___| |_| |__ ___ __| |___ - * / _` | __| __| '__| / __|/ _ \ __| / / _` |/ _ \ __| | '_ ` _ \ / _ \ __| '_ \ / _ \ / _` / __| - * | (_| | |_| |_| | \__ \ __/ |_ / / (_| | __/ |_ | | | | | | __/ |_| | | | (_) | (_| \__ \ - * \__,_|\__|\__|_| |___/\___|\__/_/ \__, |\___|\__| |_| |_| |_|\___|\__|_| |_|\___/ \__,_|___/ - * __/ | - * |___/ - ***************************************************************************************************/ - ia32_attr_t *get_ia32_attr(ir_node *node) { assert(is_ia32_irn(node) && "need ia32 node to get ia32 attributes"); @@ -506,7 +482,7 @@ void ia32_copy_am_attrs(ir_node *to, const ir_node *from) set_ia32_ls_mode(to, get_ia32_ls_mode(from)); set_ia32_am_scale(to, get_ia32_am_scale(from)); set_ia32_am_sc(to, get_ia32_am_sc(from)); - if(is_ia32_am_sc_sign(from)) + if (is_ia32_am_sc_sign(from)) set_ia32_am_sc_sign(to); add_ia32_am_offs_int(to, get_ia32_am_offs_int(from)); set_ia32_frame_ent(to, get_ia32_frame_ent(from)); @@ -656,7 +632,7 @@ void set_ia32_frame_ent(ir_node *node, ir_entity *ent) { ia32_attr_t *attr = get_ia32_attr(node); attr->frame_ent = ent; - if(ent != NULL) + if (ent != NULL) set_ia32_use_frame(node); else clear_ia32_use_frame(node); @@ -673,45 +649,6 @@ unsigned get_ia32_latency(const ir_node *node) return op_attr->latency; } -/** - * Returns the argument register requirements of an ia32 node. - */ -const arch_register_req_t **get_ia32_in_req_all(const ir_node *node) -{ - const ia32_attr_t *attr = get_ia32_attr_const(node); - return attr->in_req; -} - -/** - * Sets the argument register requirements of an ia32 node. - */ -void set_ia32_in_req_all(ir_node *node, const arch_register_req_t **reqs) -{ - ia32_attr_t *attr = get_ia32_attr(node); - attr->in_req = reqs; -} - -/** - * Returns the argument register requirement at position pos of an ia32 node. - */ -const arch_register_req_t *get_ia32_in_req(const ir_node *node, int pos) -{ - const ia32_attr_t *attr = get_ia32_attr_const(node); - if(attr->in_req == NULL) - return arch_no_register_req; - - return attr->in_req[pos]; -} - -/** - * Sets the IN register requirements at position pos. - */ -void set_ia32_req_in(ir_node *node, const arch_register_req_t *req, int pos) -{ - ia32_attr_t *attr = get_ia32_attr(node); - attr->in_req[pos] = req; -} - /** * Returns the condition code of a node. */ @@ -801,7 +738,8 @@ const char *get_ia32_orig_node(const ir_node *node) static const char *ia32_get_old_node_name(const ir_node *irn) { - struct obstack *obst = env_cg->isa->name_obst; + ir_graph *irg = get_irn_irg(irn); + struct obstack *obst = be_get_be_obst(irg); lc_eoprintf(firm_get_arg_env(), obst, "%+F", irn); obstack_1grow(obst, 0); @@ -820,16 +758,6 @@ void set_ia32_orig_node(ir_node *node, const ir_node *old) #endif /* NDEBUG */ -/****************************************************************************************************** - * _ _ _ _ __ _ _ - * (_) | | | | | | / _| | | (_) - * ___ _ __ ___ ___ _ __ _| | __ _| |_| |_ _ __ | |_ _ _ _ __ ___| |_ _ ___ _ __ ___ - * / __| '_ \ / _ \/ __| |/ _` | | / _` | __| __| '__| | _| | | | '_ \ / __| __| |/ _ \| '_ \ / __| - * \__ \ |_) | __/ (__| | (_| | | | (_| | |_| |_| | | | | |_| | | | | (__| |_| | (_) | | | | \__ \ - * |___/ .__/ \___|\___|_|\__,_|_| \__,_|\__|\__|_| |_| \__,_|_| |_|\___|\__|_|\___/|_| |_| |___/ - * | | - * |_| - ******************************************************************************************************/ /** * Returns whether or not the node is an AddrModeS node. @@ -875,7 +803,7 @@ void init_ia32_attributes(ir_node *node, arch_irn_flags_t flags, backend_info_t *info; arch_irn_set_flags(node, flags); - set_ia32_in_req_all(node, in_reqs); + arch_set_in_register_reqs(node, in_reqs); attr->exec_units = execution_units; #ifndef NDEBUG @@ -887,20 +815,20 @@ void init_ia32_attributes(ir_node *node, arch_irn_flags_t flags, memset(info->out_infos, 0, n_res * sizeof(info->out_infos[0])); } -void -init_ia32_x87_attributes(ir_node *res) +void init_ia32_x87_attributes(ir_node *res) { + ir_graph *irg = get_irn_irg(res); + ia32_irg_data_t *irg_data = ia32_get_irg_data(irg); #ifndef NDEBUG ia32_attr_t *attr = get_ia32_attr(res); attr->attr_type |= IA32_ATTR_ia32_x87_attr_t; #else (void) res; #endif - ia32_current_cg->do_x87_sim = 1; + irg_data->do_x87_sim = 1; } -void -init_ia32_asm_attributes(ir_node *res) +void init_ia32_asm_attributes(ir_node *res) { #ifndef NDEBUG ia32_attr_t *attr = get_ia32_attr(res); @@ -910,10 +838,9 @@ init_ia32_asm_attributes(ir_node *res) #endif } -void -init_ia32_immediate_attributes(ir_node *res, ir_entity *symconst, - int symconst_sign, int no_pic_adjust, - long offset) +void init_ia32_immediate_attributes(ir_node *res, ir_entity *symconst, + int symconst_sign, int no_pic_adjust, + long offset) { ia32_immediate_attr_t *attr = get_irn_generic_attr(res); @@ -937,8 +864,7 @@ void init_ia32_call_attributes(ir_node* res, unsigned pop, ir_type* call_tp) attr->call_tp = call_tp; } -void -init_ia32_copyb_attributes(ir_node *res, unsigned size) +void init_ia32_copyb_attributes(ir_node *res, unsigned size) { ia32_copyb_attr_t *attr = get_irn_generic_attr(res); @@ -948,8 +874,7 @@ init_ia32_copyb_attributes(ir_node *res, unsigned size) attr->size = size; } -void -init_ia32_condcode_attributes(ir_node *res, long pnc) +void init_ia32_condcode_attributes(ir_node *res, long pnc) { ia32_condcode_attr_t *attr = get_irn_generic_attr(res); @@ -959,8 +884,7 @@ init_ia32_condcode_attributes(ir_node *res, long pnc) attr->pn_code = pnc; } -void -init_ia32_climbframe_attributes(ir_node *res, unsigned count) +void init_ia32_climbframe_attributes(ir_node *res, unsigned count) { ia32_climbframe_attr_t *attr = get_irn_generic_attr(res); @@ -970,18 +894,9 @@ init_ia32_climbframe_attributes(ir_node *res, unsigned count) attr->count = count; } -/*************************************************************************************** - * _ _ _ - * | | | | | | - * _ __ ___ __| | ___ ___ ___ _ __ ___| |_ _ __ _ _ ___| |_ ___ _ __ ___ - * | '_ \ / _ \ / _` |/ _ \ / __/ _ \| '_ \/ __| __| '__| | | |/ __| __/ _ \| '__/ __| - * | | | | (_) | (_| | __/ | (_| (_) | | | \__ \ |_| | | |_| | (__| || (_) | | \__ \ - * |_| |_|\___/ \__,_|\___| \___\___/|_| |_|___/\__|_| \__,_|\___|\__\___/|_| |___/ - * - ***************************************************************************************/ /* default compare operation to compare attributes */ -int ia32_compare_attr(const ia32_attr_t *a, const ia32_attr_t *b) +static int ia32_compare_attr(const ia32_attr_t *a, const ia32_attr_t *b) { if (a->data.tp != b->data.tp) return 1; @@ -996,9 +911,9 @@ int ia32_compare_attr(const ia32_attr_t *a, const ia32_attr_t *b) /* nodes with not yet assigned entities shouldn't be CSEd (important for * unsigned int -> double conversions */ - if(a->data.use_frame && a->frame_ent == NULL) + if (a->data.use_frame && a->frame_ent == NULL) return 1; - if(b->data.use_frame && b->frame_ent == NULL) + if (b->data.use_frame && b->frame_ent == NULL) return 1; if (a->data.use_frame != b->data.use_frame @@ -1016,8 +931,7 @@ int ia32_compare_attr(const ia32_attr_t *a, const ia32_attr_t *b) } /** Compare nodes attributes for all "normal" nodes. */ -static -int ia32_compare_nodes_attr(ir_node *a, ir_node *b) +static int ia32_compare_nodes_attr(ir_node *a, ir_node *b) { const ia32_attr_t* attr_a = get_ia32_attr_const(a); const ia32_attr_t* attr_b = get_ia32_attr_const(b); @@ -1026,8 +940,7 @@ int ia32_compare_nodes_attr(ir_node *a, ir_node *b) } /** Compare node attributes for nodes with condition code. */ -static -int ia32_compare_condcode_attr(ir_node *a, ir_node *b) +static int ia32_compare_condcode_attr(ir_node *a, ir_node *b) { const ia32_condcode_attr_t *attr_a; const ia32_condcode_attr_t *attr_b; @@ -1066,8 +979,7 @@ static int ia32_compare_call_attr(ir_node *a, ir_node *b) } /** Compare node attributes for CopyB nodes. */ -static -int ia32_compare_copyb_attr(ir_node *a, ir_node *b) +static int ia32_compare_copyb_attr(ir_node *a, ir_node *b) { const ia32_copyb_attr_t *attr_a; const ia32_copyb_attr_t *attr_b; @@ -1086,8 +998,7 @@ int ia32_compare_copyb_attr(ir_node *a, ir_node *b) /** Compare ASM node attributes. */ -static -int ia32_compare_asm_attr(ir_node *a, ir_node *b) +static int ia32_compare_asm_attr(ir_node *a, ir_node *b) { const ia32_asm_attr_t *attr_a; const ia32_asm_attr_t *attr_b; @@ -1098,7 +1009,7 @@ int ia32_compare_asm_attr(ir_node *a, ir_node *b) attr_a = get_ia32_asm_attr_const(a); attr_b = get_ia32_asm_attr_const(b); - if(attr_a->asm_text != attr_b->asm_text) + if (attr_a->asm_text != attr_b->asm_text) return 1; return 0; @@ -1115,8 +1026,7 @@ static unsigned ia32_hash_Immediate(const ir_node *irn) } /** Compare node attributes for Immediates. */ -static -int ia32_compare_immediate_attr(ir_node *a, ir_node *b) +static int ia32_compare_immediate_attr(ir_node *a, ir_node *b) { const ia32_immediate_attr_t *attr_a = get_ia32_immediate_attr_const(a); const ia32_immediate_attr_t *attr_b = get_ia32_immediate_attr_const(b); @@ -1132,15 +1042,13 @@ int ia32_compare_immediate_attr(ir_node *a, ir_node *b) } /** Compare node attributes for x87 nodes. */ -static -int ia32_compare_x87_attr(ir_node *a, ir_node *b) +static int ia32_compare_x87_attr(ir_node *a, ir_node *b) { return ia32_compare_nodes_attr(a, b); } /** Compare node attributes for ClimbFrame nodes. */ -static -int ia32_compare_climbframe_attr(ir_node *a, ir_node *b) +static int ia32_compare_climbframe_attr(ir_node *a, ir_node *b) { const ia32_climbframe_attr_t *attr_a; const ia32_climbframe_attr_t *attr_b; @@ -1158,9 +1066,9 @@ int ia32_compare_climbframe_attr(ir_node *a, ir_node *b) } /* copies the ia32 attributes */ -static void ia32_copy_attr(const ir_node *old_node, ir_node *new_node) +static void ia32_copy_attr(ir_graph *irg, const ir_node *old_node, + ir_node *new_node) { - ir_graph *irg = get_irn_irg(new_node); struct obstack *obst = get_irg_obstack(irg); const ia32_attr_t *attr_old = get_ia32_attr_const(old_node); ia32_attr_t *attr_new = get_ia32_attr(new_node); @@ -1173,6 +1081,7 @@ static void ia32_copy_attr(const ir_node *old_node, ir_node *new_node) /* copy out flags */ new_info->out_infos = DUP_ARR_D(reg_out_info_t, obst, old_info->out_infos); + new_info->in_reqs = old_info->in_reqs; } /* Include the generated constructor functions */