X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fresource.c;h=846f8ef2b41d710b28c4317157d11c6c69b997c0;hb=8dc2823a2f3ba69e89bcb0189f9e2f95021f0cb6;hp=d7e3339aa9079cec9007314019679fee076168fd;hpb=84131f229856df6bd0a7a067d2a985c48a904f2d;p=pf3gnuchains%2Fgcc-fork.git diff --git a/gcc/resource.c b/gcc/resource.c index d7e3339aa90..846f8ef2b41 100644 --- a/gcc/resource.c +++ b/gcc/resource.c @@ -1,6 +1,6 @@ /* Definitions for computing resource usage of specific insns. - Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 - Free Software Foundation, Inc. + Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, + 2009 Free Software Foundation, Inc. This file is part of GCC. @@ -135,8 +135,6 @@ update_live_status (rtx dest, const_rtx x, void *data ATTRIBUTE_UNUSED) static int find_basic_block (rtx insn, int search_limit) { - basic_block bb; - /* Scan backwards to the previous BARRIER. Then see if we can find a label that starts a basic block. Return the basic block number. */ for (insn = prev_nonnote_insn (insn); @@ -157,11 +155,8 @@ find_basic_block (rtx insn, int search_limit) for (insn = next_nonnote_insn (insn); insn && LABEL_P (insn); insn = next_nonnote_insn (insn)) - { - FOR_EACH_BB (bb) - if (insn == BB_HEAD (bb)) - return bb->index; - } + if (BLOCK_FOR_INSN (insn)) + return BLOCK_FOR_INSN (insn)->index; return -1; } @@ -208,7 +203,7 @@ next_insn_no_annul (rtx insn) void mark_referenced_resources (rtx x, struct resources *res, - int include_delayed_effects) + bool include_delayed_effects) { enum rtx_code code = GET_CODE (x); int i, j; @@ -231,7 +226,7 @@ mark_referenced_resources (rtx x, struct resources *res, case SUBREG: if (!REG_P (SUBREG_REG (x))) - mark_referenced_resources (SUBREG_REG (x), res, 0); + mark_referenced_resources (SUBREG_REG (x), res, false); else { unsigned int regno = subreg_regno (x); @@ -258,7 +253,7 @@ mark_referenced_resources (rtx x, struct resources *res, res->volatil |= MEM_VOLATILE_P (x); /* Mark registers used to access memory. */ - mark_referenced_resources (XEXP (x, 0), res, 0); + mark_referenced_resources (XEXP (x, 0), res, false); return; case CC0: @@ -266,13 +261,10 @@ mark_referenced_resources (rtx x, struct resources *res, return; case UNSPEC_VOLATILE: + case TRAP_IF: case ASM_INPUT: /* Traditional asm's are always volatile. */ res->volatil = 1; - return; - - case TRAP_IF: - res->volatil = 1; break; case ASM_OPERANDS: @@ -284,14 +276,14 @@ mark_referenced_resources (rtx x, struct resources *res, traditional asms unlike their normal usage. */ for (i = 0; i < ASM_OPERANDS_INPUT_LENGTH (x); i++) - mark_referenced_resources (ASM_OPERANDS_INPUT (x, i), res, 0); + mark_referenced_resources (ASM_OPERANDS_INPUT (x, i), res, false); return; case CALL: /* The first operand will be a (MEM (xxx)) but doesn't really reference memory. The second operand may be referenced, though. */ - mark_referenced_resources (XEXP (XEXP (x, 0), 0), res, 0); - mark_referenced_resources (XEXP (x, 1), res, 0); + mark_referenced_resources (XEXP (XEXP (x, 0), 0), res, false); + mark_referenced_resources (XEXP (x, 1), res, false); return; case SET: @@ -299,16 +291,16 @@ mark_referenced_resources (rtx x, struct resources *res, registers used to access memory are referenced. SET_DEST is also referenced if it is a ZERO_EXTRACT. */ - mark_referenced_resources (SET_SRC (x), res, 0); + mark_referenced_resources (SET_SRC (x), res, false); x = SET_DEST (x); if (GET_CODE (x) == ZERO_EXTRACT || GET_CODE (x) == STRICT_LOW_PART) - mark_referenced_resources (x, res, 0); + mark_referenced_resources (x, res, false); else if (GET_CODE (x) == SUBREG) x = SUBREG_REG (x); if (MEM_P (x)) - mark_referenced_resources (XEXP (x, 0), res, 0); + mark_referenced_resources (XEXP (x, 0), res, false); return; case CLOBBER: @@ -380,7 +372,7 @@ mark_referenced_resources (rtx x, struct resources *res, } if (i >= seq_size) mark_referenced_resources (XEXP (XEXP (link, 0), 0), - res, 0); + res, false); } } } @@ -527,7 +519,7 @@ find_dead_or_set_registers (rtx target, struct resources *res, if (jump_count >= 10) break; - mark_referenced_resources (insn, &needed, 1); + mark_referenced_resources (insn, &needed, true); /* For an annulled branch, mark_set_resources ignores slots filled by instructions from the target. This is correct @@ -593,7 +585,7 @@ find_dead_or_set_registers (rtx target, struct resources *res, } } - mark_referenced_resources (insn, &needed, 1); + mark_referenced_resources (insn, &needed, true); mark_set_resources (insn, &set, 0, MARK_SRC_DEST_CALL); COPY_HARD_REG_SET (scratch, set.regs); @@ -851,13 +843,12 @@ return_insn_p (const_rtx insn) (with no intervening active insns) to see if any of them start a basic block. If we hit the start of the function first, we use block 0. - Once we have found a basic block and a corresponding first insns, we can - accurately compute the live status from basic_block_live_regs and - reg_renumber. (By starting at a label following a BARRIER, we are immune - to actions taken by reload and jump.) Then we scan all insns between - that point and our target. For each CLOBBER (or for call-clobbered regs - when we pass a CALL_INSN), mark the appropriate registers are dead. For - a SET, mark them as live. + Once we have found a basic block and a corresponding first insn, we can + accurately compute the live status (by starting at a label following a + BARRIER, we are immune to actions taken by reload and jump.) Then we + scan all insns between that point and our target. For each CLOBBER (or + for call-clobbered regs when we pass a CALL_INSN), mark the appropriate + registers are dead. For a SET, mark them as live. We have to be careful when using REG_DEAD notes because they are not updated by such things as find_equiv_reg. So keep track of registers @@ -897,7 +888,7 @@ mark_target_live_regs (rtx insns, rtx target, struct resources *res) else if (return_insn_p (target)) { *res = end_of_function_needs; - mark_referenced_resources (target, res, 0); + mark_referenced_resources (target, res, false); return; } @@ -957,13 +948,10 @@ mark_target_live_regs (rtx insns, rtx target, struct resources *res) TARGET. Otherwise, we must assume everything is live. */ if (b != -1) { - regset regs_live = DF_LR_IN (BASIC_BLOCK (b)); + regset regs_live = df_get_live_in (BASIC_BLOCK (b)); rtx start_insn, stop_insn; - /* Compute hard regs live at start of block -- this is the real hard regs - marked live, plus live pseudo regs that have been renumbered to - hard regs. */ - + /* Compute hard regs live at start of block. */ REG_SET_TO_HARD_REG_SET (current_live_regs, regs_live); /* Get starting and ending insn, handling the case where each might @@ -1049,10 +1037,24 @@ mark_target_live_regs (rtx insns, rtx target, struct resources *res) else if (LABEL_P (real_insn)) { + basic_block bb; + /* A label clobbers the pending dead registers since neither reload nor jump will propagate a value across a label. */ AND_COMPL_HARD_REG_SET (current_live_regs, pending_dead_regs); CLEAR_HARD_REG_SET (pending_dead_regs); + + /* We must conservatively assume that all registers that used + to be live here still are. The fallthrough edge may have + left a live register uninitialized. */ + bb = BLOCK_FOR_INSN (real_insn); + if (bb) + { + HARD_REG_SET extra_live; + + REG_SET_TO_HARD_REG_SET (extra_live, df_get_live_in (bb)); + IOR_HARD_REG_SET (current_live_regs, extra_live); + } } /* The beginning of the epilogue corresponds to the end of the @@ -1099,7 +1101,7 @@ mark_target_live_regs (rtx insns, rtx target, struct resources *res) /* Include JUMP_INSN in the needed registers. */ for (insn = target; insn != stop_insn; insn = next_active_insn (insn)) { - mark_referenced_resources (insn, &needed, 1); + mark_referenced_resources (insn, &needed, true); COPY_HARD_REG_SET (scratch, needed.regs); AND_COMPL_HARD_REG_SET (scratch, set.regs); @@ -1124,6 +1126,7 @@ void init_resource_info (rtx epilogue_insn) { int i; + basic_block bb; /* Indicate what resources are required to be valid at the end of the current function. The condition code never is and memory always is. If the @@ -1150,9 +1153,9 @@ init_resource_info (rtx epilogue_insn) else SET_HARD_REG_BIT (end_of_function_needs.regs, STACK_POINTER_REGNUM); - if (current_function_return_rtx != 0) - mark_referenced_resources (current_function_return_rtx, - &end_of_function_needs, 1); + if (crtl->return_rtx != 0) + mark_referenced_resources (crtl->return_rtx, + &end_of_function_needs, true); for (i = 0; i < FIRST_PSEUDO_REGISTER; i++) if (global_regs[i] @@ -1192,6 +1195,11 @@ init_resource_info (rtx epilogue_insn) /* Allocate and initialize the tables used by mark_target_live_regs. */ target_hash_table = XCNEWVEC (struct target_info *, TARGET_HASH_PRIME); bb_ticks = XCNEWVEC (int, last_basic_block); + + /* Set the BLOCK_FOR_INSN of each label that starts a basic block. */ + FOR_EACH_BB (bb) + if (LABEL_P (BB_HEAD (bb))) + BLOCK_FOR_INSN (BB_HEAD (bb)) = bb; } /* Free up the resources allocated to mark_target_live_regs (). This @@ -1200,6 +1208,8 @@ init_resource_info (rtx epilogue_insn) void free_resource_info (void) { + basic_block bb; + if (target_hash_table != NULL) { int i; @@ -1225,6 +1235,10 @@ free_resource_info (void) free (bb_ticks); bb_ticks = NULL; } + + FOR_EACH_BB (bb) + if (LABEL_P (BB_HEAD (bb))) + BLOCK_FOR_INSN (BB_HEAD (bb)) = NULL; } /* Clear any hashed information that we have stored for INSN. */ @@ -1260,7 +1274,7 @@ incr_ticks_for_insn (rtx insn) /* Add TRIAL to the set of resources used at the end of the current function. */ void -mark_end_of_function_resources (rtx trial, int include_delayed_effects) +mark_end_of_function_resources (rtx trial, bool include_delayed_effects) { mark_referenced_resources (trial, &end_of_function_needs, include_delayed_effects);