X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fia32%2Fia32_new_nodes.c;h=d077b3ad1ed2c71c10f018452c36db5d8ff7ab55;hb=eee248543bd61ec5c3f6aaaa23b9b0cff042fb71;hp=973e79c2a691c1450d5884414061309fd8bb2dae;hpb=503617365f85975763b86b1398d4d9efc2d825ad;p=libfirm diff --git a/ir/be/ia32/ia32_new_nodes.c b/ir/be/ia32/ia32_new_nodes.c index 973e79c2a..d077b3ad1 100644 --- a/ir/be/ia32/ia32_new_nodes.c +++ b/ir/be/ia32/ia32_new_nodes.c @@ -1,6 +1,6 @@ /** * This file implements the creation of the achitecture specific firm opcodes - * and the coresponding node constructors for the $arch assembler irg. + * and the coresponding node constructors for the ia32 assembler irg. * @author Christian Wuerdig * $Id$ */ @@ -9,9 +9,11 @@ #include "config.h" #endif -#ifdef _WIN32 +#ifdef HAVE_MALLOC_H #include -#else +#endif + +#ifdef HAVE_ALLOCA_H #include #endif @@ -34,42 +36,20 @@ #include "ia32_new_nodes.h" #include "gen_ia32_regalloc_if.h" -#ifdef obstack_chunk_alloc -# undef obstack_chunk_alloc -# define obstack_chunk_alloc xmalloc -#else -# define obstack_chunk_alloc xmalloc -# define obstack_chunk_free free -#endif - -extern int obstack_printf(struct obstack *obst, char *fmt, ...); - -/*********************************************************************************** - * _ _ _ __ - * | | (_) | | / _| - * __| |_ _ _ __ ___ _ __ ___ _ __ _ _ __ | |_ ___ _ __| |_ __ _ ___ ___ - * / _` | | | | '_ ` _ \| '_ \ / _ \ '__| | | '_ \| __/ _ \ '__| _/ _` |/ __/ _ \ - * | (_| | |_| | | | | | | |_) | __/ | | | | | | || __/ | | || (_| | (_| __/ - * \__,_|\__,_|_| |_| |_| .__/ \___|_| |_|_| |_|\__\___|_| |_| \__,_|\___\___| - * | | - * |_| - ***********************************************************************************/ - /** - * Returns the name of a SymConst. - * @param symc the SymConst - * @return name of the SymConst + * Returns the ident of a SymConst. + * @param symc The SymConst + * @return The ident of the SymConst */ -const char *get_sc_name(ir_node *symc) { - if (get_irn_opcode(symc) != iro_SymConst) - return "NONE"; +static ident *get_sc_ident(ir_node *symc) { + assert(get_irn_opcode(symc) == iro_SymConst && "need symconst to get ident"); switch (get_SymConst_kind(symc)) { case symconst_addr_name: - return get_id_str(get_SymConst_name(symc)); + return get_SymConst_name(symc); case symconst_addr_ent: - return get_entity_ld_name(get_SymConst_entity(symc)); + return get_entity_ld_ident(get_SymConst_entity(symc)); default: assert(0 && "Unsupported SymConst"); @@ -78,6 +58,19 @@ const char *get_sc_name(ir_node *symc) { return NULL; } + + +/*********************************************************************************** + * _ _ _ __ + * | | (_) | | / _| + * __| |_ _ _ __ ___ _ __ ___ _ __ _ _ __ | |_ ___ _ __| |_ __ _ ___ ___ + * / _` | | | | '_ ` _ \| '_ \ / _ \ '__| | | '_ \| __/ _ \ '__| _/ _` |/ __/ _ \ + * | (_| | |_| | | | | | | |_) | __/ | | | | | | || __/ | | || (_| | (_| __/ + * \__,_|\__,_|_| |_| |_| .__/ \___|_| |_|_| |_|\__\___|_| |_| \__,_|\___\___| + * | | + * |_| + ***********************************************************************************/ + /** * Returns a string containing the names of all registers within the limited bitset */ @@ -160,7 +153,7 @@ static void dump_reg_req(FILE *F, ir_node *n, const ia32_register_req_t **reqs, * @param reason indicates which kind of information should be dumped * @return 0 on success or != 0 on failure */ -static int dump_node_ia32(ir_node *n, FILE *F, dump_reason_t reason) { +static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) { ir_mode *mode = NULL; int bad = 0; int i, n_res, am_flav, flags; @@ -183,14 +176,11 @@ static int dump_node_ia32(ir_node *n, FILE *F, dump_reason_t reason) { break; case dump_node_nodeattr_txt: - if (get_ia32_cnst(n)) { - char *pref = ""; - - if (get_ia32_sc(n)) { - pref = "SymC "; - } + if (is_ia32_ImmConst(n) || is_ia32_ImmSymConst(n) || is_ia32_Cnst(n)) { + char *pref = is_ia32_ImmSymConst(n) || (get_ia32_op_type(n) == ia32_SymConst) ? "SymC " : ""; + const char *cnst = get_ia32_cnst(n); - fprintf(F, "[%s%s]", pref, get_ia32_cnst(n)); + fprintf(F, "[%s%s]", pref, cnst ? cnst : "NONE"); } if (! is_ia32_Lea(n)) { @@ -253,6 +243,23 @@ static int dump_node_ia32(ir_node *n, FILE *F, dump_reason_t reason) { } fprintf(F, "\n"); + /* dump immop type */ + fprintf(F, "immediate = "); + switch (get_ia32_immop_type(n)) { + case ia32_ImmNone: + fprintf(F, "None"); + break; + case ia32_ImmConst: + fprintf(F, "Const"); + break; + case ia32_ImmSymConst: + fprintf(F, "SymConst"); + break; + default: + fprintf(F, "unknown (%d)", get_ia32_immop_type(n)); + break; + } + fprintf(F, "\n"); /* dump supported am */ fprintf(F, "AM support = "); @@ -322,6 +329,18 @@ static int dump_node_ia32(ir_node *n, FILE *F, dump_reason_t reason) { /* commutative */ fprintf(F, "commutative = %d\n", is_ia32_commutative(n)); + /* emit cl */ + fprintf(F, "emit cl instead of ecx = %d\n", is_ia32_emit_cl(n)); + + /* got lea */ + fprintf(F, "got loea = %d\n", is_ia32_got_lea(n)); + + /* got reload */ + fprintf(F, "got reload = %d\n", is_ia32_got_reload(n)); + + /* dump latency */ + fprintf(F, "latency = %d\n", get_ia32_latency(n)); + /* dump flags */ fprintf(F, "flags ="); flags = get_ia32_flags(n); @@ -338,6 +357,9 @@ static int dump_node_ia32(ir_node *n, FILE *F, dump_reason_t reason) { if (flags & arch_irn_flags_ignore) { fprintf(F, " ignore"); } + if (flags & arch_irn_flags_modify_sp) { + fprintf(F, " modify_sp"); + } } fprintf(F, " (%d)\n", flags); @@ -351,6 +373,43 @@ static int dump_node_ia32(ir_node *n, FILE *F, dump_reason_t reason) { } fprintf(F, "\n"); + /* dump modes */ + fprintf(F, "ls_mode = "); + if (get_ia32_ls_mode(n)) { + ir_fprintf(F, "%+F", get_ia32_ls_mode(n)); + } + else { + fprintf(F, "n/a"); + } + fprintf(F, "\n"); + + fprintf(F, "res_mode = "); + if (get_ia32_res_mode(n)) { + ir_fprintf(F, "%+F", get_ia32_res_mode(n)); + } + else { + fprintf(F, "n/a"); + } + fprintf(F, "\n"); + + fprintf(F, "src_mode = "); + if (get_ia32_src_mode(n)) { + ir_fprintf(F, "%+F", get_ia32_src_mode(n)); + } + else { + fprintf(F, "n/a"); + } + fprintf(F, "\n"); + + fprintf(F, "tgt_mode = "); + if (get_ia32_tgt_mode(n)) { + ir_fprintf(F, "%+F", get_ia32_tgt_mode(n)); + } + else { + fprintf(F, "n/a"); + } + fprintf(F, "\n"); + #ifndef NDEBUG /* dump original ir node name */ fprintf(F, "orig node = "); @@ -384,21 +443,15 @@ static int dump_node_ia32(ir_node *n, FILE *F, dump_reason_t reason) { * |___/ ***************************************************************************************************/ - static char *copy_str(char *dst, const char *src) { - dst = xcalloc(1, strlen(src) + 1); - strncpy(dst, src, strlen(src) + 1); - return dst; - } - - static char *set_cnst_from_tv(char *cnst, tarval *tv) { - if (cnst) { - free(cnst); - } - - cnst = xcalloc(1, 64); - assert(tarval_snprintf(cnst, 63, tv)); - return cnst; - } +/** + * Returns an ident for the given tarval tv. + */ +static ident *get_ident_for_tv(tarval *tv) { + char buf[1024]; + int len = tarval_snprintf(buf, sizeof(buf), tv); + assert(len); + return new_id_from_str(buf); +} /** * Wraps get_irn_generic_attr() as it takes no const ir_node, so we need to do a cast. @@ -425,6 +478,22 @@ void set_ia32_op_type(ir_node *node, ia32_op_type_t tp) { attr->data.tp = tp; } +/** + * Gets the immediate op type of an ia32 node. + */ +ia32_immop_type_t get_ia32_immop_type(const ir_node *node) { + ia32_attr_t *attr = get_ia32_attr(node); + return attr->data.imm_tp; +} + +/** + * Sets the immediate op type of an ia32 node. + */ +void set_ia32_immop_type(ir_node *node, ia32_immop_type_t tp) { + ia32_attr_t *attr = get_ia32_attr(node); + attr->data.imm_tp = tp; +} + /** * Gets the supported addrmode of an ia32 node */ @@ -437,8 +506,8 @@ ia32_am_type_t get_ia32_am_support(const ir_node *node) { * Sets the supported addrmode of an ia32 node */ void set_ia32_am_support(ir_node *node, ia32_am_type_t am_tp) { - ia32_attr_t *attr = get_ia32_attr(node); - attr->data.am_support = am_tp; + ia32_attr_t *attr = get_ia32_attr(node); + attr->data.am_support = am_tp; } /** @@ -453,8 +522,8 @@ ia32_am_flavour_t get_ia32_am_flavour(const ir_node *node) { * Sets the addrmode flavour of an ia32 node */ void set_ia32_am_flavour(ir_node *node, ia32_am_flavour_t am_flavour) { - ia32_attr_t *attr = get_ia32_attr(node); - attr->data.am_flavour = am_flavour; + ia32_attr_t *attr = get_ia32_attr(node); + attr->data.am_flavour = am_flavour; } /** @@ -469,14 +538,21 @@ char *get_ia32_am_offs(const ir_node *node) { return NULL; } + if (! attr->plain_offs) + attr->plain_offs = (struct obstack *)_new_arr_d(get_irg_obstack(get_irn_irg(node)), 1, sizeof(*(attr->plain_offs))); + else + obstack_free(attr->plain_offs, NULL); + + obstack_init(attr->plain_offs); + size = obstack_object_size(attr->am_offs); - if (size > 0) { - res = xcalloc(1, size + 2); + if (size > 0) { + res = obstack_alloc(attr->plain_offs, size + 2); res[0] = attr->data.offs_sign ? '-' : '+'; memcpy(&res[1], obstack_base(attr->am_offs), size); - } + res[size + 1] = '\0'; + } - res[size + 1] = '\0'; return res; } @@ -486,7 +562,7 @@ char *get_ia32_am_offs(const ir_node *node) { static void extend_ia32_am_offs(ir_node *node, char *offset, char op) { ia32_attr_t *attr = get_ia32_attr(node); - if (! offset) + if (! offset || strlen(offset) < 1) return; /* offset could already have an explicit sign */ @@ -502,7 +578,7 @@ static void extend_ia32_am_offs(ir_node *node, char *offset, char op) { if (! attr->am_offs) { /* obstack is not initialized */ - attr->am_offs = xcalloc(1, sizeof(*(attr->am_offs))); + attr->am_offs = (struct obstack *)_new_arr_d(get_irg_obstack(get_irn_irg(node)), 1, sizeof(*(attr->am_offs))); obstack_init(attr->am_offs); attr->data.offs_sign = (op == '-') ? 1 : 0; @@ -518,15 +594,55 @@ static void extend_ia32_am_offs(ir_node *node, char *offset, char op) { /** * Add an offset for addrmode. */ -void add_ia32_am_offs(ir_node *node, char *offset) { - extend_ia32_am_offs(node, offset, '+'); +void add_ia32_am_offs(ir_node *node, const char *offset) { + extend_ia32_am_offs(node, (char *)offset, '+'); } /** * Sub an offset for addrmode. */ -void sub_ia32_am_offs(ir_node *node, char *offset) { - extend_ia32_am_offs(node, offset, '-'); +void sub_ia32_am_offs(ir_node *node, const char *offset) { + extend_ia32_am_offs(node, (char *)offset, '-'); +} + +/** + * Returns the symconst ident associated to addrmode. + */ +ident *get_ia32_am_sc(const ir_node *node) { + ia32_attr_t *attr = get_ia32_attr(node); + return attr->am_sc; +} + +/** + * Sets the symconst ident associated to addrmode. + */ +void set_ia32_am_sc(ir_node *node, ident *sc) { + ia32_attr_t *attr = get_ia32_attr(node); + attr->am_sc = sc; +} + +/** + * Sets the sign bit for address mode symconst. + */ +void set_ia32_am_sc_sign(ir_node *node) { + ia32_attr_t *attr = get_ia32_attr(node); + attr->data.am_sc_sign = 1; +} + +/** + * Clears the sign bit for address mode symconst. + */ +void clear_ia32_am_sc_sign(ir_node *node) { + ia32_attr_t *attr = get_ia32_attr(node); + attr->data.am_sc_sign = 0; +} + +/** + * Returns the sign bit for address mode symconst. + */ +int is_ia32_am_sc_sign(const ir_node *node) { + ia32_attr_t *attr = get_ia32_attr(node); + return attr->data.am_sc_sign; } /** @@ -550,7 +666,7 @@ void set_ia32_am_scale(ir_node *node, int scale) { */ tarval *get_ia32_Immop_tarval(const ir_node *node) { ia32_attr_t *attr = get_ia32_attr(node); - return attr->tv; + return attr->cnst_val.tv; } /** @@ -558,39 +674,61 @@ tarval *get_ia32_Immop_tarval(const ir_node *node) { */ void set_ia32_Immop_tarval(ir_node *node, tarval *tv) { ia32_attr_t *attr = get_ia32_attr(node); - attr->tv = tv; - attr->cnst = set_cnst_from_tv(attr->cnst, attr->tv); + attr->cnst_val.tv = tv; + attr->cnst = get_ident_for_tv(tv); } /** * Return the sc attribute. */ -char *get_ia32_sc(const ir_node *node) { +ident *get_ia32_sc(const ir_node *node) { ia32_attr_t *attr = get_ia32_attr(node); - return attr->sc; + return attr->cnst_val.sc; } /** * Sets the sc attribute. */ -void set_ia32_sc(ir_node *node, char *sc) { +void set_ia32_sc(ir_node *node, ident *sc) { ia32_attr_t *attr = get_ia32_attr(node); - attr->sc = copy_str(attr->sc, sc); - - if (attr->cnst) { - free(attr->cnst); - } - attr->cnst = attr->sc; + attr->cnst_val.sc = sc; + attr->cnst = attr->cnst_val.sc; } /** * Gets the string representation of the internal const (tv or symconst) */ -char *get_ia32_cnst(const ir_node *node) { +const char *get_ia32_cnst(const ir_node *node) { + ia32_attr_t *attr = get_ia32_attr(node); + if (! attr->cnst) + return NULL; + return get_id_str(attr->cnst); +} + +/** + * Sets the string representation of the internal const. + */ +void set_ia32_cnst(ir_node *node, char *cnst) { + ia32_attr_t *attr = get_ia32_attr(node); + attr->cnst = new_id_from_str(cnst); +} + +/** + * Gets the ident representation of the internal const (tv or symconst) + */ +ident *get_ia32_id_cnst(const ir_node *node) { ia32_attr_t *attr = get_ia32_attr(node); return attr->cnst; } +/** + * Sets the ident representation of the internal const. + */ +void set_ia32_id_cnst(ir_node *node, ident *cnst) { + ia32_attr_t *attr = get_ia32_attr(node); + attr->cnst = cnst; +} + /** * Sets the uses_frame flag. */ @@ -639,6 +777,78 @@ int is_ia32_commutative(const ir_node *node) { return attr->data.is_commutative; } +/** + * Sets node emit_cl. + */ +void set_ia32_emit_cl(ir_node *node) { + ia32_attr_t *attr = get_ia32_attr(node); + attr->data.emit_cl = 1; +} + +/** + * Clears node emit_cl. + */ +void clear_ia32_emit_cl(ir_node *node) { + ia32_attr_t *attr = get_ia32_attr(node); + attr->data.emit_cl = 0; +} + +/** + * Checks if node needs %cl. + */ +int is_ia32_emit_cl(const ir_node *node) { + ia32_attr_t *attr = get_ia32_attr(node); + return attr->data.emit_cl; +} + +/** + * Sets node got_lea. + */ +void set_ia32_got_lea(ir_node *node) { + ia32_attr_t *attr = get_ia32_attr(node); + attr->data.got_lea = 1; +} + +/** + * Clears node got_lea. + */ +void clear_ia32_got_lea(ir_node *node) { + ia32_attr_t *attr = get_ia32_attr(node); + attr->data.got_lea = 0; +} + +/** + * Checks if node got lea. + */ +int is_ia32_got_lea(const ir_node *node) { + ia32_attr_t *attr = get_ia32_attr(node); + return attr->data.got_lea; +} + +/** + * Sets node got_reload. + */ +void set_ia32_got_reload(ir_node *node) { + ia32_attr_t *attr = get_ia32_attr(node); + attr->data.got_reload = 1; +} + +/** + * Clears node got_reload. + */ +void clear_ia32_got_reload(ir_node *node) { + ia32_attr_t *attr = get_ia32_attr(node); + attr->data.got_reload = 0; +} + +/** + * Checks if node got reload. + */ +int is_ia32_got_reload(const ir_node *node) { + ia32_attr_t *attr = get_ia32_attr(node); + return attr->data.got_reload; +} + /** * Gets the mode of the stored/loaded value (only set for Store/Load) */ @@ -672,7 +882,39 @@ void set_ia32_res_mode(ir_node *node, ir_mode *mode) { } /** - * Gets the frame entity assigned to this node; + * Gets the source mode of conversion. + */ +ir_mode *get_ia32_src_mode(const ir_node *node) { + ia32_attr_t *attr = get_ia32_attr(node); + return attr->src_mode; +} + +/** + * Sets the source mode of conversion. + */ +void set_ia32_src_mode(ir_node *node, ir_mode *mode) { + ia32_attr_t *attr = get_ia32_attr(node); + attr->src_mode = mode; +} + +/** + * Gets the target mode of conversion. + */ +ir_mode *get_ia32_tgt_mode(const ir_node *node) { + ia32_attr_t *attr = get_ia32_attr(node); + return attr->tgt_mode; +} + +/** + * Sets the target mode of conversion. + */ +void set_ia32_tgt_mode(ir_node *node, ir_mode *mode) { + ia32_attr_t *attr = get_ia32_attr(node); + attr->tgt_mode = mode; +} + +/** + * Gets the frame entity assigned to this node. */ entity *get_ia32_frame_ent(const ir_node *node) { ia32_attr_t *attr = get_ia32_attr(node); @@ -680,11 +922,29 @@ entity *get_ia32_frame_ent(const ir_node *node) { } /** - * Sets the frame entity for this node; + * Sets the frame entity for this node. */ void set_ia32_frame_ent(ir_node *node, entity *ent) { ia32_attr_t *attr = get_ia32_attr(node); attr->frame_ent = ent; + set_ia32_use_frame(node); +} + + +/** + * Gets the instruction latency. + */ +unsigned get_ia32_latency(const ir_node *node) { + ia32_attr_t *attr = get_ia32_attr(node); + return attr->latency; +} + +/** +* Sets the instruction latency. +*/ +void set_ia32_latency(ir_node *node, unsigned latency) { + ia32_attr_t *attr = get_ia32_attr(node); + attr->latency = latency; } /** @@ -884,39 +1144,68 @@ void set_ia32_Immop_attr(ir_node *node, ir_node *cnst) { ia32_attr_t *na = get_ia32_attr(node); ia32_attr_t *ca = get_ia32_attr(cnst); - assert(is_ia32_Cnst(cnst) && "Need ia32_Const to set Immop attr"); + switch(get_ia32_Const_type(cnst)) { + case ia32_Const: + na->cnst_val.tv = ca->cnst_val.tv; + na->cnst = ca->cnst; + set_ia32_immop_type(node, ia32_ImmConst); + break; + case ia32_SymConst: + na->cnst_val.sc = ca->cnst_val.sc; + na->cnst = na->cnst_val.sc; + set_ia32_immop_type(node, ia32_ImmSymConst); + break; + default: + assert(0 && "Need ia32_Const to set Immop attr"); + } +} - na->tv = ca->tv; +/** + * Copy the attributes from Immop to an Immop + */ +void copy_ia32_Immop_attr(ir_node *dst, ir_node *src) { + ia32_attr_t *da = get_ia32_attr(dst); + ia32_attr_t *sa = get_ia32_attr(src); - if (ca->sc) { - na->sc = copy_str(na->sc, ca->sc); - na->cnst = na->sc; - } - else { - na->cnst = set_cnst_from_tv(na->cnst, na->tv); - na->sc = NULL; + switch(get_ia32_immop_type(src)) { + case ia32_ImmConst: + da->cnst_val.tv = sa->cnst_val.tv; + da->cnst = sa->cnst; + set_ia32_immop_type(dst, ia32_ImmConst); + break; + case ia32_ImmSymConst: + da->cnst_val.sc = sa->cnst_val.sc; + da->cnst = sa->cnst; + set_ia32_immop_type(dst, ia32_ImmSymConst); + break; + default: + assert(0 && "Need Immop to copy Immop attr"); } } /** - * Copy the attributes from a Const to an ia32_Const + * Copy the attributes from a Firm Const to an ia32_Const */ void set_ia32_Const_attr(ir_node *ia32_cnst, ir_node *cnst) { ia32_attr_t *attr = get_ia32_attr(ia32_cnst); + ir_mode *mode; assert(is_ia32_Cnst(ia32_cnst) && "Need ia32_Const to set Const attr"); switch (get_irn_opcode(cnst)) { case iro_Const: - attr->data.tp = ia32_Const; - attr->tv = get_Const_tarval(cnst); - attr->cnst = set_cnst_from_tv(attr->cnst, attr->tv); + attr->data.tp = ia32_Const; + attr->cnst_val.tv = get_Const_tarval(cnst); + mode = get_tarval_mode(attr->cnst_val.tv); + if (mode_is_reference(mode) && + get_mode_null(mode) == attr->cnst_val.tv) + attr->cnst_val.tv = get_mode_null(mode_Is); + attr->cnst = get_ident_for_tv(attr->cnst_val.tv); break; case iro_SymConst: - attr->data.tp = ia32_SymConst; - attr->tv = NULL; - attr->sc = copy_str(attr->sc, get_sc_name(cnst)); - attr->cnst = attr->sc; + attr->data.tp = ia32_SymConst; + attr->cnst_val.sc = get_sc_ident(cnst); + attr->cnst = attr->cnst_val.sc; break; case iro_Unknown: assert(0 && "Unknown Const NYI"); @@ -944,6 +1233,22 @@ void set_ia32_AddrMode(ir_node *node, char direction) { } } +/** + * Returns whether or not the node is an immediate operation with Const. + */ +int is_ia32_ImmConst(const ir_node *node) { + ia32_attr_t *attr = get_ia32_attr(node); + return (attr->data.imm_tp == ia32_ImmConst); +} + +/** + * Returns whether or not the node is an immediate operation with SymConst. + */ +int is_ia32_ImmSymConst(const ir_node *node) { + ia32_attr_t *attr = get_ia32_attr(node); + return (attr->data.imm_tp == ia32_ImmSymConst); +} + /** * Returns whether or not the node is an AddrModeS node. */ @@ -961,24 +1266,24 @@ int is_ia32_AddrModeD(const ir_node *node) { } /** - * Checks if node is a Load or fLoad. + * Checks if node is a Load or xLoad/vfLoad. */ int is_ia32_Ld(const ir_node *node) { - return is_ia32_Load(node) || is_ia32_fLoad(node); + return is_ia32_Load(node) || is_ia32_xLoad(node) || is_ia32_vfld(node) || is_ia32_fld(node); } /** - * Checks if node is a Store or fStore. + * Checks if node is a Store or xStore/vfStore. */ int is_ia32_St(const ir_node *node) { - return is_ia32_Store(node) || is_ia32_fStore(node); + return is_ia32_Store(node) || is_ia32_xStore(node) || is_ia32_vfst(node) || is_ia32_fst(node) || is_ia32_fstp(node); } /** - * Checks if node is a Const or fConst. + * Checks if node is a Const or xConst/vfConst. */ int is_ia32_Cnst(const ir_node *node) { - return is_ia32_Const(node) || is_ia32_fConst(node); + return is_ia32_Const(node) || is_ia32_xConst(node) || is_ia32_vfConst(node); } /** @@ -988,7 +1293,7 @@ const char *get_ia32_out_reg_name(const ir_node *node, int pos) { ia32_attr_t *attr = get_ia32_attr(node); assert(is_ia32_irn(node) && "Not an ia32 node."); - assert(pos < attr->data.n_res && "Invalid OUT position."); + assert(pos < (int) attr->data.n_res && "Invalid OUT position."); assert(attr->slots[pos] && "No register assigned"); return arch_register_get_name(attr->slots[pos]); @@ -1001,7 +1306,7 @@ int get_ia32_out_regnr(const ir_node *node, int pos) { ia32_attr_t *attr = get_ia32_attr(node); assert(is_ia32_irn(node) && "Not an ia32 node."); - assert(pos < attr->data.n_res && "Invalid OUT position."); + assert(pos < (int) attr->data.n_res && "Invalid OUT position."); assert(attr->slots[pos] && "No register assigned"); return arch_register_get_index(attr->slots[pos]); @@ -1014,38 +1319,26 @@ const arch_register_t *get_ia32_out_reg(const ir_node *node, int pos) { ia32_attr_t *attr = get_ia32_attr(node); assert(is_ia32_irn(node) && "Not an ia32 node."); - assert(pos < attr->data.n_res && "Invalid OUT position."); + assert(pos < (int) attr->data.n_res && "Invalid OUT position."); assert(attr->slots[pos] && "No register assigned"); return attr->slots[pos]; } -/** - * Allocates num register slots for node. - */ -void alloc_ia32_reg_slots(ir_node *node, int num) { - ia32_attr_t *attr = get_ia32_attr(node); - - if (num) { - attr->slots = xcalloc(num, sizeof(attr->slots[0])); - } - else { - attr->slots = NULL; - } - - attr->data.n_res = num; -} - /** * Initializes the nodes attributes. */ void init_ia32_attributes(ir_node *node, arch_irn_flags_t flags, const ia32_register_req_t **in_reqs, - const ia32_register_req_t **out_reqs, int n_res) + const ia32_register_req_t **out_reqs, int n_res, unsigned latency) { + ia32_attr_t *attr = get_ia32_attr(node); set_ia32_flags(node, flags); set_ia32_in_req_all(node, in_reqs); set_ia32_out_req_all(node, out_reqs); - alloc_ia32_reg_slots(node, n_res); + set_ia32_latency(node, latency); + + attr->data.n_res = n_res; + memset((void *)attr->slots, 0, n_res * sizeof(attr->slots[0])); } /*************************************************************************************** @@ -1060,14 +1353,26 @@ void init_ia32_attributes(ir_node *node, arch_irn_flags_t flags, const ia32_regi /* default compare operation to compare immediate ops */ int ia32_compare_immop_attr(ia32_attr_t *a, ia32_attr_t *b) { + int equ = 0; + if (a->data.tp == b->data.tp) { - if (! (a->cnst && b->cnst)) - return 1; + equ = (a->cnst == b->cnst); + equ = equ ? (a->data.use_frame == b->data.use_frame) : 0; - return strcmp(a->cnst, b->cnst); + if (equ && a->data.use_frame && b->data.use_frame) + equ = (a->frame_ent == b->frame_ent); } - return 1; + return !equ; +} + +/* compare converts */ +int ia32_compare_conv_attr(ia32_attr_t *a, ia32_attr_t *b) { + int equ = ! ia32_compare_immop_attr(a, b); + + equ = equ ? (a->src_mode == b->src_mode) && (a->tgt_mode == b->tgt_mode) : equ; + + return !equ; } /* Include the generated constructor functions */