X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fia32%2Fia32_new_nodes.c;h=e509b2179dec110ed5b3eeff196c04c3c46e57eb;hb=a1a465eb2b3f54027b29f829423fffd0396937f4;hp=acfe063897d4e76fb2eee31cfd299c5cc330f0b9;hpb=55a6310849508a42d3a84bb5d4fc46f15d09b501;p=libfirm diff --git a/ir/be/ia32/ia32_new_nodes.c b/ir/be/ia32/ia32_new_nodes.c index acfe06389..e509b2179 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,30 +36,31 @@ #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 ident of a SymConst. * @param symc The SymConst * @return The ident of the SymConst */ static ident *get_sc_ident(ir_node *symc) { - assert(get_irn_opcode(symc) == iro_SymConst && "need symconst to get ident"); + entity *ent; + ir_type *owner; + ident *id; switch (get_SymConst_kind(symc)) { case symconst_addr_name: return get_SymConst_name(symc); case symconst_addr_ent: - return get_entity_ld_ident(get_SymConst_entity(symc)); + ent = get_SymConst_entity(symc); + owner = get_entity_owner(ent); + id = get_entity_ld_ident(ent); + if (owner == get_tls_type()) { + if (get_entity_visibility(ent) == visibility_external_allocated) + id = mangle(id, new_id_from_chars("@INDNTPOFF", 10)); + else + id = mangle(id, new_id_from_chars("@NTPOFF", 7)); + } + return id; default: assert(0 && "Unsupported SymConst"); @@ -66,7 +69,13 @@ static ident *get_sc_ident(ir_node *symc) { return NULL; } - +/** + * returns true if a node has x87 registers + */ +int ia32_has_x87_register(const ir_node *n) { + assert(is_ia32_irn(n) && "Need ia32 node."); + return is_irn_machine_user(n, 0); +} /*********************************************************************************** * _ _ _ __ @@ -161,7 +170,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; @@ -184,10 +193,11 @@ static int dump_node_ia32(ir_node *n, FILE *F, dump_reason_t reason) { break; case dump_node_nodeattr_txt: - if (is_ia32_ImmConst(n) || is_ia32_ImmSymConst(n)) { - char *pref = is_ia32_ImmSymConst(n) ? "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)) { @@ -221,7 +231,15 @@ static int dump_node_ia32(ir_node *n, FILE *F, dump_reason_t reason) { slots = get_ia32_slots(n); if (slots && n_res > 0) { for (i = 0; i < n_res; i++) { - fprintf(F, "reg #%d = %s\n", i, slots[i] ? slots[i]->name : "n/a"); + const arch_register_t *reg; + + /* retrieve "real" x87 register */ + if (ia32_has_x87_register(n)) + reg = get_ia32_attr(n)->x87[i + 2]; + else + reg = slots[i]; + + fprintf(F, "reg #%d = %s\n", i, reg ? arch_register_get_name(reg) : "n/a"); } fprintf(F, "\n"); } @@ -250,6 +268,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 = "); @@ -319,6 +354,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); @@ -335,6 +382,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); @@ -348,6 +398,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 = "); @@ -386,8 +473,8 @@ static int dump_node_ia32(ir_node *n, FILE *F, dump_reason_t reason) { */ static ident *get_ident_for_tv(tarval *tv) { char buf[1024]; - - assert(tarval_snprintf(buf, sizeof(buf), tv)); + int len = tarval_snprintf(buf, sizeof(buf), tv); + assert(len); return new_id_from_str(buf); } @@ -444,8 +531,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; } /** @@ -460,8 +547,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,56 +556,43 @@ void set_ia32_am_flavour(ir_node *node, ia32_am_flavour_t am_flavour) { */ char *get_ia32_am_offs(const ir_node *node) { ia32_attr_t *attr = get_ia32_attr(node); - char *res = NULL; - int size; + static char res[64]; - if (! attr->am_offs) { - return NULL; - } + snprintf(res, sizeof(res), "%+d", attr->am_offs); - size = obstack_object_size(attr->am_offs); - if (size > 0) { - res = xmalloc(size + 2); - res[0] = attr->data.offs_sign ? '-' : '+'; - memcpy(&res[1], obstack_base(attr->am_offs), size); - res[size + 1] = '\0'; - } return res; } +/** + * Gets the addressmode offset as long. + */ +int get_ia32_am_offs_int(const ir_node *node) { + ia32_attr_t *attr = get_ia32_attr(node); + return attr->am_offs; +} + /** * Add an offset for addrmode. */ static void extend_ia32_am_offs(ir_node *node, char *offset, char op) { ia32_attr_t *attr = get_ia32_attr(node); + int res, o; - if (! offset || strlen(offset) < 1) + if (offset == NULL || offset[0] == '\0') return; - /* offset could already have an explicit sign */ - /* -> supersede op if necessary */ - if (offset[0] == '-' || offset[0] == '+') { - if (offset[0] == '-') { - op = (op == '-') ? '+' : '-'; - } - - /* skip explicit sign */ - offset++; - } - - if (! attr->am_offs) { - /* obstack is not initialized */ - attr->am_offs = xcalloc(1, sizeof(*(attr->am_offs))); - obstack_init(attr->am_offs); + if (offset[0] == '-') + res = sscanf(offset, "%d", &o); + else + res = sscanf(offset, "%u", &o); + assert(res == 1); - attr->data.offs_sign = (op == '-') ? 1 : 0; - } - else { - /* If obstack is initialized, connect the new offset with op */ - obstack_printf(attr->am_offs, "%c", op); - } - - obstack_printf(attr->am_offs, "%s", offset); + if (op == '-') + attr->am_offs -= o; + else if (op == '+') + attr->am_offs += o; + else + assert(0); } /** @@ -528,6 +602,11 @@ void add_ia32_am_offs(ir_node *node, const char *offset) { extend_ia32_am_offs(node, (char *)offset, '+'); } +void add_ia32_am_offs_int(ir_node *node, int offset) { + ia32_attr_t *attr = get_ia32_attr(node); + attr->am_offs += offset; +} + /** * Sub an offset for addrmode. */ @@ -535,6 +614,46 @@ 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; +} + /** * Gets the addr mode const. */ @@ -568,35 +687,20 @@ void set_ia32_Immop_tarval(ir_node *node, tarval *tv) { attr->cnst = get_ident_for_tv(tv); } -/** - * Return the sc attribute. - */ -ident *get_ia32_sc(const ir_node *node) { - ia32_attr_t *attr = get_ia32_attr(node); - return attr->cnst_val.sc; -} - -/** - * Sets the sc attribute. - */ -void set_ia32_sc(ir_node *node, ident *sc) { - ia32_attr_t *attr = get_ia32_attr(node); - attr->cnst_val.sc = sc; - attr->cnst = attr->cnst_val.sc; -} - /** * Gets the string representation of the internal const (tv or symconst) */ 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) { +void set_ia32_cnst(ir_node *node, const char *cnst) { ia32_attr_t *attr = get_ia32_attr(node); attr->cnst = new_id_from_str(cnst); } @@ -665,6 +769,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) */ @@ -698,7 +874,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); @@ -706,11 +914,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; } /** @@ -750,7 +976,7 @@ void set_ia32_out_req_all(ir_node *node, const ia32_register_req_t **reqs) { */ const ia32_register_req_t *get_ia32_in_req(const ir_node *node, int pos) { ia32_attr_t *attr = get_ia32_attr(node); - return attr->in_req[pos]; + return attr->in_req != NULL ? attr->in_req[pos] : NULL; } /** @@ -758,7 +984,7 @@ const ia32_register_req_t *get_ia32_in_req(const ir_node *node, int pos) { */ const ia32_register_req_t *get_ia32_out_req(const ir_node *node, int pos) { ia32_attr_t *attr = get_ia32_attr(node); - return attr->out_req[pos]; + return attr->out_req != NULL ? attr->out_req[pos] : NULL; } /** @@ -849,6 +1075,23 @@ void set_ia32_pncode(ir_node *node, long code) { attr->pn_code = code; } +/** + * Sets the flags for the n'th out. + */ +void set_ia32_out_flags(ir_node *node, arch_irn_flags_t flags, int pos) { + ia32_attr_t *attr = get_ia32_attr(node); + assert(pos < (int) attr->data.n_res && "Invalid OUT position."); + attr->out_flags[pos] = flags; +} + +/** + * Gets the flags for the n'th out. + */ +arch_irn_flags_t get_ia32_out_flags(const ir_node *node, int pos) { + ia32_attr_t *attr = get_ia32_attr(node); + return pos < (int)attr->data.n_res ? attr->out_flags[pos] : arch_irn_flags_none; +} + #ifndef NDEBUG /** @@ -950,10 +1193,11 @@ void copy_ia32_Immop_attr(ir_node *dst, ir_node *src) { } /** - * Copy the attributes from a Firm Const to an ia32_Const + * Copy the attributes from a Firm Const/SymConst 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"); @@ -961,6 +1205,11 @@ void set_ia32_Const_attr(ir_node *ia32_cnst, ir_node *cnst) { case iro_Const: 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_Iu); + } attr->cnst = get_ident_for_tv(attr->cnst_val.tv); break; case iro_SymConst: @@ -1027,24 +1276,27 @@ int is_ia32_AddrModeD(const ir_node *node) { } /** - * Checks if node is a Load or fLoad/vfLoad. + * 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) || is_ia32_vfld(node); + int op = get_ia32_irn_opcode(node); + return op == iro_ia32_Load || op == iro_ia32_xLoad || op == iro_ia32_vfld || op == iro_ia32_fld; } /** - * Checks if node is a Store or fStore/vfStore. + * 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) || is_ia32_vfst(node); + int op = get_ia32_irn_opcode(node); + return op == iro_ia32_Store || op == iro_ia32_xStore || op == iro_ia32_vfst || op == iro_ia32_fst || op == iro_ia32_fstp; } /** - * Checks if node is a Const or fConst/vfConst. + * 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) || is_ia32_vfConst(node); + int op = get_ia32_irn_opcode(node); + return op == iro_ia32_Const || op == iro_ia32_xConst || op == iro_ia32_vfConst; } /** @@ -1053,8 +1305,7 @@ int is_ia32_Cnst(const ir_node *node) { 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]); @@ -1066,8 +1317,7 @@ const char *get_ia32_out_reg_name(const ir_node *node, int pos) { 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]); @@ -1079,40 +1329,29 @@ int get_ia32_out_regnr(const ir_node *node, int pos) { 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 = NEW_ARR_D(arch_register_t *, get_irg_obstack(get_irn_irg(node)), num); - memset(attr->slots, 0, sizeof(attr->slots[0]) * num); - } - 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->out_flags = NEW_ARR_D(int, get_irg_obstack(get_irn_irg(node)), n_res); + memset(attr->out_flags, 0, n_res * sizeof(attr->out_flags[0])); + + attr->data.n_res = n_res; + memset((void *)attr->slots, 0, n_res * sizeof(attr->slots[0])); } /*************************************************************************************** @@ -1127,13 +1366,30 @@ 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) { - return a->cnst == b->cnst; + equ = (a->cnst == b->cnst); + equ = equ ? (a->data.use_frame == b->data.use_frame) : 0; + + 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; +} + +/* Copy attribute function not needed any more, but might be of use later. */ +#if 0 /* copies the ia32 attributes */ static void ia32_copy_attr(const ir_node *old_node, ir_node *new_node) { ia32_attr_t *attr_old = get_ia32_attr(old_node); @@ -1142,10 +1398,6 @@ static void ia32_copy_attr(const ir_node *old_node, ir_node *new_node) { /* copy the attributes */ memcpy(attr_new, attr_old, sizeof(*attr_new)); - - /* copy the register slots */ - attr_new->slots = NEW_ARR_D(arch_register_t *, get_irg_obstack(get_irn_irg(new_node)), n_res); - memcpy((void *)attr_new->slots, (void *)attr_old->slots, sizeof(attr_new->slots[0]) * n_res); } /** @@ -1159,10 +1411,7 @@ void ia32_register_copy_attr_func(void) { op->ops.copy_attr = ia32_copy_attr; } } - -static void ia32_register_additional_opcodes(int n) { - /* we don't need any additional opcodes */ -} +#endif /* Include the generated constructor functions */ #include "gen_ia32_new_nodes.c.inl"