X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Farm%2Farm_new_nodes.c;h=5b2a3e1cfc679500bd3283f0854321e043b1039f;hb=644c7ca46f7d4b85ba28c6e59f31068f3e323216;hp=f7e0aec1f03dfdd15f047ec7782804459a8eb611;hpb=e59e094b609ef8ce89319205d4e9c01d131b5cf7;p=libfirm diff --git a/ir/be/arm/arm_new_nodes.c b/ir/be/arm/arm_new_nodes.c index f7e0aec1f..5b2a3e1cf 100644 --- a/ir/be/arm/arm_new_nodes.c +++ b/ir/be/arm/arm_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. * @@ -25,9 +25,7 @@ * @author Oliver Richter, Tobias Gneist * @version $Id$ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include @@ -47,7 +45,7 @@ #include "arm_nodes_attr.h" #include "arm_new_nodes.h" -#include "gen_arm_regalloc_if_t.h" +#include "arm_optimize.h" #include "../beabi.h" #include "bearch_arm_t.h" @@ -56,10 +54,27 @@ * 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" }; + 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) { + static const char *fpa_imm[] = { + "0", + "1", + "2", + "3", + "4", + "5", + "10", + "0.5" + }; + return fpa_imm[imm_value]; +} + /*********************************************************************************** * _ _ _ __ * | | (_) | | / _| @@ -101,11 +116,27 @@ static void dump_reg_req(FILE *F, const ir_node *node, } if (reqs[i]->type & arch_register_req_type_should_be_same) { - ir_fprintf(F, " same as %+F", get_irn_n(node, 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(node, i)); + } + } } - if (reqs[i]->type & arch_register_req_type_should_be_different) { - ir_fprintf(F, " different from %+F", get_irn_n(node, 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(node, i)); + } + } } fprintf(F, "\n"); @@ -152,11 +183,11 @@ static int arm_dump_node(ir_node *n, FILE *F, dump_reason_t reason) { 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), get_tarval_long(attr->value)); + 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->value)); + fprintf(F, "[#0x%X]", arm_decode_imm_w_shift(attr->imm_value)); } break; @@ -204,29 +235,21 @@ static int arm_dump_node(ir_node *n, FILE *F, dump_reason_t reason) { if (attr->flags & arch_irn_flags_rematerializable) { fprintf(F, " remat"); } - if (attr->flags & arch_irn_flags_ignore) { - fprintf(F, " ignore"); - } } fprintf(F, " (%d)\n", attr->flags); - if (get_arm_value(n)) { - if (is_arm_CopyB(n)) { - fprintf(F, "size = %lu\n", get_tarval_long(get_arm_value(n))); + if (is_arm_CopyB(n)) { + fprintf(F, "size = %lu\n", get_arm_imm_value(n)); + } else { + 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 { - if (mode_is_float(get_irn_mode(n))) { - fprintf(F, "float value = (%f)\n", (double) get_tarval_double(get_arm_value(n))); - } else if (mode_is_int(get_irn_mode(n))) { - long v = get_tarval_long(get_arm_value(n)); - fprintf(F, "long value = %ld (0x%08lx)\n", v, v); - } else if (mode_is_reference(get_irn_mode(n))) { - fprintf(F, "pointer\n"); - } else { - assert(0 && "unbehandelter Typ im const-Knoten"); - } + fprintf(F, "immediate value = %ld (0x%08lx)\n", v, v); } } - if (is_arm_CondJmp(n) && get_arm_CondJmp_proj_num(n) >= 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 */ @@ -275,6 +298,28 @@ const arm_SymConst_attr_t *get_arm_SymConst_attr_const(const ir_node *node) { return get_irn_generic_attr_const(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) { + 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; +} + +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); +} + /* Returns the attributes of a CondJmp node. */ arm_CondJmp_attr_t *get_arm_CondJmp_attr(ir_node *node) { assert(is_arm_CondJmp(node)); @@ -441,20 +486,37 @@ int get_arm_n_res(const ir_node *node) { const arm_attr_t *attr = get_arm_attr_const(node); return ARR_LEN(attr->slots); } + /** - * Returns the tarvalue + * Returns the immediate value */ -tarval *get_arm_value(const ir_node *node) { +long get_arm_imm_value(const ir_node *node) { const arm_attr_t *attr = get_arm_attr_const(node); - return attr->value; + return attr->imm_value; } /** - * Sets the tarvalue + * Sets the tarval value */ -void set_arm_value(ir_node *node, tarval *tv) { +void set_arm_imm_value(ir_node *node, long imm_value) { arm_attr_t *attr = get_arm_attr(node); - attr->value = tv; + attr->imm_value = imm_value; +} + +/** + * Returns the fpaConst value + */ +tarval *get_fpaConst_value(const ir_node *node) { + const arm_fpaConst_attr_t *attr = get_arm_fpaConst_attr_const(node); + return attr->tv; +} + +/** + * Sets the tarval value + */ +void set_fpaConst_value(ir_node *node, tarval *tv) { + arm_fpaConst_attr_t *attr = get_arm_fpaConst_attr(node); + attr->tv = tv; } /** @@ -530,22 +592,21 @@ arm_shift_modifier get_arm_shift_modifier(const ir_node *node) { } /* Set the ARM machine node attributes to default values. */ -void init_arm_attributes(ir_node *node, int flags, +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, unsigned latency) { + 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); (void) execution_units; - (void) latency; attr->in_req = in_reqs; attr->out_req = out_reqs; attr->flags = flags; attr->instr_fl = (ARM_COND_AL << 3) | ARM_SHF_NONE; - attr->value = NULL; + attr->imm_value = 0; attr->out_flags = NEW_ARR_D(int, obst, n_res); memset(attr->out_flags, 0, n_res * sizeof(attr->out_flags[0])); @@ -602,16 +663,22 @@ void arm_set_optimizers(void) { */ } -static int cmp_attr_arm_SymConst(ir_node *a, ir_node *b) { - const arm_SymConst_attr_t *attr_a = get_irn_generic_attr_const(a); - const arm_SymConst_attr_t *attr_b = get_irn_generic_attr_const(b); - return attr_a->symconst_id != attr_b->symconst_id; -} - 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->value != attr_b->value); + return (attr_a->instr_fl != attr_b->instr_fl) || (attr_a->imm_value != attr_b->imm_value); +} + +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; + + 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->symconst_id != attr_b->symconst_id; } static int cmp_attr_arm_CondJmp(ir_node *a, ir_node *b) { @@ -628,6 +695,19 @@ static int cmp_attr_arm_SwitchJmp(ir_node *a, ir_node *b) { return 1; } +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; + + if (cmp_attr_arm(a, b)) + return 1; + + attr_a = get_arm_fpaConst_attr_const(a); + attr_b = get_arm_fpaConst_attr_const(b); + + return attr_a->tv != attr_b->tv; +} + /** copies the ARM attributes of a node. */ static void arm_copy_attr(const ir_node *old_node, ir_node *new_node) { ir_graph *irg = get_irn_irg(new_node);