X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fia32%2Fia32_address_mode.c;h=b824d4ca65279d65e5a5dcd12406480ccefa8d56;hb=2d4cb2720430d39651ddb33d9b342f69bd757a75;hp=7ea5b4405538ab58a31d603c085d480589a0140c;hpb=05ebe1892ab5c5a5621864680a6c60599fe907cf;p=libfirm diff --git a/ir/be/ia32/ia32_address_mode.c b/ir/be/ia32/ia32_address_mode.c index 7ea5b4405..b824d4ca6 100644 --- a/ir/be/ia32/ia32_address_mode.c +++ b/ir/be/ia32/ia32_address_mode.c @@ -1,20 +1,6 @@ /* - * Copyright (C) 1995-2010 University of Karlsruhe. All right reserved. - * * This file is part of libFirm. - * - * This file may be distributed and/or modified under the terms of the - * GNU General Public License version 2 as published by the Free Software - * Foundation and appearing in the file LICENSE.GPL included in the - * packaging of this file. - * - * Licensees holding valid libFirm Professional Edition licenses may use - * this file in accordance with the libFirm Commercial License. - * Agreement provided with the Software. - * - * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE - * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE. + * Copyright (C) 2012 University of Karlsruhe. */ /** @@ -22,7 +8,6 @@ * @brief This file contains functions for matching firm graphs for * nodes that can be used as address mode for x86 instructions * @author Matthias Braun - * @version $Id$ */ #include "config.h" @@ -36,8 +21,8 @@ #include "iredges_t.h" #include "irgwalk.h" -#include "../benode.h" -#include "../belive.h" +#include "benode.h" +#include "belive.h" #define AGGRESSIVE_AM @@ -55,7 +40,7 @@ static bitset_t *non_address_mode_nodes; * * @return non-zero if the DAG represents an immediate, 0 else */ -static int do_is_immediate(const ir_node *node, int *symconsts, int negate) +static bool do_is_immediate(const ir_node *node, int *symconsts, bool negate) { ir_node *left; ir_node *right; @@ -67,46 +52,45 @@ static int do_is_immediate(const ir_node *node, int *symconsts, int negate) #ifdef DEBUG_libfirm ir_fprintf(stderr, "Optimisation warning tarval of %+F(%+F) is not a long.\n", - node, current_ir_graph); + node, get_irn_irg(node)); #endif - return 0; + return false; } - return 1; + return true; case iro_SymConst: /* the first SymConst of a DAG can be fold into an immediate */ #ifndef SUPPORT_NEGATIVE_SYMCONSTS /* unfortunately the assembler/linker doesn't support -symconst */ if (negate) - return 0; + return false; #endif - if (get_SymConst_kind(node) != symconst_addr_ent) - return 0; + return false; if (++*symconsts > 1) - return 0; + return false; - return 1; + return true; case iro_Unknown: /* we can use '0' for Unknowns */ - return 1; + return true; case iro_Add: case iro_Sub: /* Add's and Sub's are typically supported as long as both operands are * immediates */ if (ia32_is_non_address_mode_node(node)) - return 0; + return false; left = get_binop_left(node); if (!do_is_immediate(left, symconsts, negate)) - return 0; + return false; right = get_binop_right(node); if (!do_is_immediate(right, symconsts, is_Sub(node) ? !negate : negate)) - return 0; + return false; - return 1; + return true; default: /* all other nodes are NO immediates */ - return 0; + return false; } } @@ -118,7 +102,7 @@ static int do_is_immediate(const ir_node *node, int *symconsts, int negate) * @param node the node * @param negate if set, the immediate must be negated */ -static int is_immediate(ia32_address_t *addr, const ir_node *node, int negate) +static int is_immediate(ia32_address_t *addr, const ir_node *node, bool negate) { int symconsts = (addr->symconst_ent != NULL); return do_is_immediate(node, &symconsts, negate); @@ -131,7 +115,7 @@ static int is_immediate(ia32_address_t *addr, const ir_node *node, int negate) * @param node the node * @param negate if set, the immediate must be negated */ -static void eat_immediate(ia32_address_t *addr, ir_node *node, int negate) +static void eat_immediate(ia32_address_t *addr, ir_node *node, bool negate) { ir_tarval *tv; ir_node *left; @@ -155,6 +139,8 @@ static void eat_immediate(ia32_address_t *addr, ir_node *node, int negate) panic("Internal error: more than 1 symconst in address calculation"); } addr->symconst_ent = get_SymConst_entity(node); + if (get_entity_owner(addr->symconst_ent) == get_tls_type()) + addr->tls_segment = true; #ifndef SUPPORT_NEGATIVE_SYMCONSTS assert(!negate); #endif @@ -417,12 +403,12 @@ int ia32_is_non_address_mode_node(ir_node const *node) } /** - * Check if a given value is last used (i.e. die after) the block of some other node. + * Check if a given value is last used (i.e. die after) the block of some + * other node. */ static int value_last_used_here(be_lv_t *lv, ir_node *here, ir_node *value) { - ir_node *block = get_nodes_block(here); - const ir_edge_t *edge; + ir_node *block = get_nodes_block(here); /* If the value is live end it is for sure it does not die here */ if (be_is_live_end(lv, block, value)) return 0; @@ -440,6 +426,12 @@ static int value_last_used_here(be_lv_t *lv, ir_node *here, ir_node *value) return 1; } +static bool simple_is_immediate(const ir_node *node) +{ + int symconsts = 0; + return do_is_immediate(node, &symconsts, false); +} + /** * Walker: mark those nodes that cannot be part of an address mode because * their value must be accessed through a register @@ -485,12 +477,17 @@ static void mark_non_address_nodes(ir_node *node, void *env) left = get_binop_left(node); right = get_binop_right(node); - /* Fold AM if any of the two operands does not die here. This duplicates + /* if any of the operands is an immediate then this will not + * increase register pressure */ + if (simple_is_immediate(left) || simple_is_immediate(right)) + return; + + /* Fold AM if any of the two operands does not die here. This duplicates * an addition and has the same register pressure for the case that only * one operand dies, but is faster (on Pentium 4). * && instead of || only folds AM if both operands do not die here */ if (!value_last_used_here(lv, node, left) || - !value_last_used_here(lv, node, right)) { + !value_last_used_here(lv, node, right)) { return; } @@ -513,7 +510,10 @@ static void mark_non_address_nodes(ir_node *node, void *env) void ia32_calculate_non_address_mode_nodes(ir_graph *irg) { - be_lv_t *lv = be_assure_liveness(irg); + be_lv_t *lv; + + be_assure_live_chk(irg); + lv = be_get_irg_liveness(irg); non_address_mode_nodes = bitset_malloc(get_irg_last_idx(irg));