From 6b0e4cbb42e3b00db8a9d419a2614ab5bdfe2c8a Mon Sep 17 00:00:00 2001
From: Joseph Myers <joseph@codesourcery.com>
Date: Mon, 2 May 2011 20:03:57 +0100
Subject: [PATCH] fr30-protos.h (Mmode): Don't define.
* config/fr30/fr30-protos.h (Mmode): Don't define.
* config/m32r/m32r-protos.h (Mmode): Don't define. Expand
definition where used.
* config/mn10300/mn10300-protos.h (Mmode, Cstar, Rclas): Don't
define. Expand definitions where used.
* config/rx/rx-protos.h (Mmode, Fargs, Rcode): Don't define.
Expand definitions where used.
* config/rx/rx.c (rx_is_legitimate_address, rx_function_arg_size,
rx_function_arg, rx_function_arg_advance,
rx_function_arg_boundary): Expand definitions of those macros.
* config/v850/v850-protos.h (Mmode): Don't define. Expand
definition where used.
From-SVN: r173266
---
gcc/ChangeLog | 15 +++++++++++++++
gcc/config/fr30/fr30-protos.h | 4 +---
gcc/config/m32r/m32r-protos.h | 17 +++++++----------
gcc/config/mn10300/mn10300-protos.h | 29 +++++++++++------------------
gcc/config/rx/rx-protos.h | 15 ++++++---------
gcc/config/rx/rx.c | 14 ++++++++------
gcc/config/v850/v850-protos.h | 18 ++++++++----------
7 files changed, 56 insertions(+), 56 deletions(-)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f7d3f55466b5..faf8eac48f41 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,18 @@
+2011-05-02 Joseph Myers <joseph@codesourcery.com>
+
+ * config/fr30/fr30-protos.h (Mmode): Don't define.
+ * config/m32r/m32r-protos.h (Mmode): Don't define. Expand
+ definition where used.
+ * config/mn10300/mn10300-protos.h (Mmode, Cstar, Rclas): Don't
+ define. Expand definitions where used.
+ * config/rx/rx-protos.h (Mmode, Fargs, Rcode): Don't define.
+ Expand definitions where used.
+ * config/rx/rx.c (rx_is_legitimate_address, rx_function_arg_size,
+ rx_function_arg, rx_function_arg_advance,
+ rx_function_arg_boundary): Expand definitions of those macros.
+ * config/v850/v850-protos.h (Mmode): Don't define. Expand
+ definition where used.
+
2011-05-02 Uros Bizjak <ubizjak@gmail.com>
* config/i386/mmx.md (*mov<mode>_internal_rex64): Use %vmovq for
diff --git a/gcc/config/fr30/fr30-protos.h b/gcc/config/fr30/fr30-protos.h
index 45bb3444e065..d27bcbc4a494 100644
--- a/gcc/config/fr30/fr30-protos.h
+++ b/gcc/config/fr30/fr30-protos.h
@@ -1,5 +1,5 @@
/* Prototypes for fr30.c functions used in the md file & elsewhere.
- Copyright (C) 1999, 2000, 2002, 2004, 2007, 2010
+ Copyright (C) 1999, 2000, 2002, 2004, 2007, 2010, 2011
Free Software Foundation, Inc.
This file is part of GCC.
@@ -28,8 +28,6 @@ extern void fr30_print_operand (FILE *, rtx, int);
extern void fr30_print_operand_address (FILE *, rtx);
extern rtx fr30_move_double (rtx *);
#ifdef HAVE_MACHINE_MODES
-#define Mmode enum machine_mode
extern int fr30_const_double_is_zero (rtx);
-#undef Mmode
#endif /* HAVE_MACHINE_MODES */
#endif /* RTX_CODE */
diff --git a/gcc/config/m32r/m32r-protos.h b/gcc/config/m32r/m32r-protos.h
index 37fa61c2a7d3..d35fc4e8472f 100644
--- a/gcc/config/m32r/m32r-protos.h
+++ b/gcc/config/m32r/m32r-protos.h
@@ -21,7 +21,6 @@
/* Function prototypes that cannot exist in m32r.h due to dependency
complications. */
-#define Mmode enum machine_mode
extern void m32r_init (void);
extern void m32r_init_expanders (void);
@@ -52,16 +51,14 @@ extern rtx m32r_return_addr (int);
extern rtx m32r_function_symbol (const char *);
#ifdef HAVE_MACHINE_MODES
-extern int call_operand (rtx, Mmode);
-extern int small_data_operand (rtx, Mmode);
-extern int addr24_operand (rtx, Mmode);
-extern int addr32_operand (rtx, Mmode);
-extern int call26_operand (rtx, Mmode);
-extern int memreg_operand (rtx, Mmode);
-extern int small_insn_p (rtx, Mmode);
+extern int call_operand (rtx, enum machine_mode);
+extern int small_data_operand (rtx, enum machine_mode);
+extern int addr24_operand (rtx, enum machine_mode);
+extern int addr32_operand (rtx, enum machine_mode);
+extern int call26_operand (rtx, enum machine_mode);
+extern int memreg_operand (rtx, enum machine_mode);
+extern int small_insn_p (rtx, enum machine_mode);
#endif /* HAVE_MACHINE_MODES */
#endif /* RTX_CODE */
-
-#undef Mmode
diff --git a/gcc/config/mn10300/mn10300-protos.h b/gcc/config/mn10300/mn10300-protos.h
index b8c19fd87605..fe0452b88258 100644
--- a/gcc/config/mn10300/mn10300-protos.h
+++ b/gcc/config/mn10300/mn10300-protos.h
@@ -1,5 +1,5 @@
/* Definitions of target machine for GNU compiler. Matsushita MN10300 series
- Copyright (C) 2000, 2003, 2004, 2005, 2007, 2009, 2010
+ Copyright (C) 2000, 2003, 2004, 2005, 2007, 2009, 2010, 2011
Free Software Foundation, Inc.
Contributed by Jeff Law (law@cygnus.com).
@@ -19,28 +19,25 @@
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define Mmode enum machine_mode
-#define Cstar const char *
-#define Rclas enum reg_class
-
#ifdef RTX_CODE
extern rtx mn10300_legitimize_pic_address (rtx, rtx);
extern int mn10300_legitimate_pic_operand_p (rtx);
-extern rtx mn10300_legitimize_reload_address (rtx, Mmode, int, int, int);
+extern rtx mn10300_legitimize_reload_address (rtx, enum machine_mode,
+ int, int, int);
extern bool mn10300_function_value_regno_p (const unsigned int);
extern int mn10300_get_live_callee_saved_regs (void);
-extern bool mn10300_hard_regno_mode_ok (unsigned int, Mmode);
-extern bool mn10300_modes_tieable (Mmode, Mmode);
-extern Cstar mn10300_output_add (rtx[3], bool);
+extern bool mn10300_hard_regno_mode_ok (unsigned int, enum machine_mode);
+extern bool mn10300_modes_tieable (enum machine_mode, enum machine_mode);
+extern const char *mn10300_output_add (rtx[3], bool);
extern void mn10300_print_operand (FILE *, rtx, int);
extern void mn10300_print_operand_address (FILE *, rtx);
extern void mn10300_print_reg_list (FILE *, int);
-extern Mmode mn10300_select_cc_mode (enum rtx_code, rtx, rtx);
-extern int mn10300_store_multiple_operation (rtx, Mmode);
-extern int mn10300_symbolic_operand (rtx, Mmode);
-extern void mn10300_split_cbranch (Mmode, rtx, rtx);
+extern enum machine_mode mn10300_select_cc_mode (enum rtx_code, rtx, rtx);
+extern int mn10300_store_multiple_operation (rtx, enum machine_mode);
+extern int mn10300_symbolic_operand (rtx, enum machine_mode);
+extern void mn10300_split_cbranch (enum machine_mode, rtx, rtx);
extern int mn10300_split_and_operand_count (rtx);
-extern bool mn10300_match_ccmode (rtx, Mmode);
+extern bool mn10300_match_ccmode (rtx, enum machine_mode);
#endif /* RTX_CODE */
extern bool mn10300_regno_in_class_p (unsigned, int, bool);
@@ -50,7 +47,3 @@ extern void mn10300_expand_prologue (void);
extern void mn10300_expand_epilogue (void);
extern int mn10300_initial_offset (int, int);
extern int mn10300_frame_size (void);
-
-#undef Mmode
-#undef Cstar
-#undef Rclas
diff --git a/gcc/config/rx/rx-protos.h b/gcc/config/rx/rx-protos.h
index 544a30dd38bb..c43b3981817d 100644
--- a/gcc/config/rx/rx-protos.h
+++ b/gcc/config/rx/rx-protos.h
@@ -21,11 +21,6 @@
#ifndef GCC_RX_PROTOS_H
#define GCC_RX_PROTOS_H
-/* A few abbreviations to make the prototypes shorter. */
-#define Mmode enum machine_mode
-#define Fargs CUMULATIVE_ARGS
-#define Rcode enum rtx_code
-
extern int rx_align_for_label (void);
extern void rx_expand_prologue (void);
extern int rx_initial_elimination_offset (int, int);
@@ -37,11 +32,13 @@ extern void rx_emit_stack_pushm (rtx *);
extern void rx_expand_epilogue (bool);
extern char * rx_gen_move_template (rtx *, bool);
extern bool rx_legitimate_constant_p (enum machine_mode, rtx);
-extern bool rx_is_restricted_memory_address (rtx, Mmode);
-extern bool rx_match_ccmode (rtx, Mmode);
+extern bool rx_is_restricted_memory_address (rtx,
+ enum machine_mode);
+extern bool rx_match_ccmode (rtx, enum machine_mode);
extern void rx_notice_update_cc (rtx body, rtx insn);
-extern void rx_split_cbranch (Mmode, Rcode, rtx, rtx, rtx);
-extern Mmode rx_select_cc_mode (Rcode, rtx, rtx);
+extern void rx_split_cbranch (enum machine_mode, enum rtx_code,
+ rtx, rtx, rtx);
+extern enum machine_mode rx_select_cc_mode (enum rtx_code, rtx, rtx);
#endif
#endif /* GCC_RX_PROTOS_H */
diff --git a/gcc/config/rx/rx.c b/gcc/config/rx/rx.c
index 1009c5409bc3..d9894c2a50d4 100644
--- a/gcc/config/rx/rx.c
+++ b/gcc/config/rx/rx.c
@@ -78,7 +78,8 @@ rx_small_data_operand (rtx op)
}
static bool
-rx_is_legitimate_address (Mmode mode, rtx x, bool strict ATTRIBUTE_UNUSED)
+rx_is_legitimate_address (enum machine_mode mode, rtx x,
+ bool strict ATTRIBUTE_UNUSED)
{
if (RTX_OK_FOR_BASE (x, strict))
/* Register Indirect. */
@@ -809,7 +810,7 @@ rx_round_up (unsigned int value, unsigned int alignment)
occupied by an argument of type TYPE and mode MODE. */
static unsigned int
-rx_function_arg_size (Mmode mode, const_tree type)
+rx_function_arg_size (enum machine_mode mode, const_tree type)
{
unsigned int num_bytes;
@@ -829,7 +830,8 @@ rx_function_arg_size (Mmode mode, const_tree type)
variable parameter list. */
static rtx
-rx_function_arg (Fargs * cum, Mmode mode, const_tree type, bool named)
+rx_function_arg (CUMULATIVE_ARGS * cum, enum machine_mode mode,
+ const_tree type, bool named)
{
unsigned int next_reg;
unsigned int bytes_so_far = *cum;
@@ -866,14 +868,14 @@ rx_function_arg (Fargs * cum, Mmode mode, const_tree type, bool named)
}
static void
-rx_function_arg_advance (Fargs * cum, Mmode mode, const_tree type,
- bool named ATTRIBUTE_UNUSED)
+rx_function_arg_advance (CUMULATIVE_ARGS * cum, enum machine_mode mode,
+ const_tree type, bool named ATTRIBUTE_UNUSED)
{
*cum += rx_function_arg_size (mode, type);
}
static unsigned int
-rx_function_arg_boundary (Mmode mode ATTRIBUTE_UNUSED,
+rx_function_arg_boundary (enum machine_mode mode ATTRIBUTE_UNUSED,
const_tree type ATTRIBUTE_UNUSED)
{
return 32;
diff --git a/gcc/config/v850/v850-protos.h b/gcc/config/v850/v850-protos.h
index 1f8b7f1bf362..106c298c9647 100644
--- a/gcc/config/v850/v850-protos.h
+++ b/gcc/config/v850/v850-protos.h
@@ -23,8 +23,6 @@
#ifndef GCC_V850_PROTOS_H
#define GCC_V850_PROTOS_H
-#define Mmode enum machine_mode
-
extern void expand_prologue (void);
extern void expand_epilogue (void);
extern int v850_handle_pragma (int (*)(void), void (*)(int), char *);
@@ -41,12 +39,14 @@ extern char * construct_restore_jr (rtx);
#ifdef HAVE_MACHINE_MODES
extern char * construct_dispose_instruction (rtx);
extern char * construct_prepare_instruction (rtx);
-extern int ep_memory_operand (rtx, Mmode, int);
-extern int v850_float_z_comparison_operator (rtx, Mmode);
-extern int v850_float_nz_comparison_operator (rtx, Mmode);
-extern rtx v850_gen_compare (enum rtx_code, Mmode, rtx, rtx);
-extern Mmode v850_gen_float_compare (enum rtx_code, Mmode, rtx, rtx);
-extern Mmode v850_select_cc_mode (RTX_CODE, rtx, rtx);
+extern int ep_memory_operand (rtx, enum machine_mode, int);
+extern int v850_float_z_comparison_operator (rtx, enum machine_mode);
+extern int v850_float_nz_comparison_operator (rtx, enum machine_mode);
+extern rtx v850_gen_compare (enum rtx_code, enum machine_mode,
+ rtx, rtx);
+extern enum machine_mode v850_gen_float_compare (enum rtx_code,
+ enum machine_mode, rtx, rtx);
+extern enum machine_mode v850_select_cc_mode (RTX_CODE, rtx, rtx);
#endif
#endif /* RTX_CODE */
@@ -67,6 +67,4 @@ extern void ghs_pragma_endtda (struct cpp_reader *);
extern void ghs_pragma_endsda (struct cpp_reader *);
extern void ghs_pragma_endzda (struct cpp_reader *);
-#undef Mmode
-
#endif /* ! GCC_V850_PROTOS_H */
--
GitLab