score-protos.h (score_function_arg): Delete.

	* config/score/score-protos.h (score_function_arg): Delete.
	(score_function_arg_advance): Delete.
	* config/score/score3.h (score3_function_arg_advance): Take a
	const_tree and a bool.
	(score3_function_arg): Likewise.
	* config/score/score7.h (score7_function_arg_advance): Likewise.
	(score7_function_arg): Likewise.
	* config/score/score3.c (score3_classify_arg): Likewise.
	(score3_function_arg_advance, score3_function_arg): Likewise.
	* config/score/score7.c (score7_classify_arg): Likewise.
	(score7_function_arg_advance, score7_function_arg): Likewise.
	* config/score/score.c (score_function_arg_advance): Likewise.
	(score_function_arg): Likewise.  De-const-ify `cum' argument.
	(TARGET_FUNCTION_ARG, TARGET_FUNCTION_ARG_ADVANCE): Define.

From-SVN: r165181

7 files changed, 46 insertions, 29 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index be15278..4b01503 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,22 @@
 2010-10-08  Nathan Froyd  <froydnj@codesourcery.com>
 
+	* config/score/score-protos.h (score_function_arg): Delete.
+	(score_function_arg_advance): Delete.
+	* config/score/score3.h (score3_function_arg_advance): Take a
+	const_tree and a bool.
+	(score3_function_arg): Likewise.
+	* config/score/score7.h (score7_function_arg_advance): Likewise.
+	(score7_function_arg): Likewise.
+	* config/score/score3.c (score3_classify_arg): Likewise.
+	(score3_function_arg_advance, score3_function_arg): Likewise.
+	* config/score/score7.c (score7_classify_arg): Likewise.
+	(score7_function_arg_advance, score7_function_arg): Likewise.
+	* config/score/score.c (score_function_arg_advance): Likewise.
+	(score_function_arg): Likewise.  De-const-ify `cum' argument.
+	(TARGET_FUNCTION_ARG, TARGET_FUNCTION_ARG_ADVANCE): Define.
+
+2010-10-08  Nathan Froyd  <froydnj@codesourcery.com>
+
 	* config/s390/s390-protos.h (s390_function_arg_advance): Delete.
 	(s390_function_arg): Delete.
 	* config/s390/s390.h (FUNCTION_ARG, FUNCTION_ARG_ADVANCE): Delete.
diff --git a/gcc/config/score/score-protos.h b/gcc/config/score/score-protos.h
index 70daf74..7a82212 100644
--- a/gcc/config/score/score-protos.h
+++ b/gcc/config/score/score-protos.h
@@ -39,9 +39,6 @@ extern bool score_unaligned_load (rtx* ops);
 extern bool score_unaligned_store (rtx* ops);
 extern bool score_block_move (rtx* ops);
 extern int score_address_cost (rtx addr, bool speed);
-extern rtx score_function_arg (const CUMULATIVE_ARGS *cum,
-                               enum machine_mode mode,
-                               tree type, int named);
 extern int score_address_p (enum machine_mode mode, rtx x, int strict);
 extern int score_reg_class (int regno);
 extern int score_register_move_cost (enum machine_mode mode, enum reg_class to,
@@ -51,9 +48,6 @@ extern int score_const_ok_for_letter_p (HOST_WIDE_INT value, char c);
 extern int score_extra_constraint (rtx op, char c);
 extern rtx score_return_addr (int count, rtx frame);
 extern int score_regno_mode_ok_for_base_p (int regno, int strict);
-extern void score_function_arg_advance (CUMULATIVE_ARGS *cum,
-                                        enum machine_mode mode,
-                                        tree type, int named);
 extern void score_init_cumulative_args (CUMULATIVE_ARGS *cum,
                                         tree fntype, rtx libname);
 extern void score_declare_object (FILE *stream, const char *name,
diff --git a/gcc/config/score/score.c b/gcc/config/score/score.c
index 764293a..7af8374 100644
--- a/gcc/config/score/score.c
+++ b/gcc/config/score/score.c
@@ -105,6 +105,12 @@ static void score_option_override (void);
 #undef TARGET_ARG_PARTIAL_BYTES
 #define TARGET_ARG_PARTIAL_BYTES        score_arg_partial_bytes
 
+#undef TARGET_FUNCTION_ARG
+#define TARGET_FUNCTION_ARG             score_function_arg
+
+#undef TARGET_FUNCTION_ARG_ADVANCE
+#define TARGET_FUNCTION_ARG_ADVANCE     score_function_arg_advance
+
 #undef TARGET_PASS_BY_REFERENCE
 #define TARGET_PASS_BY_REFERENCE        score_pass_by_reference
 
@@ -474,10 +480,10 @@ score_init_cumulative_args (CUMULATIVE_ARGS *cum,
   memset (cum, 0, sizeof (CUMULATIVE_ARGS));
 }
 
-/* Implement FUNCTION_ARG_ADVANCE macro.  */
+/* Implement TARGET_FUNCTION_ARG_ADVANCE hook.  */
 void
 score_function_arg_advance (CUMULATIVE_ARGS *cum, enum machine_mode mode,
-                            tree type, int named)
+                            const_tree type, bool named)
 {
   if (TARGET_SCORE5 || TARGET_SCORE5U || TARGET_SCORE7 || TARGET_SCORE7D)
     return score7_function_arg_advance (cum, mode, type, named);
@@ -500,10 +506,10 @@ score_arg_partial_bytes (CUMULATIVE_ARGS *cum,
   gcc_unreachable ();
 }
 
-/* Implement FUNCTION_ARG macro.  */
+/* Implement TARGET_FUNCTION_ARG hook.  */
 rtx
-score_function_arg (const CUMULATIVE_ARGS *cum, enum machine_mode mode,
-                    tree type, int named)
+score_function_arg (CUMULATIVE_ARGS *cum, enum machine_mode mode,
+                    const_tree type, bool named)
 {
   if (TARGET_SCORE5 || TARGET_SCORE5U || TARGET_SCORE7 || TARGET_SCORE7D)
     return score7_function_arg (cum, mode, type, named);
diff --git a/gcc/config/score/score3.c b/gcc/config/score/score3.c
index fd2e784..9349c68 100644
--- a/gcc/config/score/score3.c
+++ b/gcc/config/score/score3.c
@@ -440,7 +440,7 @@ score3_legitimize_address (rtx x)
    is a named (fixed) argument rather than a variable one.  */
 static void
 score3_classify_arg (const CUMULATIVE_ARGS *cum, enum machine_mode mode,
-                     tree type, int named, struct score3_arg_info *info)
+                     const_tree type, bool named, struct score3_arg_info *info)
 {
   int even_reg_p;
   unsigned int num_words, max_regs;
@@ -800,10 +800,10 @@ score3_initial_elimination_offset (int from,
     }
 }
 
-/* Implement FUNCTION_ARG_ADVANCE macro.  */
+/* Implement TARGET_FUNCTION_ARG_ADVANCE hook.  */
 void
 score3_function_arg_advance (CUMULATIVE_ARGS *cum, enum machine_mode mode,
-                             tree type, int named)
+                             const_tree type, bool named)
 {
   struct score3_arg_info info;
   score3_classify_arg (cum, mode, type, named, &info);
@@ -823,10 +823,10 @@ score3_arg_partial_bytes (CUMULATIVE_ARGS *cum,
   return info.stack_words > 0 ? info.reg_words * UNITS_PER_WORD : 0;
 }
 
-/* Implement FUNCTION_ARG macro.  */
+/* Implement TARGET_FUNCTION_ARG hook.  */
 rtx
 score3_function_arg (const CUMULATIVE_ARGS *cum, enum machine_mode mode,
-                     tree type, int named)
+                     const_tree type, bool named)
 {
   struct score3_arg_info info;
 
diff --git a/gcc/config/score/score3.h b/gcc/config/score/score3.h
index eea4603..a89f1d7 100644
--- a/gcc/config/score/score3.h
+++ b/gcc/config/score/score3.h
@@ -107,16 +107,16 @@ score3_initial_elimination_offset (int from,
                                    int to ATTRIBUTE_UNUSED);
 extern void score3_function_arg_advance (CUMULATIVE_ARGS *cum,
                                          enum machine_mode mode,
-                                         tree type,
-                                         int named);
+                                         const_tree type,
+                                         bool named);
 extern int score3_arg_partial_bytes (CUMULATIVE_ARGS *cum,
                                      enum machine_mode mode,
                                      tree type,
                                      bool named);
 extern rtx score3_function_arg (const CUMULATIVE_ARGS *cum,
                                 enum machine_mode mode,
-                                tree type,
-                                int named);
+                                const_tree type,
+                                bool named);
 extern rtx score3_function_value (tree valtype,
                                   tree func ATTRIBUTE_UNUSED,
                                   enum machine_mode mode);
diff --git a/gcc/config/score/score7.c b/gcc/config/score/score7.c
index 85ae017..82a0436 100644
--- a/gcc/config/score/score7.c
+++ b/gcc/config/score/score7.c
@@ -439,7 +439,7 @@ score7_legitimize_address (rtx x)
    is a named (fixed) argument rather than a variable one.  */
 static void
 score7_classify_arg (const CUMULATIVE_ARGS *cum, enum machine_mode mode,
-                     tree type, int named, struct score7_arg_info *info)
+                     const_tree type, bool named, struct score7_arg_info *info)
 {
   int even_reg_p;
   unsigned int num_words, max_regs;
@@ -791,10 +791,10 @@ score7_initial_elimination_offset (int from,
     }
 }
 
-/* Implement FUNCTION_ARG_ADVANCE macro.  */
+/* Implement TARGET_FUNCTION_ARG_ADVANCE hook.  */
 void
 score7_function_arg_advance (CUMULATIVE_ARGS *cum, enum machine_mode mode,
-                             tree type, int named)
+                             const_tree type, bool named)
 {
   struct score7_arg_info info;
   score7_classify_arg (cum, mode, type, named, &info);
@@ -814,10 +814,10 @@ score7_arg_partial_bytes (CUMULATIVE_ARGS *cum,
   return info.stack_words > 0 ? info.reg_words * UNITS_PER_WORD : 0;
 }
 
-/* Implement FUNCTION_ARG macro.  */
+/* Implement TARGET_FUNCTION_ARG hook.  */
 rtx
 score7_function_arg (const CUMULATIVE_ARGS *cum, enum machine_mode mode,
-                     tree type, int named)
+                     const_tree type, bool named)
 {
   struct score7_arg_info info;
 
diff --git a/gcc/config/score/score7.h b/gcc/config/score/score7.h
index b6d2a5b..f3d95af 100644
--- a/gcc/config/score/score7.h
+++ b/gcc/config/score/score7.h
@@ -107,16 +107,16 @@ score7_initial_elimination_offset (int from,
                                    int to ATTRIBUTE_UNUSED);
 extern void score7_function_arg_advance (CUMULATIVE_ARGS *cum,
                                          enum machine_mode mode,
-                                         tree type,
-                                         int named);
+                                         const_tree type,
+                                         bool named);
 extern int score7_arg_partial_bytes (CUMULATIVE_ARGS *cum,
                                      enum machine_mode mode,
                                      tree type,
                                      bool named);
 extern rtx score7_function_arg (const CUMULATIVE_ARGS *cum,
                                 enum machine_mode mode,
-                                tree type,
-                                int named);
+                                const_tree type,
+                                bool named);
 extern rtx score7_function_value (tree valtype,
                                   tree func ATTRIBUTE_UNUSED,
                                   enum machine_mode mode);