Skip to content

R
riscv-gcc-1
Commit 675f99c9 by Ian Lance Taylor Committed by Ian Lance Taylor
Options

resource.c (mark_referenced_resources): Change include_delayed_effects parameter to bool. 

	* resource.c (mark_referenced_resources): Change
	include_delayed_effects parameter to bool.  Change all callers.
	(mark_end_of_function_resources): Likewise.
	* reorg.c (insn_references_resource_p): Likewise.
	(insn_sets_resource_p): Likewise.
	* resource.h (mark_referenced_resources): Update declaration.
	(mark_end_of_function_resources): Update declaration.

From-SVN: r148547
parent a322799d
Showing with 32 additions and 21 deletions
gcc/ChangeLog
2009-06-16 Ian Lance Taylor <iant@google.com>
* resource.c (mark_referenced_resources): Change
include_delayed_effects parameter to bool. Change all callers.
(mark_end_of_function_resources): Likewise.
* reorg.c (insn_references_resource_p): Likewise.
(insn_sets_resource_p): Likewise.
* resource.h (mark_referenced_resources): Update declaration.
(mark_end_of_function_resources): Update declaration.
2009-06-16 David Edelsohn <edelsohn@gnu.org> 2009-06-16 David Edelsohn <edelsohn@gnu.org>
* config/rs6000/aix.h (LIBSTDCXX_STATIC): Remove -lstdc++. * config/rs6000/aix.h (LIBSTDCXX_STATIC): Remove -lstdc++.
......
gcc/resource.c
/* Definitions for computing resource usage of specific insns. /* Definitions for computing resource usage of specific insns.
Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
Free Software Foundation, Inc. 2009 Free Software Foundation, Inc.
This file is part of GCC. This file is part of GCC.
...@@ -203,7 +203,7 @@ next_insn_no_annul (rtx insn) ...@@ -203,7 +203,7 @@ next_insn_no_annul (rtx insn)
void void
mark_referenced_resources (rtx x, struct resources *res, mark_referenced_resources (rtx x, struct resources *res,
int include_delayed_effects) bool include_delayed_effects)
{ {
enum rtx_code code = GET_CODE (x); enum rtx_code code = GET_CODE (x);
int i, j; int i, j;
...@@ -226,7 +226,7 @@ mark_referenced_resources (rtx x, struct resources *res, ...@@ -226,7 +226,7 @@ mark_referenced_resources (rtx x, struct resources *res,
case SUBREG: case SUBREG:
if (!REG_P (SUBREG_REG (x))) if (!REG_P (SUBREG_REG (x)))
mark_referenced_resources (SUBREG_REG (x), res, 0); mark_referenced_resources (SUBREG_REG (x), res, false);
else else
{ {
unsigned int regno = subreg_regno (x); unsigned int regno = subreg_regno (x);
...@@ -253,7 +253,7 @@ mark_referenced_resources (rtx x, struct resources *res, ...@@ -253,7 +253,7 @@ mark_referenced_resources (rtx x, struct resources *res,
res->volatil |= MEM_VOLATILE_P (x); res->volatil |= MEM_VOLATILE_P (x);
/* Mark registers used to access memory. */ /* Mark registers used to access memory. */
mark_referenced_resources (XEXP (x, 0), res, 0); mark_referenced_resources (XEXP (x, 0), res, false);
return; return;
case CC0: case CC0:
...@@ -276,14 +276,14 @@ mark_referenced_resources (rtx x, struct resources *res, ...@@ -276,14 +276,14 @@ mark_referenced_resources (rtx x, struct resources *res,
traditional asms unlike their normal usage. */ traditional asms unlike their normal usage. */
for (i = 0; i < ASM_OPERANDS_INPUT_LENGTH (x); i++) 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; return;
case CALL: case CALL:
/* The first operand will be a (MEM (xxx)) but doesn't really reference /* The first operand will be a (MEM (xxx)) but doesn't really reference
memory. The second operand may be referenced, though. */ memory. The second operand may be referenced, though. */
mark_referenced_resources (XEXP (XEXP (x, 0), 0), res, 0); mark_referenced_resources (XEXP (XEXP (x, 0), 0), res, false);
mark_referenced_resources (XEXP (x, 1), res, 0); mark_referenced_resources (XEXP (x, 1), res, false);
return; return;
case SET: case SET:
...@@ -291,16 +291,16 @@ mark_referenced_resources (rtx x, struct resources *res, ...@@ -291,16 +291,16 @@ mark_referenced_resources (rtx x, struct resources *res,
registers used to access memory are referenced. SET_DEST is registers used to access memory are referenced. SET_DEST is
also referenced if it is a ZERO_EXTRACT. */ 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); x = SET_DEST (x);
if (GET_CODE (x) == ZERO_EXTRACT if (GET_CODE (x) == ZERO_EXTRACT
|| GET_CODE (x) == STRICT_LOW_PART) || GET_CODE (x) == STRICT_LOW_PART)
mark_referenced_resources (x, res, 0); mark_referenced_resources (x, res, false);
else if (GET_CODE (x) == SUBREG) else if (GET_CODE (x) == SUBREG)
x = SUBREG_REG (x); x = SUBREG_REG (x);
if (MEM_P (x)) if (MEM_P (x))
mark_referenced_resources (XEXP (x, 0), res, 0); mark_referenced_resources (XEXP (x, 0), res, false);
return; return;
case CLOBBER: case CLOBBER:
...@@ -372,7 +372,7 @@ mark_referenced_resources (rtx x, struct resources *res, ...@@ -372,7 +372,7 @@ mark_referenced_resources (rtx x, struct resources *res,
} }
if (i >= seq_size) if (i >= seq_size)
mark_referenced_resources (XEXP (XEXP (link, 0), 0), mark_referenced_resources (XEXP (XEXP (link, 0), 0),
res, 0); res, false);
} }
} }
} }
...@@ -519,7 +519,7 @@ find_dead_or_set_registers (rtx target, struct resources *res, ...@@ -519,7 +519,7 @@ find_dead_or_set_registers (rtx target, struct resources *res,
if (jump_count >= 10) if (jump_count >= 10)
break; break;
mark_referenced_resources (insn, &needed, 1); mark_referenced_resources (insn, &needed, true);
/* For an annulled branch, mark_set_resources ignores slots /* For an annulled branch, mark_set_resources ignores slots
filled by instructions from the target. This is correct filled by instructions from the target. This is correct
...@@ -585,7 +585,7 @@ find_dead_or_set_registers (rtx target, struct resources *res, ...@@ -585,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); mark_set_resources (insn, &set, 0, MARK_SRC_DEST_CALL);
COPY_HARD_REG_SET (scratch, set.regs); COPY_HARD_REG_SET (scratch, set.regs);
...@@ -888,7 +888,7 @@ mark_target_live_regs (rtx insns, rtx target, struct resources *res) ...@@ -888,7 +888,7 @@ mark_target_live_regs (rtx insns, rtx target, struct resources *res)
else if (return_insn_p (target)) else if (return_insn_p (target))
{ {
*res = end_of_function_needs; *res = end_of_function_needs;
mark_referenced_resources (target, res, 0); mark_referenced_resources (target, res, false);
return; return;
} }
...@@ -1101,7 +1101,7 @@ mark_target_live_regs (rtx insns, rtx target, struct resources *res) ...@@ -1101,7 +1101,7 @@ mark_target_live_regs (rtx insns, rtx target, struct resources *res)
/* Include JUMP_INSN in the needed registers. */ /* Include JUMP_INSN in the needed registers. */
for (insn = target; insn != stop_insn; insn = next_active_insn (insn)) 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); COPY_HARD_REG_SET (scratch, needed.regs);
AND_COMPL_HARD_REG_SET (scratch, set.regs); AND_COMPL_HARD_REG_SET (scratch, set.regs);
...@@ -1155,7 +1155,7 @@ init_resource_info (rtx epilogue_insn) ...@@ -1155,7 +1155,7 @@ init_resource_info (rtx epilogue_insn)
if (crtl->return_rtx != 0) if (crtl->return_rtx != 0)
mark_referenced_resources (crtl->return_rtx, mark_referenced_resources (crtl->return_rtx,
&end_of_function_needs, 1); &end_of_function_needs, true);
for (i = 0; i < FIRST_PSEUDO_REGISTER; i++) for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
if (global_regs[i] if (global_regs[i]
...@@ -1274,7 +1274,7 @@ incr_ticks_for_insn (rtx insn) ...@@ -1274,7 +1274,7 @@ incr_ticks_for_insn (rtx insn)
/* Add TRIAL to the set of resources used at the end of the current /* Add TRIAL to the set of resources used at the end of the current
function. */ function. */
void 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, mark_referenced_resources (trial, &end_of_function_needs,
include_delayed_effects); include_delayed_effects);
......
gcc/resource.h
/* Definitions for computing resource usage of specific insns. /* Definitions for computing resource usage of specific insns.
Copyright (C) 1999, 2003, 2004, 2006, 2007 Free Software Foundation, Inc. Copyright (C) 1999, 2003, 2004, 2006, 2007, 2009
Free Software Foundation, Inc.
This file is part of GCC. This file is part of GCC.
...@@ -48,10 +49,10 @@ enum mark_resource_type ...@@ -48,10 +49,10 @@ enum mark_resource_type
extern void mark_target_live_regs (rtx, rtx, struct resources *); extern void mark_target_live_regs (rtx, rtx, struct resources *);
extern void mark_set_resources (rtx, struct resources *, int, extern void mark_set_resources (rtx, struct resources *, int,
enum mark_resource_type); enum mark_resource_type);
extern void mark_referenced_resources (rtx, struct resources *, int); extern void mark_referenced_resources (rtx, struct resources *, bool);
extern void clear_hashed_info_for_insn (rtx); extern void clear_hashed_info_for_insn (rtx);
extern void incr_ticks_for_insn (rtx); extern void incr_ticks_for_insn (rtx);
extern void mark_end_of_function_resources (rtx, int); extern void mark_end_of_function_resources (rtx, bool);
extern void init_resource_info (rtx); extern void init_resource_info (rtx);
extern void free_resource_info (void); extern void free_resource_info (void);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment