X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fsparc%2Fsparc_new_nodes.c;h=2b32bf0dd28b99c42bf32fc088c004f15bda186e;hb=84d9d910ffb6b14a46c0c94d3bb4fc9fe9c4435f;hp=3feb19341296e549ecce58a74caafc187a99f83e;hpb=b4e27346b89bc9998aa4c110e185599c7b593e01;p=libfirm diff --git a/ir/be/sparc/sparc_new_nodes.c b/ir/be/sparc/sparc_new_nodes.c index 3feb19341..2b32bf0dd 100644 --- a/ir/be/sparc/sparc_new_nodes.c +++ b/ir/be/sparc/sparc_new_nodes.c @@ -35,7 +35,6 @@ #include "ircons_t.h" #include "iropt_t.h" #include "irop.h" -#include "irvrfy_t.h" #include "irprintf.h" #include "xmalloc.h" @@ -45,19 +44,15 @@ #include "sparc_new_nodes.h" #include "gen_sparc_regalloc_if.h" -static bool has_symconst_attr(const ir_node *node) +bool sparc_has_load_store_attr(const ir_node *node) { - return is_sparc_SymConst(node) || is_sparc_FrameAddr(node); -} - -static bool has_load_store_attr(const ir_node *node) -{ - return is_sparc_Ld(node) || is_sparc_St(node); + return is_sparc_Ld(node) || is_sparc_St(node) || is_sparc_Ldf(node) + || is_sparc_Stf(node); } static bool has_jmp_cond_attr(const ir_node *node) { - return is_sparc_BXX(node); + return is_sparc_Bicc(node) || is_sparc_fbfcc(node); } static bool has_jmp_switch_attr(const ir_node *node) @@ -70,6 +65,19 @@ static bool has_save_attr(const ir_node *node) return is_sparc_Save(node); } +static bool has_fp_attr(const ir_node *node) +{ + return is_sparc_fadd(node) || is_sparc_fsub(node) + || is_sparc_fmul(node) || is_sparc_fdiv(node) + || is_sparc_fftoi(node) || is_sparc_fitof(node) + || is_sparc_fneg(node) || is_sparc_fcmp(node); +} + +static bool has_fp_conv_attr(const ir_node *node) +{ + return is_sparc_fftof(node); +} + /** * Dumper interface for dumping sparc nodes in vcg. * @param F the output file @@ -78,6 +86,8 @@ static bool has_save_attr(const ir_node *node) */ static void sparc_dump_node(FILE *F, ir_node *n, dump_reason_t reason) { + const sparc_attr_t *attr; + switch (reason) { case dump_node_opcode_txt: fprintf(F, "%s", get_irn_opname(n)); @@ -88,33 +98,63 @@ static void sparc_dump_node(FILE *F, ir_node *n, dump_reason_t reason) case dump_node_info_txt: arch_dump_reqs_and_registers(F, n); - break; - - case dump_node_nodeattr_txt: - if (has_symconst_attr(n)) { - const sparc_symconst_attr_t *attr = get_sparc_symconst_attr_const(n); - fprintf(F, "fp_offset: 0x%X\n", attr->fp_offset); + attr = get_sparc_attr_const(n); + if (attr->immediate_value_entity) { + ir_fprintf(F, "entity: %+F (offset %d)\n", + attr->immediate_value_entity, attr->immediate_value); + } else { + ir_fprintf(F, "immediate value: %d\n", attr->immediate_value); + } + if (has_save_attr(n)) { + const sparc_save_attr_t *attr = get_sparc_save_attr_const(n); + fprintf(F, "initial stacksize: %d\n", attr->initial_stacksize); } - if (has_load_store_attr(n)) { + if (sparc_has_load_store_attr(n)) { const sparc_load_store_attr_t *attr = get_sparc_load_store_attr_const(n); - fprintf(F, "offset: 0x%lX\n", attr->offset); - fprintf(F, "is_frame_entity: %s\n", attr->is_frame_entity == true ? "true" : "false"); + ir_fprintf(F, "load store mode: %+F\n", attr->load_store_mode); + fprintf(F, "is frame entity: %s\n", + attr->is_frame_entity ? "true" : "false"); + } + if (has_jmp_cond_attr(n)) { + const sparc_jmp_cond_attr_t *attr + = get_sparc_jmp_cond_attr_const(n); + fprintf(F, "pnc: %d (%s)\n", attr->pnc, get_pnc_string(attr->pnc)); + fprintf(F, "unsigned: %s\n", attr->is_unsigned ? "true" : "false"); + } + if (has_jmp_switch_attr(n)) { + const sparc_jmp_switch_attr_t *attr + = get_sparc_jmp_switch_attr_const(n); + fprintf(F, "n projs: %d\n", attr->n_projs); + fprintf(F, "default proj: %ld\n", attr->default_proj_num); + } + if (has_fp_attr(n)) { + const sparc_fp_attr_t *attr = get_sparc_fp_attr_const(n); + ir_fprintf(F, "fp_mode: %+F\n", attr->fp_mode); + } + if (has_fp_conv_attr(n)) { + const sparc_fp_conv_attr_t *attr = get_sparc_fp_conv_attr_const(n); + ir_fprintf(F, "conv from: %+F\n", attr->src_mode); + ir_fprintf(F, "conv to: %+F\n", attr->dest_mode); } break; + + case dump_node_nodeattr_txt: + break; } } -static void sparc_set_attr_imm(ir_node *res, int immediate_value) +static void sparc_set_attr_imm(ir_node *res, ir_entity *entity, + int32_t immediate_value) { - sparc_attr_t *attr = get_irn_generic_attr(res); - attr->immediate_value = immediate_value; + sparc_attr_t *attr = get_irn_generic_attr(res); + attr->immediate_value_entity = entity; + attr->immediate_value = immediate_value; } -static void init_sparc_jmp_cond_attr(ir_node *node, int proj_num, - bool is_unsigned) +static void init_sparc_jmp_cond_attr(ir_node *node, int pnc, bool is_unsigned) { sparc_jmp_cond_attr_t *attr = get_sparc_jmp_cond_attr(node); - attr->proj_num = proj_num; + attr->pnc = pnc; attr->is_unsigned = is_unsigned; } @@ -158,28 +198,16 @@ const sparc_attr_t *get_sparc_attr_const(const ir_node *node) sparc_load_store_attr_t *get_sparc_load_store_attr(ir_node *node) { - assert(has_load_store_attr(node)); + assert(sparc_has_load_store_attr(node)); return (sparc_load_store_attr_t*) get_irn_generic_attr_const(node); } const sparc_load_store_attr_t *get_sparc_load_store_attr_const(const ir_node *node) { - assert(has_load_store_attr(node)); + assert(sparc_has_load_store_attr(node)); return (const sparc_load_store_attr_t*) get_irn_generic_attr_const(node); } -sparc_symconst_attr_t *get_sparc_symconst_attr(ir_node *node) -{ - assert(has_symconst_attr(node)); - return (sparc_symconst_attr_t*) get_irn_generic_attr_const(node); -} - -const sparc_symconst_attr_t *get_sparc_symconst_attr_const(const ir_node *node) -{ - assert(has_symconst_attr(node)); - return (const sparc_symconst_attr_t*) get_irn_generic_attr_const(node); -} - sparc_jmp_cond_attr_t *get_sparc_jmp_cond_attr(ir_node *node) { assert(has_jmp_cond_attr(node)); @@ -216,6 +244,30 @@ const sparc_save_attr_t *get_sparc_save_attr_const(const ir_node *node) return (const sparc_save_attr_t*) get_irn_generic_attr_const(node); } +sparc_fp_attr_t *get_sparc_fp_attr(ir_node *node) +{ + assert(has_fp_attr(node)); + return (sparc_fp_attr_t*) get_irn_generic_attr(node); +} + +const sparc_fp_attr_t *get_sparc_fp_attr_const(const ir_node *node) +{ + assert(has_fp_attr(node)); + return (const sparc_fp_attr_t*) get_irn_generic_attr_const(node); +} + +sparc_fp_conv_attr_t *get_sparc_fp_conv_attr(ir_node *node) +{ + assert(has_fp_conv_attr(node)); + return (sparc_fp_conv_attr_t*) get_irn_generic_attr(node); +} + +const sparc_fp_conv_attr_t *get_sparc_fp_conv_attr_const(const ir_node *node) +{ + assert(has_fp_conv_attr(node)); + return (const sparc_fp_conv_attr_t*) get_irn_generic_attr_const(node); +} + /** * Returns the argument register requirements of a sparc node. */ @@ -225,6 +277,12 @@ const arch_register_req_t **get_sparc_in_req_all(const ir_node *node) return attr->in_req; } +void set_sparc_in_req_all(ir_node *node, const arch_register_req_t **reqs) +{ + sparc_attr_t *attr = get_sparc_attr(node); + attr->in_req = reqs; +} + /** * Returns the argument register requirement at position pos of an sparc node. */ @@ -258,40 +316,42 @@ static void init_sparc_attributes(ir_node *node, arch_irn_flags_t flags, (void) execution_units; arch_irn_set_flags(node, flags); - attr->in_req = in_reqs; - attr->is_load_store = false; + attr->in_req = in_reqs; 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])); } -/* CUSTOM ATTRIBUTE INIT FUNCTIONS */ static void init_sparc_load_store_attributes(ir_node *res, ir_mode *ls_mode, - ir_entity *entity, - int entity_sign, long offset, + ir_entity *entity, int32_t offset, bool is_frame_entity) { - sparc_load_store_attr_t *attr = get_sparc_load_store_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; + sparc_load_store_attr_t *attr = get_sparc_load_store_attr(res); + attr->base.immediate_value_entity = entity; + attr->base.immediate_value = offset; + attr->load_store_mode = ls_mode; + attr->is_frame_entity = is_frame_entity; } -static void init_sparc_symconst_attributes(ir_node *res, ir_entity *entity) +static void init_sparc_save_attributes(ir_node *res, int initial_stacksize) { - sparc_symconst_attr_t *attr = get_sparc_symconst_attr(res); - attr->entity = entity; - attr->fp_offset = 0; + sparc_save_attr_t *attr = get_sparc_save_attr(res); + attr->initial_stacksize = initial_stacksize; } -static void init_sparc_save_attr(ir_node *res, int initial_stacksize) +static void init_sparc_fp_attributes(ir_node *res, ir_mode *fp_mode) { - sparc_save_attr_t *attr = get_sparc_save_attr(res); - attr->initial_stacksize = initial_stacksize; + sparc_fp_attr_t *attr = get_sparc_fp_attr(res); + attr->fp_mode = fp_mode; +} + +static void init_sparc_fp_conv_attributes(ir_node *res, ir_mode *src_mode, + ir_mode *dest_mode) +{ + sparc_fp_conv_attr_t *attr = get_sparc_fp_conv_attr(res); + attr->src_mode = src_mode; + attr->dest_mode = dest_mode; } /** @@ -322,36 +382,19 @@ static int cmp_attr_sparc(ir_node *a, ir_node *b) const sparc_attr_t *attr_b = get_sparc_attr_const(b); return attr_a->immediate_value != attr_b->immediate_value - || attr_a->is_load_store != attr_b->is_load_store; + || attr_a->immediate_value_entity != attr_b->immediate_value_entity; } - -/* CUSTOM ATTRIBUTE CMP FUNCTIONS */ static int cmp_attr_sparc_load_store(ir_node *a, ir_node *b) { const sparc_load_store_attr_t *attr_a = get_sparc_load_store_attr_const(a); const sparc_load_store_attr_t *attr_b = get_sparc_load_store_attr_const(b); if (cmp_attr_sparc(a, b)) - return 1; - - return attr_a->entity != attr_b->entity - || attr_a->entity_sign != attr_b->entity_sign - || attr_a->is_frame_entity != attr_b->is_frame_entity - || attr_a->load_store_mode != attr_b->load_store_mode - || attr_a->offset != attr_b->offset; -} - -static int cmp_attr_sparc_symconst(ir_node *a, ir_node *b) -{ - const sparc_symconst_attr_t *attr_a = get_sparc_symconst_attr_const(a); - const sparc_symconst_attr_t *attr_b = get_sparc_symconst_attr_const(b); - - if (cmp_attr_sparc(a, b)) - return 1; + return 1; - return attr_a->entity != attr_b->entity - || attr_a->fp_offset != attr_b->fp_offset; + return attr_a->is_frame_entity != attr_b->is_frame_entity + || attr_a->load_store_mode != attr_b->load_store_mode; } static int cmp_attr_sparc_jmp_cond(ir_node *a, ir_node *b) @@ -360,10 +403,10 @@ static int cmp_attr_sparc_jmp_cond(ir_node *a, ir_node *b) const sparc_jmp_cond_attr_t *attr_b = get_sparc_jmp_cond_attr_const(b); if (cmp_attr_sparc(a, b)) - return 1; + return 1; - return attr_a->proj_num != attr_b->proj_num - || attr_a->is_unsigned != attr_b->is_unsigned; + return attr_a->pnc != attr_b->pnc + || attr_a->is_unsigned != attr_b->is_unsigned; } static int cmp_attr_sparc_jmp_switch(ir_node *a, ir_node *b) @@ -372,7 +415,7 @@ static int cmp_attr_sparc_jmp_switch(ir_node *a, ir_node *b) const sparc_jmp_switch_attr_t *attr_b = get_sparc_jmp_switch_attr_const(b); if (cmp_attr_sparc(a, b)) - return 1; + return 1; return attr_a->default_proj_num != attr_b->default_proj_num || attr_a->n_projs != attr_b->n_projs; @@ -384,10 +427,33 @@ static int cmp_attr_sparc_save(ir_node *a, ir_node *b) const sparc_save_attr_t *attr_b = get_sparc_save_attr_const(b); if (cmp_attr_sparc(a, b)) - return 1; + return 1; return attr_a->initial_stacksize != attr_b->initial_stacksize; } +static int cmp_attr_sparc_fp(ir_node *a, ir_node *b) +{ + const sparc_fp_attr_t *attr_a = get_sparc_fp_attr_const(a); + const sparc_fp_attr_t *attr_b = get_sparc_fp_attr_const(b); + + if (cmp_attr_sparc(a, b)) + return 1; + + return attr_a->fp_mode != attr_b->fp_mode; +} + +static int cmp_attr_sparc_fp_conv(ir_node *a, ir_node *b) +{ + const sparc_fp_conv_attr_t *attr_a = get_sparc_fp_conv_attr_const(a); + const sparc_fp_conv_attr_t *attr_b = get_sparc_fp_conv_attr_const(b); + + if (cmp_attr_sparc(a, b)) + return 1; + + return attr_a->src_mode != attr_b->src_mode + || attr_a->dest_mode != attr_b->dest_mode;; +} + /* Include the generated constructor functions */ #include "gen_sparc_new_nodes.c.inl"