ia64.h (PREFERRED_RELOAD_CLASS): Remove macros.

	* config/ia64/ia64.h (PREFERRED_RELOAD_CLASS): Remove macros.
	* config/ia64/ia64-protos.h (ia64_preferred_reload_class): Remove.
	* config/ia64/ia64.c (TARGET_PREFERRED_RELOAD_CLASS): Define.
	(ia64_preferred_reload_class): Make static.  Change rclass argument
	and result types from enum reg_class to reg_class_t.

From-SVN: r165734

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4e3c62ccd0c9a37936d70137aaedee90ccb7ba53..3ec41124ae8a4b9d5dbadadded9c8660d9522899 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2010-10-20  Anatoly Sokolov  <aesok@post.ru>
+
+       * config/ia64/ia64.h (PREFERRED_RELOAD_CLASS): Remove macros.
+       * config/ia64/ia64-protos.h (ia64_preferred_reload_class): Remove.
+       * config/ia64/ia64.c (TARGET_PREFERRED_RELOAD_CLASS): Define.
+       (ia64_preferred_reload_class): Make static.  Change rclass argument
+       and result types from enum reg_class to reg_class_t.
+
 2010-10-20  Pat Haugen  <pthaugen@us.ibm.com>
 
        * tree-ssa-ter.c (find_replaceable_in_bb): Allow replacement over

diff --git a/gcc/config/ia64/ia64-protos.h b/gcc/config/ia64/ia64-protos.h
index 8a3ff4b8b08c9183836c60d4397a09350346f883..1a9bd87f724a20c58456f81390862dbc47f74085 100644 (file)
--- a/gcc/config/ia64/ia64-protos.h
+++ b/gcc/config/ia64/ia64-protos.h
@@ -56,7 +56,6 @@ extern int ia64_hard_regno_rename_ok (int, int);
 
 extern void ia64_print_operand_address (FILE *, rtx);
 extern void ia64_print_operand (FILE *, rtx, int);
-extern enum reg_class ia64_preferred_reload_class (rtx, enum reg_class);
 extern enum reg_class ia64_secondary_reload_class (enum reg_class,
                                                   enum machine_mode, rtx);
 extern const char *get_bundle_name (int);

diff --git a/gcc/config/ia64/ia64.c b/gcc/config/ia64/ia64.c
index c1135f996b28772c182292287013fdcbf716607e..801afa99e07ab3e093205c7a2753a158b6b68fae 100644 (file)
--- a/gcc/config/ia64/ia64.c
+++ b/gcc/config/ia64/ia64.c
@@ -324,6 +324,8 @@ static void ia64_override_options_after_change (void);
 
 static void ia64_dwarf_handle_frame_unspec (const char *, rtx, int);
 static tree ia64_builtin_decl (unsigned, bool);
+
+static reg_class_t ia64_preferred_reload_class (rtx, reg_class_t);
 \f
 /* Table of valid machine attributes.  */
 static const struct attribute_spec ia64_attribute_table[] =
@@ -595,6 +597,9 @@ static const struct attribute_spec ia64_attribute_table[] =
 #undef TARGET_OVERRIDE_OPTIONS_AFTER_CHANGE
 #define TARGET_OVERRIDE_OPTIONS_AFTER_CHANGE ia64_override_options_after_change
 
+#undef TARGET_PREFERRED_RELOAD_CLASS
+#define TARGET_PREFERRED_RELOAD_CLASS ia64_preferred_reload_class
+
 struct gcc_target targetm = TARGET_INITIALIZER;
 \f
 typedef enum
@@ -5346,11 +5351,11 @@ ia64_memory_move_cost (enum machine_mode mode ATTRIBUTE_UNUSED,
     return 10;
 }
 
-/* Implement PREFERRED_RELOAD_CLASS.  Place additional restrictions on RCLASS
-   to use when copying X into that class.  */
+/* Implement TARGET_PREFERRED_RELOAD_CLASS.  Place additional restrictions
+   on RCLASS to use when copying X into that class.  */
 
-enum reg_class
-ia64_preferred_reload_class (rtx x, enum reg_class rclass)
+static reg_class_t
+ia64_preferred_reload_class (rtx x, reg_class_t rclass)
 {
   switch (rclass)
     {

diff --git a/gcc/config/ia64/ia64.h b/gcc/config/ia64/ia64.h
index 98e9b64d05aad751d4c3ba5a9e1ea6a0cf7f1a07..5ff206dc9b4a27d5f18bda4ddebb1db81d3f45d9 100644 (file)
--- a/gcc/config/ia64/ia64.h
+++ b/gcc/config/ia64/ia64.h
@@ -849,14 +849,6 @@ enum reg_class
    This is needed for POST_MODIFY.  */
 #define REGNO_OK_FOR_INDEX_P(NUM) REGNO_OK_FOR_BASE_P (NUM)
 
-/* A C expression that places additional restrictions on the register class to
-   use when it is necessary to copy value X into a register in class CLASS.
-   The value is a register class; perhaps CLASS, or perhaps another, smaller
-   class.  */
-
-#define PREFERRED_RELOAD_CLASS(X, CLASS) \
-  ia64_preferred_reload_class (X, CLASS)
-
 /* You should define this macro to indicate to the reload phase that it may
    need to allocate at least one register for a reload in addition to the
    register to contain the data.  Specifically, if copying X to a register