(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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@189074
138bc75d-0d04-0410-961f-
82ee72b054a4
+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>
* config/lm32/lm32.c (lm32_compute_frame_size): Fix typo.
int num_then_insns; /* # of insns in THEN block. */
int num_else_insns; /* # of insns in ELSE block. */
int pass; /* Pass number. */
-
-#ifdef IFCVT_EXTRA_FIELDS
- IFCVT_EXTRA_FIELDS /* Any machine dependent fields. */
-#endif
-
} ce_if_block_t;
/* This structure maintains an edge list vector. */
}
\f
-/* Initialize the extra fields provided by IFCVT_EXTRA_FIELDS. */
-
-/* On the FR-V, we don't have any extra fields per se, but it is useful hook to
+/* 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
initialize the static storage. */
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.cur_scratch_regs = 0;
information CE_INFO. */
#define IFCVT_MODIFY_CANCEL(CE_INFO) frv_ifcvt_modify_cancel (CE_INFO)
-/* Initialize the extra fields provided by IFCVT_EXTRA_FIELDS. */
-#define IFCVT_INIT_EXTRA_FIELDS(CE_INFO) frv_ifcvt_init_extra_fields (CE_INFO)
+/* Initialize the machine-specific static data for if-conversion. */
+#define IFCVT_MACHDEP_INIT(CE_INFO) frv_ifcvt_machdep_init (CE_INFO)
/* The definition of the following macro results in that the 2nd jump
optimization (after the 2nd insn scheduling) is minimal. It is
to by @var{ce_info}.
@end defmac
-@defmac IFCVT_INIT_EXTRA_FIELDS (@var{ce_info})
-A C expression to initialize any extra fields in a @code{struct ce_if_block}
-structure, which are defined by the @code{IFCVT_EXTRA_FIELDS} macro.
-@end defmac
-
-@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.
+@defmac IFCVT_MACHDEP_INIT (@var{ce_info})
+A C expression to initialize any machine specific data for if-conversion
+of the if-block in the @code{struct ce_if_block} structure that is pointed
+to by @var{ce_info}.
@end defmac
@deftypefn {Target Hook} void TARGET_MACHINE_DEPENDENT_REORG (void)
to by @var{ce_info}.
@end defmac
-@defmac IFCVT_INIT_EXTRA_FIELDS (@var{ce_info})
-A C expression to initialize any extra fields in a @code{struct ce_if_block}
-structure, which are defined by the @code{IFCVT_EXTRA_FIELDS} macro.
-@end defmac
-
-@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.
+@defmac IFCVT_MACHDEP_INIT (@var{ce_info})
+A C expression to initialize any machine specific data for if-conversion
+of the if-block in the @code{struct ce_if_block} structure that is pointed
+to by @var{ce_info}.
@end defmac
@hook TARGET_MACHINE_DEPENDENT_REORG
do
{
ty = type (&opts, true);
- /* Another piece of the IFCVT_EXTRA_FIELDS special case, see type(). */
- if (!ty && token () == '}')
- break;
if (!ty || token () == ':')
{
ce_info.else_bb = else_edge->dest;
ce_info.pass = pass;
-#ifdef IFCVT_INIT_EXTRA_FIELDS
- IFCVT_INIT_EXTRA_FIELDS (&ce_info);
+#ifdef IFCVT_MACHDEP_INIT
+ IFCVT_MACHDEP_INIT (&ce_info);
#endif
if (!reload_completed
TARGET_ALIGN_ANON_BITFIELDS TARGET_NARROW_VOLATILE_BITFIELDS \
IDENT_ASM_OP UNALIGNED_SHORT_ASM_OP UNALIGNED_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. */
#pragma GCC poison LANG_HOOKS_FUNCTION_MARK LANG_HOOKS_FUNCTION_FREE \