X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Farm%2Farm_new_nodes.c;h=fc9e27ab805b818a73767e8d6499329dd658db3f;hb=ef63002fcb03a29f1b4e041c067d0fa8546bed96;hp=cc8c9ac44c9501218df385225a4f496ee3f1d872;hpb=54529d18bc9e81fe062cdce548d3b899750c6e0b;p=libfirm diff --git a/ir/be/arm/arm_new_nodes.c b/ir/be/arm/arm_new_nodes.c index cc8c9ac44..fc9e27ab8 100644 --- a/ir/be/arm/arm_new_nodes.c +++ b/ir/be/arm/arm_new_nodes.c @@ -36,12 +36,11 @@ #include "ircons_t.h" #include "iropt_t.h" #include "irop.h" -#include "firm_common_t.h" #include "irvrfy_t.h" #include "irprintf.h" #include "xmalloc.h" -#include "../bearch_t.h" +#include "../bearch.h" #include "arm_nodes_attr.h" #include "arm_new_nodes.h" @@ -50,18 +49,11 @@ #include "../beabi.h" #include "bearch_arm_t.h" -/** - * Returns the shift modifier string. - */ -const char *arm_shf_mod_name(arm_shift_modifier mod) { - static const char *names[] = { NULL, NULL, "asr", "lsl", "lsr", "ror", "rrx" }; - return names[mod]; -} - /** * Return the fpa immediate from the encoding. */ -const char *arm_get_fpa_imm_name(long imm_value) { +const char *arm_get_fpa_imm_name(long imm_value) +{ static const char *fpa_imm[] = { "0", "1", @@ -75,78 +67,6 @@ const char *arm_get_fpa_imm_name(long imm_value) { return fpa_imm[imm_value]; } -/*********************************************************************************** - * _ _ _ __ - * | | (_) | | / _| - * __| |_ _ _ __ ___ _ __ ___ _ __ _ _ __ | |_ ___ _ __| |_ __ _ ___ ___ - * / _` | | | | '_ ` _ \| '_ \ / _ \ '__| | | '_ \| __/ _ \ '__| _/ _` |/ __/ _ \ - * | (_| | |_| | | | | | | |_) | __/ | | | | | | || __/ | | || (_| | (_| __/ - * \__,_|\__,_|_| |_| |_| .__/ \___|_| |_|_| |_|\__\___|_| |_| \__,_|\___\___| - * | | - * |_| - ***********************************************************************************/ - -/** - * Dumps the register requirements for either in or out. - */ -static void dump_reg_req(FILE *F, const ir_node *node, - const arch_register_req_t **reqs, int inout) { - char *dir = inout ? "out" : "in"; - int max = inout ? (int) arch_irn_get_n_outs(node) : get_irn_arity(node); - char buf[1024]; - int i; - - memset(buf, 0, sizeof(buf)); - - if (reqs) { - for (i = 0; i < max; i++) { - fprintf(F, "%sreq #%d =", dir, i); - - if (reqs[i]->type == arch_register_req_type_none) { - fprintf(F, " n/a"); - } - - if (reqs[i]->type & arch_register_req_type_normal) { - fprintf(F, " %s", reqs[i]->cls->name); - } - - if (reqs[i]->type & arch_register_req_type_limited) { - fprintf(F, " %s", - arch_register_req_format(buf, sizeof(buf), reqs[i], node)); - } - - if (reqs[i]->type & arch_register_req_type_should_be_same) { - const unsigned other = reqs[i]->other_same; - int i; - - ir_fprintf(F, " same as"); - for (i = 0; 1U << i <= other; ++i) { - if (other & (1U << i)) { - ir_fprintf(F, " %+F", get_irn_n(node, i)); - } - } - } - - if (reqs[i]->type & arch_register_req_type_must_be_different) { - const unsigned other = reqs[i]->other_different; - int i; - - ir_fprintf(F, " different from"); - for (i = 0; 1U << i <= other; ++i) { - if (other & (1U << i)) { - ir_fprintf(F, " %+F", get_irn_n(node, i)); - } - } - } - - fprintf(F, "\n"); - } - - fprintf(F, "\n"); - } else { - fprintf(F, "%sreq = N/A\n", dir); - } -} /** * Dumper interface for dumping arm nodes in vcg. @@ -155,13 +75,10 @@ static void dump_reg_req(FILE *F, const ir_node *node, * @param reason indicates which kind of information should be dumped * @return 0 on success or != 0 on failure */ -static int arm_dump_node(ir_node *n, FILE *F, dump_reason_t reason) { +static int arm_dump_node(ir_node *n, FILE *F, dump_reason_t reason) +{ ir_mode *mode = NULL; - int bad = 0; - int i, n_res, flags; - arm_attr_t *attr = get_arm_attr(n); - const arch_register_req_t **reqs; - arm_shift_modifier mod; + //arm_attr_t *attr = get_arm_attr(n); switch (reason) { case dump_node_opcode_txt: @@ -180,106 +97,47 @@ static int arm_dump_node(ir_node *n, FILE *F, dump_reason_t reason) { break; case dump_node_nodeattr_txt: - mod = ARM_GET_SHF_MOD(attr); - if (ARM_HAS_SHIFT(mod)) { - fprintf(F, "[%s #%ld]", arm_shf_mod_name(mod), attr->imm_value); - } - else if (mod == ARM_SHF_IMM) { - /* immediate */ - fprintf(F, "[#0x%X]", arm_decode_imm_w_shift(attr->imm_value)); - } + /* TODO: dump shift modifiers */ break; case dump_node_info_txt: - fprintf(F, "=== arm attr begin ===\n"); - - /* dump IN requirements */ - if (get_irn_arity(n) > 0) { - reqs = get_arm_in_req_all(n); - dump_reg_req(F, n, reqs, 0); - } - - n_res = arch_irn_get_n_outs(n); - if (n_res > 0) { - /* dump OUT requirements */ - reqs = get_arm_out_req_all(n); - dump_reg_req(F, n, reqs, 1); - - /* dump assigned registers */ - for (i = 0; i < n_res; i++) { - const arch_register_t *reg = arch_irn_get_register(n, i); - - fprintf(F, "reg #%d = %s\n", i, reg ? arch_register_get_name(reg) : "n/a"); - } - fprintf(F, "\n"); - } - fprintf(F, "\n"); - - /* dump n_res */ - fprintf(F, "n_res = %d\n", n_res); - - /* dump flags */ - fprintf(F, "flags ="); - flags = arch_irn_get_flags(n); - if (flags == arch_irn_flags_none) { - fprintf(F, " none"); - } - else { - if (flags & arch_irn_flags_dont_spill) { - fprintf(F, " unspillable"); - } - if (flags & arch_irn_flags_rematerializable) { - fprintf(F, " remat"); - } - if (flags & arch_irn_flags_modify_flags) { - fprintf(F, " modify_flags"); - } - } - fprintf(F, " (%d)\n", flags); + arch_dump_reqs_and_registers(F, n); if (is_arm_CopyB(n)) { - fprintf(F, "size = %lu\n", get_arm_imm_value(n)); + //fprintf(F, "size = %lu\n", get_arm_imm_value(n)); } else { + /* TODO */ +#if 0 long v = get_arm_imm_value(n); if (ARM_GET_FPA_IMM(attr)) { fprintf(F, "immediate float value = %s\n", arm_get_fpa_imm_name(v)); } else { fprintf(F, "immediate value = %ld (0x%08lx)\n", v, v); } +#endif } +#if 0 if (is_arm_CmpBra(n) && get_arm_CondJmp_proj_num(n) >= 0) { fprintf(F, "proj_num = (%d)\n", get_arm_CondJmp_proj_num(n)); } - /* TODO: dump all additional attributes */ - - fprintf(F, "=== arm attr end ===\n"); - /* end of: case dump_node_info_txt */ +#endif break; } - return bad; -} - + return 0; +} -/*************************************************************************************************** - * _ _ _ __ _ _ _ _ - * | | | | | | / / | | | | | | | | - * __ _| |_| |_ _ __ ___ ___| |_ / /_ _ ___| |_ _ __ ___ ___| |_| |__ ___ __| |___ - * / _` | __| __| '__| / __|/ _ \ __| / / _` |/ _ \ __| | '_ ` _ \ / _ \ __| '_ \ / _ \ / _` / __| - * | (_| | |_| |_| | \__ \ __/ |_ / / (_| | __/ |_ | | | | | | __/ |_| | | | (_) | (_| \__ \ - * \__,_|\__|\__|_| |___/\___|\__/_/ \__, |\___|\__| |_| |_| |_|\___|\__|_| |_|\___/ \__,_|___/ - * __/ | - * |___/ - ***************************************************************************************************/ /* Returns the attributes of a generic Arm node. */ -arm_attr_t *get_arm_attr(ir_node *node) { +arm_attr_t *get_arm_attr(ir_node *node) +{ assert(is_arm_irn(node) && "need arm node to get attributes"); return get_irn_generic_attr(node); } -const arm_attr_t *get_arm_attr_const(const ir_node *node) { +const arm_attr_t *get_arm_attr_const(const ir_node *node) +{ assert(is_arm_irn(node) && "need arm node to get attributes"); return get_irn_generic_attr_const(node); } @@ -287,58 +145,56 @@ const arm_attr_t *get_arm_attr_const(const ir_node *node) { /** * Returns the attributes of an ARM SymConst node. */ -arm_SymConst_attr_t *get_arm_SymConst_attr(ir_node *node) { - assert(is_arm_SymConst(node)); +arm_SymConst_attr_t *get_arm_SymConst_attr(ir_node *node) +{ + assert(is_arm_SymConst(node) || is_arm_FrameAddr(node)); return get_irn_generic_attr(node); } -const arm_SymConst_attr_t *get_arm_SymConst_attr_const(const ir_node *node) { - assert(is_arm_SymConst(node)); +const arm_SymConst_attr_t *get_arm_SymConst_attr_const(const ir_node *node) +{ + assert(is_arm_SymConst(node) || is_arm_FrameAddr(node)); return get_irn_generic_attr_const(node); } -static const arm_fpaConst_attr_t *get_arm_fpaConst_attr_const(const ir_node *node) { +static const arm_fpaConst_attr_t *get_arm_fpaConst_attr_const(const ir_node *node) +{ const arm_attr_t *attr = get_arm_attr_const(node); const arm_fpaConst_attr_t *fpa_attr = CONST_CAST_ARM_ATTR(arm_fpaConst_attr_t, attr); return fpa_attr; } -static arm_fpaConst_attr_t *get_arm_fpaConst_attr(ir_node *node) { +static arm_fpaConst_attr_t *get_arm_fpaConst_attr(ir_node *node) +{ arm_attr_t *attr = get_arm_attr(node); arm_fpaConst_attr_t *fpa_attr = CAST_ARM_ATTR(arm_fpaConst_attr_t, attr); return fpa_attr; } -#ifndef NDEBUG -static int is_arm_CondJmp(const ir_node *node) { - int code = get_arm_irn_opcode(node); - - return (code == iro_arm_CmpBra || code == iro_arm_fpaCmfBra || - code == iro_arm_fpaCnfBra || iro_arm_fpaCmfeBra || - code == iro_arm_fpaCnfeBra); -} -#endif - /* Returns the attributes of a CondJmp node. */ -arm_CondJmp_attr_t *get_arm_CondJmp_attr(ir_node *node) { - assert(is_arm_CondJmp(node)); +arm_CondJmp_attr_t *get_arm_CondJmp_attr(ir_node *node) +{ + assert(is_arm_B(node)); return get_irn_generic_attr(node); } -const arm_CondJmp_attr_t *get_arm_CondJmp_attr_const(const ir_node *node) { - assert(is_arm_CondJmp(node)); +const arm_CondJmp_attr_t *get_arm_CondJmp_attr_const(const ir_node *node) +{ + assert(is_arm_B(node)); return get_irn_generic_attr_const(node); } /* Returns the attributes of a SwitchJmp node. */ -arm_SwitchJmp_attr_t *get_arm_SwitchJmp_attr(ir_node *node) { +arm_SwitchJmp_attr_t *get_arm_SwitchJmp_attr(ir_node *node) +{ assert(is_arm_SwitchJmp(node)); return get_irn_generic_attr(node); } -const arm_SwitchJmp_attr_t *get_arm_SwitchJmp_attr_const(const ir_node *node) { +const arm_SwitchJmp_attr_t *get_arm_SwitchJmp_attr_const(const ir_node *node) +{ assert(is_arm_SwitchJmp(node)); return get_irn_generic_attr_const(node); } @@ -346,79 +202,35 @@ const arm_SwitchJmp_attr_t *get_arm_SwitchJmp_attr_const(const ir_node *node) { /** * Returns the argument register requirements of a arm node. */ -const arch_register_req_t **get_arm_in_req_all(const ir_node *node) { +const arch_register_req_t **get_arm_in_req_all(const ir_node *node) +{ const arm_attr_t *attr = get_arm_attr_const(node); return attr->in_req; } -/** - * Returns the result register requirements of an arm node. - */ -const arch_register_req_t **get_arm_out_req_all(const ir_node *node) { - const arm_attr_t *attr = get_arm_attr_const(node); - return attr->out_req; -} - /** * Returns the argument register requirement at position pos of an arm node. */ -const arch_register_req_t *get_arm_in_req(const ir_node *node, int pos) { +const arch_register_req_t *get_arm_in_req(const ir_node *node, int pos) +{ const arm_attr_t *attr = get_arm_attr_const(node); return attr->in_req[pos]; } -/** - * Returns the result register requirement at position pos of an arm node. - */ -const arch_register_req_t *get_arm_out_req(const ir_node *node, int pos) { - const arm_attr_t *attr = get_arm_attr_const(node); - return attr->out_req[pos]; -} - -/** - * Sets the OUT register requirements at position pos. - */ -void set_arm_req_out(ir_node *node, const arch_register_req_t *req, int pos) { - arm_attr_t *attr = get_arm_attr(node); - attr->out_req[pos] = req; -} - -/** - * Sets the complete OUT requirements of node. - */ -void set_arm_req_out_all(ir_node *node, const arch_register_req_t **reqs) { - arm_attr_t *attr = get_arm_attr(node); - attr->out_req = reqs; -} - /** * Sets the IN register requirements at position pos. */ -void set_arm_req_in(ir_node *node, const arch_register_req_t *req, int pos) { +void set_arm_req_in(ir_node *node, const arch_register_req_t *req, int pos) +{ arm_attr_t *attr = get_arm_attr(node); attr->in_req[pos] = req; } -/** - * Returns the immediate value - */ -long get_arm_imm_value(const ir_node *node) { - const arm_attr_t *attr = get_arm_attr_const(node); - return attr->imm_value; -} - -/** - * Sets the tarval value - */ -void set_arm_imm_value(ir_node *node, long imm_value) { - arm_attr_t *attr = get_arm_attr(node); - attr->imm_value = imm_value; -} - /** * Returns the fpaConst value */ -tarval *get_fpaConst_value(const ir_node *node) { +tarval *get_fpaConst_value(const ir_node *node) +{ const arm_fpaConst_attr_t *attr = get_arm_fpaConst_attr_const(node); return attr->tv; } @@ -426,7 +238,8 @@ tarval *get_fpaConst_value(const ir_node *node) { /** * Sets the tarval value */ -void set_fpaConst_value(ir_node *node, tarval *tv) { +void set_fpaConst_value(ir_node *node, tarval *tv) +{ arm_fpaConst_attr_t *attr = get_arm_fpaConst_attr(node); attr->tv = tv; } @@ -434,7 +247,8 @@ void set_fpaConst_value(ir_node *node, tarval *tv) { /** * Returns the proj num */ -int get_arm_CondJmp_proj_num(const ir_node *node) { +int get_arm_CondJmp_proj_num(const ir_node *node) +{ const arm_CondJmp_attr_t *attr = get_arm_CondJmp_attr_const(node); return attr->proj_num; } @@ -442,31 +256,17 @@ int get_arm_CondJmp_proj_num(const ir_node *node) { /** * Sets the proj num */ -void set_arm_CondJmp_proj_num(ir_node *node, int proj_num) { +void set_arm_CondJmp_proj_num(ir_node *node, int proj_num) +{ arm_CondJmp_attr_t *attr = get_arm_CondJmp_attr(node); attr->proj_num = proj_num; } -/** - * Returns the SymConst label - */ -ident *get_arm_symconst_id(const ir_node *node) { - const arm_SymConst_attr_t *attr = get_arm_SymConst_attr_const(node); - return attr->symconst_id; -} - -/** - * Sets the SymConst label - */ -void set_arm_symconst_id(ir_node *node, ident *symconst_id) { - arm_SymConst_attr_t *attr = get_arm_SymConst_attr(node); - attr->symconst_id = symconst_id; -} - /** * Returns the number of projs of a SwitchJmp. */ -int get_arm_SwitchJmp_n_projs(const ir_node *node) { +int get_arm_SwitchJmp_n_projs(const ir_node *node) +{ const arm_SwitchJmp_attr_t *attr = get_arm_SwitchJmp_attr_const(node); return attr->n_projs; } @@ -474,7 +274,8 @@ int get_arm_SwitchJmp_n_projs(const ir_node *node) { /** * Sets the number of projs. */ -void set_arm_SwitchJmp_n_projs(ir_node *node, int n_projs) { +void set_arm_SwitchJmp_n_projs(ir_node *node, int n_projs) +{ arm_SwitchJmp_attr_t *attr = get_arm_SwitchJmp_attr(node); attr->n_projs = n_projs; } @@ -482,7 +283,8 @@ void set_arm_SwitchJmp_n_projs(ir_node *node, int n_projs) { /** * Returns the default_proj_num. */ -long get_arm_SwitchJmp_default_proj_num(const ir_node *node) { +long get_arm_SwitchJmp_default_proj_num(const ir_node *node) +{ const arm_SwitchJmp_attr_t *attr = get_arm_SwitchJmp_attr_const(node); return attr->default_proj_num; } @@ -490,25 +292,18 @@ long get_arm_SwitchJmp_default_proj_num(const ir_node *node) { /** * Sets the default_proj_num. */ -void set_arm_SwitchJmp_default_proj_num(ir_node *node, long default_proj_num) { +void set_arm_SwitchJmp_default_proj_num(ir_node *node, long default_proj_num) +{ arm_SwitchJmp_attr_t *attr = get_arm_SwitchJmp_attr(node); attr->default_proj_num = default_proj_num; } -/** - * Gets the shift modifier attribute. - */ -arm_shift_modifier get_arm_shift_modifier(const ir_node *node) { - const arm_attr_t *attr = get_arm_attr_const(node); - return ARM_GET_SHF_MOD(attr); -} - /* Set the ARM machine node attributes to default values. */ static void init_arm_attributes(ir_node *node, int flags, const arch_register_req_t ** in_reqs, - const arch_register_req_t ** out_reqs, const be_execution_unit_t ***execution_units, - int n_res) { + int n_res) +{ ir_graph *irg = get_irn_irg(node); struct obstack *obst = get_irg_obstack(irg); arm_attr_t *attr = get_arm_attr(node); @@ -517,70 +312,66 @@ static void init_arm_attributes(ir_node *node, int flags, arch_irn_set_flags(node, flags); attr->in_req = in_reqs; - attr->out_req = out_reqs; - attr->instr_fl = (ARM_COND_AL << 3) | ARM_SHF_NONE; - attr->imm_value = 0; + attr->instr_fl = 0; info = be_get_info(node); info->out_infos = NEW_ARR_D(reg_out_info_t, obst, n_res); memset(info->out_infos, 0, n_res * sizeof(info->out_infos[0])); } -/************************************************ - * ___ _ _ _ * - * / _ \ _ __ | |_(_)_ __ ___ (_)_______ _ __ * - * | | | | '_ \| __| | '_ ` _ \| |_ / _ \ '__| * - * | |_| | |_) | |_| | | | | | | |/ / __/ | * - * \___/| .__/ \__|_|_| |_| |_|_/___\___|_| * - * |_| * - ************************************************/ - -typedef struct _opt_tuple { - ir_op *op_imm_left; /**< immediate is left */ - ir_op *op_imm_right; /**< immediate is right */ - ir_op *op_shf_left; /**< shift operand on left */ - ir_op *op_shf_right; /**< shift operand on right */ -} opt_tuple; - -//static const opt_tuple *opt_ops[iro_arm_last]; - -void arm_set_optimizers(void) { - /* -#define STD(op) p_##op = { op_arm_##op##_i, op_arm_##op##_i, op_arm_##op, op_arm_##op } -#define LEFT(op) p_##op = { op_arm_##op##_i, NULL, op_arm_##op, NULL } -#define SET(op) opt_ops[iro_arm_##op] = &p_##op; - - static const opt_tuple - STD(Add), - STD(And), - STD(Or), - STD(Eor), - LEFT(Bic), - LEFT(Shl), - LEFT(Shr), - LEFT(Shrs), - p_Sub = { op_arm_Sub_i, op_arm_Rsb_i, op_arm_Sub, op_arm_Rsb }, - - memset(opt_ops, 0, sizeof(opt_ops)); - SET(Add); - SET(And); - SET(Or); - SET(Eor); - SET(Sub); - SET(Bic); - SET(Shl); - SET(Shr); - SET(Shrs); - */ -} - -static int cmp_attr_arm(ir_node *a, ir_node *b) { +static void init_arm_load_store_attributes(ir_node *res, ir_mode *ls_mode, + ir_entity *entity, + int entity_sign, long offset, + bool is_frame_entity) +{ + arm_load_store_attr_t *attr = get_irn_generic_attr(res); + attr->load_store_mode = ls_mode; + attr->entity = entity; + attr->entity_sign = entity_sign; + attr->is_frame_entity = is_frame_entity; + attr->offset = offset; + attr->base.is_load_store = true; +} + +static void init_arm_shifter_operand(ir_node *res, unsigned immediate_value, + arm_shift_modifier shift_modifier, + unsigned shift_immediate) +{ + arm_shifter_operand_t *attr = get_irn_generic_attr(res); + attr->immediate_value = immediate_value; + attr->shift_modifier = shift_modifier; + attr->shift_immediate = shift_immediate; +} + +static void init_arm_cmp_attr(ir_node *res, bool ins_permuted, bool is_unsigned) +{ + arm_cmp_attr_t *attr = get_irn_generic_attr(res); + attr->ins_permuted = ins_permuted; + attr->is_unsigned = is_unsigned; +} + +static void init_arm_SymConst_attributes(ir_node *res, ir_entity *entity) +{ + arm_SymConst_attr_t *attr = get_irn_generic_attr(res); + attr->entity = entity; + attr->fp_offset = 0; +} + +static void init_arm_CopyB_attributes(ir_node *res, unsigned size) +{ + arm_CopyB_attr_t *attr = get_irn_generic_attr(res); + attr->size = size; +} + +static int cmp_attr_arm(ir_node *a, ir_node *b) +{ arm_attr_t *attr_a = get_irn_generic_attr(a); arm_attr_t *attr_b = get_irn_generic_attr(b); - return (attr_a->instr_fl != attr_b->instr_fl) || (attr_a->imm_value != attr_b->imm_value); + return attr_a->instr_fl != attr_b->instr_fl; } -static int cmp_attr_arm_SymConst(ir_node *a, ir_node *b) { +static int cmp_attr_arm_SymConst(ir_node *a, ir_node *b) +{ const arm_SymConst_attr_t *attr_a; const arm_SymConst_attr_t *attr_b; @@ -589,24 +380,41 @@ static int cmp_attr_arm_SymConst(ir_node *a, ir_node *b) { attr_a = get_irn_generic_attr_const(a); attr_b = get_irn_generic_attr_const(b); - return attr_a->symconst_id != attr_b->symconst_id; + return attr_a->entity != attr_b->entity + || attr_a->fp_offset != attr_b->fp_offset; +} + +static int cmp_attr_arm_CopyB(ir_node *a, ir_node *b) +{ + const arm_CopyB_attr_t *attr_a; + const arm_CopyB_attr_t *attr_b; + + if (cmp_attr_arm(a, b)) + return 1; + + attr_a = get_irn_generic_attr_const(a); + attr_b = get_irn_generic_attr_const(b); + return attr_a->size != attr_b->size; } -static int cmp_attr_arm_CondJmp(ir_node *a, ir_node *b) { +static int cmp_attr_arm_CondJmp(ir_node *a, ir_node *b) +{ (void) a; (void) b; /* never identical */ return 1; } -static int cmp_attr_arm_SwitchJmp(ir_node *a, ir_node *b) { +static int cmp_attr_arm_SwitchJmp(ir_node *a, ir_node *b) +{ (void) a; (void) b; /* never identical */ return 1; } -static int cmp_attr_arm_fpaConst(ir_node *a, ir_node *b) { +static int cmp_attr_arm_fpaConst(ir_node *a, ir_node *b) +{ const arm_fpaConst_attr_t *attr_a; const arm_fpaConst_attr_t *attr_b; @@ -619,8 +427,77 @@ static int cmp_attr_arm_fpaConst(ir_node *a, ir_node *b) { return attr_a->tv != attr_b->tv; } + +arm_load_store_attr_t *get_arm_load_store_attr(ir_node *node) +{ + return (arm_load_store_attr_t*) get_irn_generic_attr(node); +} + +const arm_load_store_attr_t *get_arm_load_store_attr_const(const ir_node *node) +{ + return (const arm_load_store_attr_t*) get_irn_generic_attr_const(node); +} + +arm_shifter_operand_t *get_arm_shifter_operand_attr(ir_node *node) +{ + return (arm_shifter_operand_t*) get_irn_generic_attr(node); +} + +static int cmp_attr_arm_load_store(ir_node *a, ir_node *b) +{ + const arm_load_store_attr_t *attr_a; + const arm_load_store_attr_t *attr_b; + + if (cmp_attr_arm(a, b)) + return 1; + + attr_a = get_arm_load_store_attr(a); + attr_b = get_arm_load_store_attr(b); + if (attr_a->entity != attr_b->entity + || attr_a->entity_sign != attr_b->entity_sign + || attr_a->offset != attr_b->offset) + return 1; + + return 0; +} + +static int cmp_attr_arm_shifter_operand(ir_node *a, ir_node *b) +{ + const arm_shifter_operand_t *attr_a; + const arm_shifter_operand_t *attr_b; + + if (cmp_attr_arm(a, b)) + return 1; + + attr_a = get_arm_shifter_operand_attr(a); + attr_b = get_arm_shifter_operand_attr(b); + if (attr_a->shift_modifier != attr_b->shift_modifier + || attr_a->immediate_value != attr_b->immediate_value + || attr_a->shift_immediate != attr_b->shift_immediate) + return 1; + + return 0; +} + +static int cmp_attr_arm_cmp(ir_node *a, ir_node *b) +{ + const arm_cmp_attr_t *attr_a; + const arm_cmp_attr_t *attr_b; + + if (cmp_attr_arm(a, b)) + return 1; + + attr_a = get_irn_generic_attr_const(a); + attr_b = get_irn_generic_attr_const(b); + if (attr_a->ins_permuted != attr_b->ins_permuted + || attr_a->is_unsigned != attr_b->is_unsigned) + return 1; + return 0; +} + /** copies the ARM attributes of a node. */ -static void arm_copy_attr(const ir_node *old_node, ir_node *new_node) { +static void arm_copy_attr(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 arm_attr_t *attr_old = get_arm_attr_const(old_node);