X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fia32%2Fia32_new_nodes.c;h=2ddc4678d262e9e2ce4b07d42b899911dd6a932b;hb=fa4ec191e159484f0fcbea2ef044deaa2ab2d293;hp=438d5bc6fe787260a65cac77b2e20f6a1884e3fe;hpb=2f10d96357f98a6d313d35aee8c49ca3caa4752a;p=libfirm diff --git a/ir/be/ia32/ia32_new_nodes.c b/ir/be/ia32/ia32_new_nodes.c index 438d5bc6f..2ddc4678d 100644 --- a/ir/be/ia32/ia32_new_nodes.c +++ b/ir/be/ia32/ia32_new_nodes.c @@ -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 */ @@ -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 (is_ia32_ImmConst(n) || is_ia32_ImmSymConst(n)) { + char *pref = is_ia32_ImmSymConst(n) ? "SymC" : ""; + const char *cnst = get_ia32_cnst(n); - if (get_ia32_sc(n)) { - pref = "SymC "; - } - - fprintf(F, "[%s%s]", pref, get_ia32_cnst(n)); + fprintf(F, "[%s%s]", pref, cnst ? cnst : "NONE"); } if (! is_ia32_Lea(n)) { @@ -384,25 +374,15 @@ static int dump_node_ia32(ir_node *n, FILE *F, dump_reason_t reason) { * |___/ ***************************************************************************************************/ - static char *copy_str(const char *src) { - size_t l = strlen(src) + 1; - char *dst = xmalloc(l); - strncpy(dst, src, l); - dst[l - 1] = '\0'; - return dst; - } - - static char *set_cnst_from_tv(char *cnst, tarval *tv) { - int l = 64; - if (cnst) { - free(cnst); - } +/** + * Returns an ident for the given tarval tv. + */ +static ident *get_ident_for_tv(tarval *tv) { + char buf[1024]; - cnst = xmalloc(l); - assert(tarval_snprintf(cnst, l, tv)); - cnst[l - 1] = 0; - return cnst; - } + assert(tarval_snprintf(buf, sizeof(buf), tv)); + 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. @@ -429,6 +409,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 */ @@ -441,8 +437,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; } /** @@ -457,8 +453,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; } /** @@ -480,6 +476,7 @@ char *get_ia32_am_offs(const ir_node *node) { memcpy(&res[1], obstack_base(attr->am_offs), size); res[size + 1] = '\0'; } + return res; } @@ -489,7 +486,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 */ @@ -521,15 +518,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; } /** @@ -553,7 +590,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; } /** @@ -561,37 +598,35 @@ 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. */ -const 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, const char *sc) { +void set_ia32_sc(ir_node *node, ident *sc) { ia32_attr_t *attr = get_ia32_attr(node); - attr->sc = copy_str(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); - return attr->cnst; + if (! attr->cnst) + return NULL; + return get_id_str(attr->cnst); } /** @@ -599,7 +634,23 @@ char *get_ia32_cnst(const ir_node *node) { */ void set_ia32_cnst(ir_node *node, char *cnst) { ia32_attr_t *attr = get_ia32_attr(node); - attr->cnst = cnst; + 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; } /** @@ -650,6 +701,30 @@ 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 is commutative. + */ +int is_ia32_emit_cl(const ir_node *node) { + ia32_attr_t *attr = get_ia32_attr(node); + return attr->data.emit_cl; +} + /** * Gets the mode of the stored/loaded value (only set for Store/Load) */ @@ -682,6 +757,38 @@ void set_ia32_res_mode(ir_node *node, ir_mode *mode) { attr->res_mode = mode; } +/** + * 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; */ @@ -895,43 +1002,47 @@ 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"); - - na->tv = ca->tv; - - if (ca->sc) { - na->sc = copy_str(ca->sc); - na->cnst = na->sc; - } - else { - na->cnst = set_cnst_from_tv(na->cnst, na->tv); - na->sc = NULL; + 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"); } } /** * Copy the attributes from Immop to an Immop */ -void copy_ia32_Immop_attr(ir_node *node, ir_node *src) -{ - ia32_attr_t *na = get_ia32_attr(node); - ia32_attr_t *ca = get_ia32_attr(src); - - assert(get_ia32_cnst(src) != NULL); - na->tv = ca->tv; +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(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); @@ -940,15 +1051,14 @@ void set_ia32_Const_attr(ir_node *ia32_cnst, ir_node *cnst) { 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); + 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(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"); @@ -976,6 +1086,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. */ @@ -993,24 +1119,24 @@ int is_ia32_AddrModeD(const ir_node *node) { } /** - * Checks if node is a Load or fLoad. + * Checks if node is a Load or fLoad/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_fLoad(node) || is_ia32_vfld(node) || is_ia32_fld(node); } /** - * Checks if node is a Store or fStore. + * Checks if node is a Store or fStore/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_fStore(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 fConst/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_fConst(node) || is_ia32_vfConst(node); } /** @@ -1059,7 +1185,7 @@ 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); + attr->slots = (const arch_register_t **)NEW_ARR_D(arch_register_t*, get_irg_obstack(get_irn_irg(node)), num); memset(attr->slots, 0, sizeof(attr->slots[0]) * num); } else { @@ -1093,14 +1219,17 @@ 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; } /* copies the ia32 attributes */ @@ -1113,7 +1242,7 @@ static void ia32_copy_attr(const ir_node *old_node, ir_node *new_node) { 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); + attr_new->slots = (const arch_register_t **)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); } @@ -1129,9 +1258,5 @@ void ia32_register_copy_attr_func(void) { } } -static void ia32_register_additional_opcodes(int n) { - /* we don't need any additional opcodes */ -} - /* Include the generated constructor functions */ #include "gen_ia32_new_nodes.c.inl"