git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

system.h (IFCVT_EXTRA_FIELDS): Poison. 

* system.h (IFCVT_EXTRA_FIELDS): Poison.
	(IFCVT_INIT_EXTRA_FIELDS): Poison.
	* basic-block.h (struct ce_if_block): Remove IFCVT_EXTRA_FIELDS.
	* ifcvt.c (find_if_header): Use IFCVT_MACHDEP_INIT instead of
	IFCVT_INIT_EXTRA_FIELDS.
	* gengtype-parse.c (struct_field_seq): Remove obsolete comment.
	* config/frv/frv.h (IFCVT_INIT_EXTRA_FIELDS): Rename to
	IFCVT_MACHDEP_INIT.
	* config/frv/frv.c (frv_ifcvt_init_extra_fields): Rename to
	frv_ifcvt_machdep_init.
	* doc/tm.texi.in (IFCVT_INIT_EXTRA_FIELDS, IFCVT_EXTRA_FIELDS):
	Remove documentation.
	(IFCVT_MACHDEP_INIT): Document.
	* doc/tm.texi: Regenerate.

From-SVN: r189074
This commit is contained in:
Steven Bosscher 2012-06-29 13:56:40 +00:00
parent a1ebcd97b8
commit 67a0732fb2
9 changed files with 33 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gcc/ChangeLog
View File

@ -1,3 +1,20 @@
2012-06-29 Steven Bosscher <steven@gcc.gnu.org>
* system.h (IFCVT_EXTRA_FIELDS): Poison.
(IFCVT_INIT_EXTRA_FIELDS): Poison.
* basic-block.h (struct ce_if_block): Remove IFCVT_EXTRA_FIELDS.
* ifcvt.c (find_if_header): Use IFCVT_MACHDEP_INIT instead of
IFCVT_INIT_EXTRA_FIELDS.
* gengtype-parse.c (struct_field_seq): Remove obsolete comment.
* config/frv/frv.h (IFCVT_INIT_EXTRA_FIELDS): Rename to
IFCVT_MACHDEP_INIT.
* config/frv/frv.c (frv_ifcvt_init_extra_fields): Rename to
frv_ifcvt_machdep_init.
* doc/tm.texi.in (IFCVT_INIT_EXTRA_FIELDS, IFCVT_EXTRA_FIELDS):
Remove documentation.
(IFCVT_MACHDEP_INIT): Document.
* doc/tm.texi: Regenerate.
2012-06-29 Nick Clifton <nickc@redhat.com> 2012-06-29 Nick Clifton <nickc@redhat.com>
* config/lm32/lm32.c (lm32_compute_frame_size): Fix typo. * config/lm32/lm32.c (lm32_compute_frame_size): Fix typo.

5
gcc/basic-block.h
View File

@ -498,11 +498,6 @@ typedef struct ce_if_block
int num_then_insns; /* # of insns in THEN block. */ int num_then_insns; /* # of insns in THEN block. */
int num_else_insns; /* # of insns in ELSE block. */ int num_else_insns; /* # of insns in ELSE block. */
int pass; /* Pass number. */ int pass; /* Pass number. */
#ifdef IFCVT_EXTRA_FIELDS
IFCVT_EXTRA_FIELDS /* Any machine dependent fields. */
#endif
} ce_if_block_t; } ce_if_block_t;
/* This structure maintains an edge list vector. */ /* This structure maintains an edge list vector. */

7
gcc/config/frv/frv.c
View File

@ -5221,12 +5221,11 @@ frv_clear_registers_used (rtx *ptr, void *data)
} }
/* Initialize the extra fields provided by IFCVT_EXTRA_FIELDS. */ /* Initialize machine-specific if-conversion data.
On the FR-V, we don't have any extra fields per se, but it is useful hook to
/* On the FR-V, we don't have any extra fields per se, but it is useful hook to
initialize the static storage. */ initialize the static storage. */
void void
frv_ifcvt_init_extra_fields (ce_if_block_t *ce_info ATTRIBUTE_UNUSED) frv_ifcvt_machdep_init (ce_if_block_t *ce_info ATTRIBUTE_UNUSED)
{ {
frv_ifcvt.added_insns_list = NULL_RTX; frv_ifcvt.added_insns_list = NULL_RTX;
frv_ifcvt.cur_scratch_regs = 0; frv_ifcvt.cur_scratch_regs = 0;

4
gcc/config/frv/frv.h
View File

@ -1975,8 +1975,8 @@ frv_ifcvt_modify_multiple_tests (CE_INFO, BB, &TRUE_EXPR, &FALSE_EXPR)
information CE_INFO. */ information CE_INFO. */
#define IFCVT_MODIFY_CANCEL(CE_INFO) frv_ifcvt_modify_cancel (CE_INFO) #define IFCVT_MODIFY_CANCEL(CE_INFO) frv_ifcvt_modify_cancel (CE_INFO)
/* Initialize the extra fields provided by IFCVT_EXTRA_FIELDS. */ /* Initialize the machine-specific static data for if-conversion. */
#define IFCVT_INIT_EXTRA_FIELDS(CE_INFO) frv_ifcvt_init_extra_fields (CE_INFO) #define IFCVT_MACHDEP_INIT(CE_INFO) frv_ifcvt_machdep_init (CE_INFO)
/* The definition of the following macro results in that the 2nd jump /* The definition of the following macro results in that the 2nd jump
optimization (after the 2nd insn scheduling) is minimal. It is optimization (after the 2nd insn scheduling) is minimal. It is

13
gcc/doc/tm.texi
View File

@ -10871,15 +10871,10 @@ can be found in the @code{struct ce_if_block} structure that is pointed
to by @var{ce_info}. to by @var{ce_info}.
@end defmac @end defmac
@defmac IFCVT_INIT_EXTRA_FIELDS (@var{ce_info}) @defmac IFCVT_MACHDEP_INIT (@var{ce_info})
A C expression to initialize any extra fields in a @code{struct ce_if_block} A C expression to initialize any machine specific data for if-conversion
structure, which are defined by the @code{IFCVT_EXTRA_FIELDS} macro. of the if-block in the @code{struct ce_if_block} structure that is pointed
@end defmac to by @var{ce_info}.
@defmac IFCVT_EXTRA_FIELDS
If defined, it should expand to a set of field declarations that will be
added to the @code{struct ce_if_block} structure. These should be initialized
by the @code{IFCVT_INIT_EXTRA_FIELDS} macro.
@end defmac @end defmac
@deftypefn {Target Hook} void TARGET_MACHINE_DEPENDENT_REORG (void) @deftypefn {Target Hook} void TARGET_MACHINE_DEPENDENT_REORG (void)

13
gcc/doc/tm.texi.in
View File

@ -10745,15 +10745,10 @@ can be found in the @code{struct ce_if_block} structure that is pointed
to by @var{ce_info}. to by @var{ce_info}.
@end defmac @end defmac
@defmac IFCVT_INIT_EXTRA_FIELDS (@var{ce_info}) @defmac IFCVT_MACHDEP_INIT (@var{ce_info})
A C expression to initialize any extra fields in a @code{struct ce_if_block} A C expression to initialize any machine specific data for if-conversion
structure, which are defined by the @code{IFCVT_EXTRA_FIELDS} macro. of the if-block in the @code{struct ce_if_block} structure that is pointed
@end defmac to by @var{ce_info}.
@defmac IFCVT_EXTRA_FIELDS
If defined, it should expand to a set of field declarations that will be
added to the @code{struct ce_if_block} structure. These should be initialized
by the @code{IFCVT_INIT_EXTRA_FIELDS} macro.
@end defmac @end defmac
@hook TARGET_MACHINE_DEPENDENT_REORG @hook TARGET_MACHINE_DEPENDENT_REORG

3
gcc/gengtype-parse.c
View File

@ -662,9 +662,6 @@ struct_field_seq (void)
do do
{ {
ty = type (&opts, true); ty = type (&opts, true);
/* Another piece of the IFCVT_EXTRA_FIELDS special case, see type(). */
if (!ty && token () == '}')
break;
if (!ty || token () == ':') if (!ty || token () == ':')
{ {

4
gcc/ifcvt.c
View File

@ -3255,8 +3255,8 @@ find_if_header (basic_block test_bb, int pass)
ce_info.else_bb = else_edge->dest; ce_info.else_bb = else_edge->dest;
ce_info.pass = pass; ce_info.pass = pass;
#ifdef IFCVT_INIT_EXTRA_FIELDS #ifdef IFCVT_MACHDEP_INIT
IFCVT_INIT_EXTRA_FIELDS (&ce_info); IFCVT_MACHDEP_INIT (&ce_info);
#endif #endif
if (!reload_completed if (!reload_completed

2
gcc/system.h
View File

@ -895,7 +895,7 @@ extern void fancy_abort (const char *, int, const char *) ATTRIBUTE_NORETURN;
TARGET_ALIGN_ANON_BITFIELDS TARGET_NARROW_VOLATILE_BITFIELDS \ TARGET_ALIGN_ANON_BITFIELDS TARGET_NARROW_VOLATILE_BITFIELDS \
IDENT_ASM_OP UNALIGNED_SHORT_ASM_OP UNALIGNED_INT_ASM_OP \ IDENT_ASM_OP UNALIGNED_SHORT_ASM_OP UNALIGNED_INT_ASM_OP \
UNALIGNED_LONG_ASM_OP UNALIGNED_DOUBLE_INT_ASM_OP \ UNALIGNED_LONG_ASM_OP UNALIGNED_DOUBLE_INT_ASM_OP \
USE_COMMON_FOR_ONE_ONLY USE_COMMON_FOR_ONE_ONLY IFCVT_EXTRA_FIELDS IFCVT_INIT_EXTRA_FIELDS
/* Hooks that are no longer used. */ /* Hooks that are no longer used. */
#pragma GCC poison LANG_HOOKS_FUNCTION_MARK LANG_HOOKS_FUNCTION_FREE \ #pragma GCC poison LANG_HOOKS_FUNCTION_MARK LANG_HOOKS_FUNCTION_FREE \