X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2FTEMPLATE%2FTEMPLATE_new_nodes.c;h=12778e95bf5f9da18bb3476d5c312f4570d4e302;hb=93da909d12b7bec51aa36ee5f05966c331f90fb9;hp=3f98e33f0f0cf5095aa3aedc9987cb9855006702;hpb=61af57b12ac03fde8c8f03d7c9500bfbff5dfdbf;p=libfirm diff --git a/ir/be/TEMPLATE/TEMPLATE_new_nodes.c b/ir/be/TEMPLATE/TEMPLATE_new_nodes.c index 3f98e33f0..12778e95b 100644 --- a/ir/be/TEMPLATE/TEMPLATE_new_nodes.c +++ b/ir/be/TEMPLATE/TEMPLATE_new_nodes.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1995-2007 University of Karlsruhe. All right reserved. + * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved. * * This file is part of libFirm. * @@ -91,11 +91,27 @@ static void dump_reg_req(FILE *F, ir_node *n, const arch_register_req_t **reqs, } if (reqs[i]->type & arch_register_req_type_should_be_same) { - ir_fprintf(F, " same as %+F", get_irn_n(n, reqs[i]->other_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(n, i)); + } + } } - if (reqs[i]->type & arch_register_req_type_should_be_different) { - ir_fprintf(F, " different from %+F", get_irn_n(n, reqs[i]->other_different)); + 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(n, i)); + } + } } fprintf(F, "\n"); @@ -157,15 +173,15 @@ static int TEMPLATE_dump_node(ir_node *n, FILE *F, dump_reason_t reason) { } /* dump OUT requirements */ - if (attr->n_res > 0) { + if (ARR_LEN(attr->slots) > 0) { reqs = get_TEMPLATE_out_req_all(n); dump_reg_req(F, n, reqs, 1); } /* dump assigned registers */ slots = get_TEMPLATE_slots(n); - if (slots && attr->n_res > 0) { - for (i = 0; i < attr->n_res; i++) { + if (slots && ARR_LEN(attr->slots) > 0) { + for (i = 0; i < ARR_LEN(attr->slots); i++) { if (slots[i]) { fprintf(F, "reg #%d = %s\n", i, slots[i]->name); } @@ -299,7 +315,7 @@ void set_TEMPLATE_flags(ir_node *node, arch_irn_flags_t flags) { * Returns the result register slots of an TEMPLATE node. */ const arch_register_t **get_TEMPLATE_slots(ir_node *node) { - TEMPLATE_attr_t *attr = get_TEMPLATE_attr_const(node); + TEMPLATE_attr_t *attr = get_TEMPLATE_attr(node); return attr->slots; } @@ -307,7 +323,7 @@ const arch_register_t **get_TEMPLATE_slots(ir_node *node) { * Returns the result register slots of an TEMPLATE node. */ const arch_register_t * const *get_TEMPLATE_slots_const(const ir_node *node) { - TEMPLATE_attr_t *attr = get_TEMPLATE_attr_const(node); + const TEMPLATE_attr_t *attr = get_TEMPLATE_attr_const(node); return attr->slots; } @@ -318,7 +334,7 @@ const char *get_TEMPLATE_out_reg_name(const ir_node *node, int pos) { const TEMPLATE_attr_t *attr = get_TEMPLATE_attr_const(node); assert(is_TEMPLATE_irn(node) && "Not an TEMPLATE node."); - assert(pos < attr->n_res && "Invalid OUT position."); + assert(pos < ARR_LEN(attr->slots) && "Invalid OUT position."); assert(attr->slots[pos] && "No register assigned"); return arch_register_get_name(attr->slots[pos]); @@ -331,7 +347,7 @@ int get_TEMPLATE_out_regnr(const ir_node *node, int pos) { const TEMPLATE_attr_t *attr = get_TEMPLATE_attr_const(node); assert(is_TEMPLATE_irn(node) && "Not an TEMPLATE node."); - assert(pos < attr->n_res && "Invalid OUT position."); + assert(pos < ARR_LEN(attr->slots) && "Invalid OUT position."); assert(attr->slots[pos] && "No register assigned"); return arch_register_get_index(attr->slots[pos]); @@ -344,26 +360,18 @@ const arch_register_t *get_TEMPLATE_out_reg(const ir_node *node, int pos) { const TEMPLATE_attr_t *attr = get_TEMPLATE_attr_const(node); assert(is_TEMPLATE_irn(node) && "Not an TEMPLATE node."); - assert(pos < attr->n_res && "Invalid OUT position."); + assert(pos < ARR_LEN(attr->slots) && "Invalid OUT position."); assert(attr->slots[pos] && "No register assigned"); return attr->slots[pos]; } -/** - * Sets the number of results. - */ -void set_TEMPLATE_n_res(ir_node *node, int n_res) { - TEMPLATE_attr_t *attr = get_TEMPLATE_attr(node); - attr->n_res = n_res; -} - /** * Returns the number of results. */ int get_TEMPLATE_n_res(const ir_node *node) { const TEMPLATE_attr_t *attr = get_TEMPLATE_attr_const(node); - return attr->n_res; + return ARR_LEN(attr->slots); } /** @@ -373,16 +381,19 @@ void init_TEMPLATE_attributes(ir_node *node, arch_irn_flags_t 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, unsigned latency) + int n_res) { + ir_graph *irg = get_irn_irg(node); + struct obstack *obst = get_irg_obstack(irg); TEMPLATE_attr_t *attr = get_TEMPLATE_attr(node); + (void) execution_units; - attr->flags = flags; + attr->flags = flags; attr->out_req = out_reqs; - attr->in_req = in_reqs; - attr->n_res = n_res; + attr->in_req = in_reqs; - memset((void *)attr->slots, 0, n_res * sizeof(attr->slots[0])); + attr->slots = NEW_ARR_D(const arch_register_t*, obst, n_res); + memset(attr->slots, 0, n_res * sizeof(attr->slots[0])); } /*************************************************************************************** @@ -395,5 +406,18 @@ void init_TEMPLATE_attributes(ir_node *node, arch_irn_flags_t flags, * ***************************************************************************************/ +static +int TEMPLATE_compare_attr(ir_node *a, ir_node *b) +{ + const TEMPLATE_attr_t *attr_a = get_TEMPLATE_attr_const(a); + const TEMPLATE_attr_t *attr_b = get_TEMPLATE_attr_const(b); + + if(attr_a->flags != attr_b->flags) + return 1; + + return 0; +} + + /* Include the generated constructor functions */ #include "gen_TEMPLATE_new_nodes.c.inl"