X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fsparc%2Fsparc_new_nodes.c;h=20db725f318f0426c01137b87591e68e55006ded;hb=1553e92153d3b718a7f5575dcbbe8abbffc579c0;hp=b48240f08d7106a03cc7b660e56a10cf42bc065b;hpb=e50e95fbed5212b07773f5a118ee338c814ff368;p=libfirm diff --git a/ir/be/sparc/sparc_new_nodes.c b/ir/be/sparc/sparc_new_nodes.c index b48240f08..20db725f3 100644 --- a/ir/be/sparc/sparc_new_nodes.c +++ b/ir/be/sparc/sparc_new_nodes.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved. + * Copyright (C) 1995-2011 University of Karlsruhe. All right reserved. * * This file is part of libFirm. * @@ -22,6 +22,7 @@ * @brief This file implements the creation of the achitecture specific firm * opcodes and the coresponding node constructors for the sparc * assembler irg. + * @author Hannes Rapp, Matthias Braun * @version $Id$ */ #include "config.h" @@ -60,11 +61,6 @@ static bool has_switch_jmp_attr(const ir_node *node) return is_sparc_SwitchJmp(node); } -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) @@ -86,7 +82,7 @@ static bool has_fp_conv_attr(const ir_node *node) */ static void sparc_dump_node(FILE *F, ir_node *n, dump_reason_t reason) { - const sparc_attr_t *attr; + const sparc_attr_t *sparc_attr; switch (reason) { case dump_node_opcode_txt: @@ -98,16 +94,13 @@ 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); - attr = get_sparc_attr_const(n); - if (attr->immediate_value_entity) { + sparc_attr = get_sparc_attr_const(n); + if (sparc_attr->immediate_value_entity) { ir_fprintf(F, "entity: %+F (offset %d)\n", - attr->immediate_value_entity, attr->immediate_value); + sparc_attr->immediate_value_entity, + sparc_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); + ir_fprintf(F, "immediate value: %d\n", sparc_attr->immediate_value); } if (sparc_has_load_store_attr(n)) { const sparc_load_store_attr_t *attr = get_sparc_load_store_attr_const(n); @@ -118,7 +111,8 @@ static void sparc_dump_node(FILE *F, ir_node *n, dump_reason_t reason) 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, "relation: %d (%s)\n", (int)attr->relation, + get_relation_string(attr->relation)); fprintf(F, "unsigned: %s\n", attr->is_unsigned ? "true" : "false"); } if (has_switch_jmp_attr(n)) { @@ -145,15 +139,17 @@ static void sparc_dump_node(FILE *F, ir_node *n, dump_reason_t reason) 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); + sparc_attr_t *attr = (sparc_attr_t*)get_irn_generic_attr(res); attr->immediate_value_entity = entity; attr->immediate_value = immediate_value; + arch_add_irn_flags(res, (arch_irn_flags_t)sparc_arch_irn_flag_immediate_form); } -static void init_sparc_jmp_cond_attr(ir_node *node, int pnc, bool is_unsigned) +static void init_sparc_jmp_cond_attr(ir_node *node, ir_relation relation, + bool is_unsigned) { sparc_jmp_cond_attr_t *attr = get_sparc_jmp_cond_attr(node); - attr->pnc = pnc; + attr->relation = relation; attr->is_unsigned = is_unsigned; } @@ -205,18 +201,6 @@ const sparc_switch_jmp_attr_t *get_sparc_switch_jmp_attr_const(const ir_node *no return (const sparc_switch_jmp_attr_t*) get_irn_generic_attr_const(node); } -sparc_save_attr_t *get_sparc_save_attr(ir_node *node) -{ - assert(has_save_attr(node)); - return (sparc_save_attr_t*) get_irn_generic_attr_const(node); -} - -const sparc_save_attr_t *get_sparc_save_attr_const(const ir_node *node) -{ - assert(has_save_attr(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)); @@ -241,39 +225,6 @@ const sparc_fp_conv_attr_t *get_sparc_fp_conv_attr_const(const ir_node *node) return (const sparc_fp_conv_attr_t*) get_irn_generic_attr_const(node); } -/** - * Returns the argument register requirements of a sparc node. - */ -const arch_register_req_t **get_sparc_in_req_all(const ir_node *node) -{ - const sparc_attr_t *attr = get_sparc_attr_const(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. - */ -const arch_register_req_t *get_sparc_in_req(const ir_node *node, int pos) -{ - const sparc_attr_t *attr = get_sparc_attr_const(node); - return attr->in_req[pos]; -} - -/** - * Sets the IN register requirements at position pos. - */ -void set_sparc_req_in(ir_node *node, const arch_register_req_t *req, int pos) -{ - sparc_attr_t *attr = get_sparc_attr(node); - attr->in_req[pos] = req; -} - /** * Initializes the nodes attributes. */ @@ -284,12 +235,11 @@ static void init_sparc_attributes(ir_node *node, arch_irn_flags_t flags, { ir_graph *irg = get_irn_irg(node); struct obstack *obst = get_irg_obstack(irg); - sparc_attr_t *attr = get_sparc_attr(node); backend_info_t *info; (void) execution_units; - arch_irn_set_flags(node, flags); - attr->in_req = in_reqs; + arch_set_irn_flags(node, flags); + arch_set_irn_register_reqs_in(node, in_reqs); info = be_get_info(node); info->out_infos = NEW_ARR_D(reg_out_info_t, obst, n_res); @@ -309,12 +259,6 @@ static void init_sparc_load_store_attributes(ir_node *res, ir_mode *ls_mode, attr->is_reg_reg = is_reg_reg; } -static void init_sparc_save_attributes(ir_node *res, int initial_stacksize) -{ - sparc_save_attr_t *attr = get_sparc_save_attr(res); - attr->initial_stacksize = initial_stacksize; -} - static void init_sparc_fp_attributes(ir_node *res, ir_mode *fp_mode) { sparc_fp_attr_t *attr = get_sparc_fp_attr(res); @@ -352,14 +296,16 @@ static void sparc_copy_attr(ir_graph *irg, const ir_node *old_node, /* copy the attributes */ memcpy(attr_new, attr_old, get_op_attr_size(get_irn_op(old_node))); /* copy out flags */ + new_info->flags = old_info->flags; new_info->out_infos = DUP_ARR_D(reg_out_info_t, obst, old_info->out_infos); + new_info->in_reqs = old_info->in_reqs; } /** * compare some node's attributes */ -static int cmp_attr_sparc(ir_node *a, ir_node *b) +static int cmp_attr_sparc(const ir_node *a, const ir_node *b) { const sparc_attr_t *attr_a = get_sparc_attr_const(a); const sparc_attr_t *attr_b = get_sparc_attr_const(b); @@ -368,7 +314,7 @@ static int cmp_attr_sparc(ir_node *a, ir_node *b) || attr_a->immediate_value_entity != attr_b->immediate_value_entity; } -static int cmp_attr_sparc_load_store(ir_node *a, ir_node *b) +static int cmp_attr_sparc_load_store(const ir_node *a, const 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); @@ -380,7 +326,7 @@ static int cmp_attr_sparc_load_store(ir_node *a, ir_node *b) || attr_a->load_store_mode != attr_b->load_store_mode; } -static int cmp_attr_sparc_jmp_cond(ir_node *a, ir_node *b) +static int cmp_attr_sparc_jmp_cond(const ir_node *a, const ir_node *b) { const sparc_jmp_cond_attr_t *attr_a = get_sparc_jmp_cond_attr_const(a); const sparc_jmp_cond_attr_t *attr_b = get_sparc_jmp_cond_attr_const(b); @@ -388,11 +334,11 @@ static int cmp_attr_sparc_jmp_cond(ir_node *a, ir_node *b) if (cmp_attr_sparc(a, b)) return 1; - return attr_a->pnc != attr_b->pnc + return attr_a->relation != attr_b->relation || attr_a->is_unsigned != attr_b->is_unsigned; } -static int cmp_attr_sparc_switch_jmp(ir_node *a, ir_node *b) +static int cmp_attr_sparc_switch_jmp(const ir_node *a, const ir_node *b) { const sparc_switch_jmp_attr_t *attr_a = get_sparc_switch_jmp_attr_const(a); const sparc_switch_jmp_attr_t *attr_b = get_sparc_switch_jmp_attr_const(b); @@ -403,18 +349,7 @@ static int cmp_attr_sparc_switch_jmp(ir_node *a, ir_node *b) return attr_a->default_proj_num != attr_b->default_proj_num; } -static int cmp_attr_sparc_save(ir_node *a, ir_node *b) -{ - const sparc_save_attr_t *attr_a = get_sparc_save_attr_const(a); - const sparc_save_attr_t *attr_b = get_sparc_save_attr_const(b); - - if (cmp_attr_sparc(a, b)) - return 1; - - return attr_a->initial_stacksize != attr_b->initial_stacksize; -} - -static int cmp_attr_sparc_fp(ir_node *a, ir_node *b) +static int cmp_attr_sparc_fp(const ir_node *a, const 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); @@ -425,7 +360,7 @@ static int cmp_attr_sparc_fp(ir_node *a, ir_node *b) return attr_a->fp_mode != attr_b->fp_mode; } -static int cmp_attr_sparc_fp_conv(ir_node *a, ir_node *b) +static int cmp_attr_sparc_fp_conv(const ir_node *a, const 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); @@ -434,7 +369,7 @@ static int cmp_attr_sparc_fp_conv(ir_node *a, ir_node *b) return 1; return attr_a->src_mode != attr_b->src_mode - || attr_a->dest_mode != attr_b->dest_mode;; + || attr_a->dest_mode != attr_b->dest_mode; } /* Include the generated constructor functions */