mirrors/gcc
0
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2024-11-28 14:24:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

resource.h (mark_resource_type): New.

Browse Source 
* resource.h (mark_resource_type): New.
	* resource.c (find_dead_or_set_registers, mark_target_live_regs,
	find_free_register): Use mark_resource_type.
	(mark_set_resources): Change include_delayed_effects
	to mark_resource_type.
	* reorg.c (steal_delay_list_from_target, try_merge_delay_insns,
	redundant_insn, fill_simple_delay_slots, fill_slots_from_thread):
	Use mark_resource_type.

From-SVN: r32771
This commit is contained in:
Stan Cox 2000-03-27 21:50:15 +00:00 committed by Stan Cox
parent 4e2d1dbdd3
commit 73780b74b3
4 changed files with 79 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gcc/ChangeLog
View File

@ -1,3 +1,14 @@
2000-03-27 Stan Cox <scox@cygnus.com>
* resource.h (mark_resource_type): New.
* resource.c (find_dead_or_set_registers, mark_target_live_regs,
find_free_register): Use mark_resource_type.
(mark_set_resources): Change include_delayed_effects
to mark_resource_type.
* reorg.c (steal_delay_list_from_target, try_merge_delay_insns,
redundant_insn, fill_simple_delay_slots, fill_slots_from_thread):
Use mark_resource_type.
2000-03-27 Richard Henderson <rth@cygnus.com> 2000-03-27 Richard Henderson <rth@cygnus.com>
* i386.md (call_pop_0, call_value_pop_0): New. * i386.md (call_pop_0, call_value_pop_0): New.

24
gcc/reorg.c
View File

@ -1246,7 +1246,7 @@ steal_delay_list_from_target (insn, condition, seq, delay_list,
{ {
rtx trial = XEXP (temp, 0); rtx trial = XEXP (temp, 0);
mark_set_resources (trial, &cc_set, 0, 1); mark_set_resources (trial, &cc_set, 0, MARK_SRC_DEST_CALL);
if (insn_references_resource_p (XVECEXP (seq , 0, 0), &cc_set, 0)) if (insn_references_resource_p (XVECEXP (seq , 0, 0), &cc_set, 0))
return delay_list; return delay_list;
} }
@ -1498,7 +1498,7 @@ try_merge_delay_insns (insn, thread)
next_to_match = XVECEXP (PATTERN (insn), 0, slot_number); next_to_match = XVECEXP (PATTERN (insn), 0, slot_number);
} }
mark_set_resources (trial, &set, 0, 1); mark_set_resources (trial, &set, 0, MARK_SRC_DEST_CALL);
mark_referenced_resources (trial, &needed, 1); mark_referenced_resources (trial, &needed, 1);
} }
@ -1513,7 +1513,7 @@ try_merge_delay_insns (insn, thread)
rtx filled_insn = XVECEXP (pat, 0, 0); rtx filled_insn = XVECEXP (pat, 0, 0);
/* Account for resources set/needed by the filled insn. */ /* Account for resources set/needed by the filled insn. */
mark_set_resources (filled_insn, &set, 0, 1); mark_set_resources (filled_insn, &set, 0, MARK_SRC_DEST_CALL);
mark_referenced_resources (filled_insn, &needed, 1); mark_referenced_resources (filled_insn, &needed, 1);
for (i = 1; i < XVECLEN (pat, 0); i++) for (i = 1; i < XVECLEN (pat, 0); i++)
@ -1552,7 +1552,7 @@ try_merge_delay_insns (insn, thread)
{ {
/* Keep track of the set/referenced resources for the delay /* Keep track of the set/referenced resources for the delay
slots of any trial insns we encounter. */ slots of any trial insns we encounter. */
mark_set_resources (dtrial, &set, 0, 1); mark_set_resources (dtrial, &set, 0, MARK_SRC_DEST_CALL);
mark_referenced_resources (dtrial, &needed, 1); mark_referenced_resources (dtrial, &needed, 1);
} }
} }
@ -1687,7 +1687,7 @@ redundant_insn (insn, target, delay_list)
CLEAR_RESOURCE (&needed); CLEAR_RESOURCE (&needed);
CLEAR_RESOURCE (&set); CLEAR_RESOURCE (&set);
mark_set_resources (insn, &set, 0, 1); mark_set_resources (insn, &set, 0, MARK_SRC_DEST_CALL);
mark_referenced_resources (insn, &needed, 1); mark_referenced_resources (insn, &needed, 1);
/* If TARGET is a SEQUENCE, get the main insn. */ /* If TARGET is a SEQUENCE, get the main insn. */
@ -2124,7 +2124,7 @@ fill_simple_delay_slots (non_jumps_p)
{ {
CLEAR_RESOURCE (&needed); CLEAR_RESOURCE (&needed);
CLEAR_RESOURCE (&set); CLEAR_RESOURCE (&set);
mark_set_resources (insn, &set, 0, 0); mark_set_resources (insn, &set, 0, MARK_SRC_DEST);
mark_referenced_resources (insn, &needed, 0); mark_referenced_resources (insn, &needed, 0);
for (trial = prev_nonnote_insn (insn); ! stop_search_p (trial, 1); for (trial = prev_nonnote_insn (insn); ! stop_search_p (trial, 1);
@ -2170,7 +2170,7 @@ fill_simple_delay_slots (non_jumps_p)
} }
} }
mark_set_resources (trial, &set, 0, 1); mark_set_resources (trial, &set, 0, MARK_SRC_DEST_CALL);
mark_referenced_resources (trial, &needed, 1); mark_referenced_resources (trial, &needed, 1);
} }
} }
@ -2218,13 +2218,13 @@ fill_simple_delay_slots (non_jumps_p)
if (GET_CODE (insn) == CALL_INSN) if (GET_CODE (insn) == CALL_INSN)
{ {
mark_set_resources (insn, &set, 0, 1); mark_set_resources (insn, &set, 0, MARK_SRC_DEST_CALL);
mark_referenced_resources (insn, &needed, 1); mark_referenced_resources (insn, &needed, 1);
maybe_never = 1; maybe_never = 1;
} }
else else
{ {
mark_set_resources (insn, &set, 0, 1); mark_set_resources (insn, &set, 0, MARK_SRC_DEST_CALL);
mark_referenced_resources (insn, &needed, 1); mark_referenced_resources (insn, &needed, 1);
if (GET_CODE (insn) == JUMP_INSN) if (GET_CODE (insn) == JUMP_INSN)
target = JUMP_LABEL (insn); target = JUMP_LABEL (insn);
@ -2303,7 +2303,7 @@ fill_simple_delay_slots (non_jumps_p)
continue; continue;
} }
mark_set_resources (trial, &set, 0, 1); mark_set_resources (trial, &set, 0, MARK_SRC_DEST_CALL);
mark_referenced_resources (trial, &needed, 1); mark_referenced_resources (trial, &needed, 1);
/* Ensure we don't put insns between the setting of cc and the /* Ensure we don't put insns between the setting of cc and the
@ -2467,7 +2467,7 @@ fill_simple_delay_slots (non_jumps_p)
} }
} }
mark_set_resources (trial, &set, 0, 1); mark_set_resources (trial, &set, 0, MARK_SRC_DEST_CALL);
mark_referenced_resources (trial, &needed, 1); mark_referenced_resources (trial, &needed, 1);
} }
@ -2719,7 +2719,7 @@ fill_slots_from_thread (insn, condition, thread, opposite_thread, likely,
/* This insn can't go into a delay slot. */ /* This insn can't go into a delay slot. */
lose = 1; lose = 1;
mark_set_resources (trial, &set, 0, 1); mark_set_resources (trial, &set, 0, MARK_SRC_DEST_CALL);
mark_referenced_resources (trial, &needed, 1); mark_referenced_resources (trial, &needed, 1);
/* Ensure we don't put insns between the setting of cc and the comparison /* Ensure we don't put insns between the setting of cc and the comparison

79
gcc/resource.c
View File

@ -444,7 +444,8 @@ find_dead_or_set_registers (target, res, jump_target, jump_count, set, needed)
underlying insn. Any registers set by the underlying insn underlying insn. Any registers set by the underlying insn
are live since the insn is being done somewhere else. */ are live since the insn is being done somewhere else. */
if (GET_RTX_CLASS (GET_CODE (XEXP (PATTERN (insn), 0))) == 'i') if (GET_RTX_CLASS (GET_CODE (XEXP (PATTERN (insn), 0))) == 'i')
mark_set_resources (XEXP (PATTERN (insn), 0), res, 0, 1); mark_set_resources (XEXP (PATTERN (insn), 0), res, 0,
MARK_SRC_DEST_CALL);
/* All other USE insns are to be ignored. */ /* All other USE insns are to be ignored. */
continue; continue;
@ -518,17 +519,18 @@ find_dead_or_set_registers (target, res, jump_target, jump_count, set, needed)
= ! INSN_FROM_TARGET_P (XVECEXP (PATTERN (insn), 0, i)); = ! INSN_FROM_TARGET_P (XVECEXP (PATTERN (insn), 0, i));
target_set = set; target_set = set;
mark_set_resources (insn, &target_set, 0, 1); mark_set_resources (insn, &target_set, 0,
MARK_SRC_DEST_CALL);
for (i = 1; i < XVECLEN (PATTERN (insn), 0); i++) for (i = 1; i < XVECLEN (PATTERN (insn), 0); i++)
INSN_FROM_TARGET_P (XVECEXP (PATTERN (insn), 0, i)) INSN_FROM_TARGET_P (XVECEXP (PATTERN (insn), 0, i))
= ! INSN_FROM_TARGET_P (XVECEXP (PATTERN (insn), 0, i)); = ! INSN_FROM_TARGET_P (XVECEXP (PATTERN (insn), 0, i));
mark_set_resources (insn, &set, 0, 1); mark_set_resources (insn, &set, 0, MARK_SRC_DEST_CALL);
} }
else else
{ {
mark_set_resources (insn, &set, 0, 1); mark_set_resources (insn, &set, 0, MARK_SRC_DEST_CALL);
target_set = set; target_set = set;
} }
@ -566,7 +568,7 @@ find_dead_or_set_registers (target, res, jump_target, jump_count, set, needed)
} }
mark_referenced_resources (insn, &needed, 1); mark_referenced_resources (insn, &needed, 1);
mark_set_resources (insn, &set, 0, 1); mark_set_resources (insn, &set, 0, MARK_SRC_DEST_CALL);
COPY_HARD_REG_SET (scratch, set.regs); COPY_HARD_REG_SET (scratch, set.regs);
AND_COMPL_HARD_REG_SET (scratch, needed.regs); AND_COMPL_HARD_REG_SET (scratch, needed.regs);
@ -578,8 +580,8 @@ find_dead_or_set_registers (target, res, jump_target, jump_count, set, needed)
/* Given X, a part of an insn, and a pointer to a `struct resource', /* Given X, a part of an insn, and a pointer to a `struct resource',
RES, indicate which resources are modified by the insn. If RES, indicate which resources are modified by the insn. If
INCLUDE_DELAYED_EFFECTS is nonzero, also mark resources potentially MARK_TYPE is MARK_SRC_DEST_CALL, also mark resources potentially
set by the called routine. set by the called routine. If MARK_TYPE is MARK_DEST, only mark SET_DESTs
If IN_DEST is nonzero, it means we are inside a SET. Otherwise, If IN_DEST is nonzero, it means we are inside a SET. Otherwise,
objects are being referenced instead of set. objects are being referenced instead of set.
@ -591,11 +593,11 @@ find_dead_or_set_registers (target, res, jump_target, jump_count, set, needed)
our computation and thus may be placed in a delay slot. */ our computation and thus may be placed in a delay slot. */
void void
mark_set_resources (x, res, in_dest, include_delayed_effects) mark_set_resources (x, res, in_dest, mark_type)
register rtx x; register rtx x;
register struct resources *res; register struct resources *res;
int in_dest; int in_dest;
int include_delayed_effects; enum mark_resource_type mark_type;
{ {
enum rtx_code code; enum rtx_code code;
int i, j; int i, j;
@ -631,7 +633,7 @@ mark_set_resources (x, res, in_dest, include_delayed_effects)
that aren't saved across calls, global registers and anything that aren't saved across calls, global registers and anything
explicitly CLOBBERed immediately after the CALL_INSN. */ explicitly CLOBBERed immediately after the CALL_INSN. */
if (include_delayed_effects) if (mark_type == MARK_SRC_DEST_CALL)
{ {
rtx next = NEXT_INSN (x); rtx next = NEXT_INSN (x);
rtx prev = PREV_INSN (x); rtx prev = PREV_INSN (x);
@ -650,7 +652,8 @@ mark_set_resources (x, res, in_dest, include_delayed_effects)
for (link = CALL_INSN_FUNCTION_USAGE (x); for (link = CALL_INSN_FUNCTION_USAGE (x);
link; link = XEXP (link, 1)) link; link = XEXP (link, 1))
if (GET_CODE (XEXP (link, 0)) == CLOBBER) if (GET_CODE (XEXP (link, 0)) == CLOBBER)
mark_set_resources (SET_DEST (XEXP (link, 0)), res, 1, 0); mark_set_resources (SET_DEST (XEXP (link, 0)), res, 1,
MARK_SRC_DEST);
/* Check for a NOTE_INSN_SETJMP. If it exists, then we must /* Check for a NOTE_INSN_SETJMP. If it exists, then we must
assume that this call can clobber any register. */ assume that this call can clobber any register. */
@ -668,7 +671,7 @@ mark_set_resources (x, res, in_dest, include_delayed_effects)
and doesn't actually do anything, so we ignore it. */ and doesn't actually do anything, so we ignore it. */
#ifdef INSN_SETS_ARE_DELAYED #ifdef INSN_SETS_ARE_DELAYED
if (! include_delayed_effects if (mark_type != MARK_SRC_DEST_CALL
&& INSN_SETS_ARE_DELAYED (x)) && INSN_SETS_ARE_DELAYED (x))
return; return;
#endif #endif
@ -684,36 +687,40 @@ mark_set_resources (x, res, in_dest, include_delayed_effects)
effects of the calling routine. */ effects of the calling routine. */
mark_set_resources (SET_DEST (x), res, mark_set_resources (SET_DEST (x), res,
(include_delayed_effects (mark_type == MARK_SRC_DEST_CALL
|| GET_CODE (SET_SRC (x)) != CALL), || GET_CODE (SET_SRC (x)) != CALL),
0); mark_type);
mark_set_resources (SET_SRC (x), res, 0, 0); if (mark_type != MARK_DEST)
mark_set_resources (SET_SRC (x), res, 0, MARK_SRC_DEST);
return; return;
case CLOBBER: case CLOBBER:
mark_set_resources (XEXP (x, 0), res, 1, 0); mark_set_resources (XEXP (x, 0), res, 1, MARK_SRC_DEST);
return; return;
case SEQUENCE: case SEQUENCE:
for (i = 0; i < XVECLEN (x, 0); i++) for (i = 0; i < XVECLEN (x, 0); i++)
if (! (INSN_ANNULLED_BRANCH_P (XVECEXP (x, 0, 0)) if (! (INSN_ANNULLED_BRANCH_P (XVECEXP (x, 0, 0))
&& INSN_FROM_TARGET_P (XVECEXP (x, 0, i)))) && INSN_FROM_TARGET_P (XVECEXP (x, 0, i))))
mark_set_resources (XVECEXP (x, 0, i), res, 0, mark_set_resources (XVECEXP (x, 0, i), res, 0, mark_type);
include_delayed_effects);
return; return;
case POST_INC: case POST_INC:
case PRE_INC: case PRE_INC:
case POST_DEC: case POST_DEC:
case PRE_DEC: case PRE_DEC:
mark_set_resources (XEXP (x, 0), res, 1, 0); mark_set_resources (XEXP (x, 0), res, 1, MARK_SRC_DEST);
return; return;
case SIGN_EXTRACT:
case ZERO_EXTRACT: case ZERO_EXTRACT:
mark_set_resources (XEXP (x, 0), res, in_dest, 0); if (! (mark_type == MARK_DEST && in_dest))
mark_set_resources (XEXP (x, 1), res, 0, 0); {
mark_set_resources (XEXP (x, 2), res, 0, 0); mark_set_resources (XEXP (x, 0), res, in_dest, MARK_SRC_DEST);
mark_set_resources (XEXP (x, 1), res, 0, MARK_SRC_DEST);
mark_set_resources (XEXP (x, 2), res, 0, MARK_SRC_DEST);
}
return; return;
case MEM: case MEM:
@ -724,15 +731,14 @@ mark_set_resources (x, res, in_dest, include_delayed_effects)
res->volatil |= MEM_VOLATILE_P (x); res->volatil |= MEM_VOLATILE_P (x);
} }
mark_set_resources (XEXP (x, 0), res, 0, 0); mark_set_resources (XEXP (x, 0), res, 0, MARK_SRC_DEST);
return; return;
case SUBREG: case SUBREG:
if (in_dest) if (in_dest)
{ {
if (GET_CODE (SUBREG_REG (x)) != REG) if (GET_CODE (SUBREG_REG (x)) != REG)
mark_set_resources (SUBREG_REG (x), res, mark_set_resources (SUBREG_REG (x), res, in_dest, mark_type);
in_dest, include_delayed_effects);
else else
{ {
unsigned int regno = REGNO (SUBREG_REG (x)) + SUBREG_WORD (x); unsigned int regno = REGNO (SUBREG_REG (x)) + SUBREG_WORD (x);
@ -751,6 +757,13 @@ mark_set_resources (x, res, in_dest, include_delayed_effects)
SET_HARD_REG_BIT (res->regs, REGNO (x) + r); SET_HARD_REG_BIT (res->regs, REGNO (x) + r);
return; return;
case STRICT_LOW_PART:
if (! (mark_type == MARK_DEST && in_dest))
{
mark_set_resources (XEXP (x, 0), res, 0, MARK_SRC_DEST);
return;
}
case UNSPEC_VOLATILE: case UNSPEC_VOLATILE:
case ASM_INPUT: case ASM_INPUT:
/* Traditional asm's are always volatile. */ /* Traditional asm's are always volatile. */
@ -770,7 +783,8 @@ mark_set_resources (x, res, in_dest, include_delayed_effects)
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_set_resources (ASM_OPERANDS_INPUT (x, i), res, in_dest, 0); mark_set_resources (ASM_OPERANDS_INPUT (x, i), res, in_dest,
MARK_SRC_DEST);
return; return;
default: default:
@ -783,13 +797,12 @@ mark_set_resources (x, res, in_dest, include_delayed_effects)
switch (*format_ptr++) switch (*format_ptr++)
{ {
case 'e': case 'e':
mark_set_resources (XEXP (x, i), res, in_dest, include_delayed_effects); mark_set_resources (XEXP (x, i), res, in_dest, mark_type);
break; break;
case 'E': case 'E':
for (j = 0; j < XVECLEN (x, i); j++) for (j = 0; j < XVECLEN (x, i); j++)
mark_set_resources (XVECEXP (x, i, j), res, in_dest, mark_set_resources (XVECEXP (x, i, j), res, in_dest, mark_type);
include_delayed_effects);
break; break;
} }
} }
@ -1098,7 +1111,7 @@ mark_target_live_regs (insns, target, res)
AND_COMPL_HARD_REG_SET (scratch, set.regs); AND_COMPL_HARD_REG_SET (scratch, set.regs);
IOR_HARD_REG_SET (new_resources.regs, scratch); IOR_HARD_REG_SET (new_resources.regs, scratch);
mark_set_resources (insn, &set, 0, 1); mark_set_resources (insn, &set, 0, MARK_SRC_DEST_CALL);
} }
IOR_HARD_REG_SET (res->regs, new_resources.regs); IOR_HARD_REG_SET (res->regs, new_resources.regs);
@ -1178,7 +1191,8 @@ init_resource_info (epilogue_insn)
start_of_epilogue_needs = end_of_function_needs; start_of_epilogue_needs = end_of_function_needs;
while ((epilogue_insn = next_nonnote_insn (epilogue_insn))) while ((epilogue_insn = next_nonnote_insn (epilogue_insn)))
mark_set_resources (epilogue_insn, &end_of_function_needs, 0, 1); mark_set_resources (epilogue_insn, &end_of_function_needs, 0,
MARK_SRC_DEST_CALL);
/* Allocate and initialize the tables used by mark_target_live_regs. */ /* Allocate and initialize the tables used by mark_target_live_regs. */
target_hash_table = (struct target_info **) target_hash_table = (struct target_info **)
@ -1277,7 +1291,8 @@ find_free_register (current_insn, last_insn, class_str, mode, reg_set)
while (current_insn != last_insn) while (current_insn != last_insn)
{ {
/* Exclude anything set in this insn. */ /* Exclude anything set in this insn. */
mark_set_resources (PATTERN (current_insn), &used, 0, 1); mark_set_resources (PATTERN (current_insn), &used, 0,
MARK_SRC_DEST_CALL);
current_insn = next_nonnote_insn (current_insn); current_insn = next_nonnote_insn (current_insn);
} }

10
gcc/resource.h
View File

@ -33,9 +33,17 @@ struct resources
HARD_REG_SET regs; /* Which registers are set or needed. */ HARD_REG_SET regs; /* Which registers are set or needed. */
}; };
/* The kinds of rtl mark_*_resources will consider */
enum mark_resource_type
{
MARK_SRC_DEST = 0,
MARK_SRC_DEST_CALL = 1,
MARK_DEST = 2
};
extern void mark_target_live_regs PARAMS ((rtx, rtx, struct resources *)); extern void mark_target_live_regs PARAMS ((rtx, rtx, struct resources *));
extern void mark_set_resources PARAMS ((rtx, struct resources *, int, extern void mark_set_resources PARAMS ((rtx, struct resources *, int,
int)); enum mark_resource_type));
extern void mark_referenced_resources PARAMS ((rtx, struct resources *, int)); extern void mark_referenced_resources PARAMS ((rtx, struct resources *, int));
extern void clear_hashed_info_for_insn PARAMS ((rtx)); extern void clear_hashed_info_for_insn PARAMS ((rtx));
extern void incr_ticks_for_insn PARAMS ((rtx)); extern void incr_ticks_for_insn PARAMS ((rtx));