* alias.c (OUTGOING_REGNO): Don't define the default.

	* builtins.c (OUTGOING_REGNO): Likewise.
	(INCOMING_REGNO): Likewise.
	(apply_args_register_offset): Always use OUTGOING_REGNO.
	* combine.c (OUTGOING_REGNO): Likewise.
	* sibcall.c (OUTGOING_REGNO): Likewise.
	* defaults.h (INCOMING_REGNO): Provide the default.
	(OUTGOING_REGNO): Likewise.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@78203 138bc75d-0d04-0410-961f-82ee72b054a4

6 files changed, 21 insertions, 22 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6dd4649f26b..9b428ea6034 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+2004-02-20  Kazu Hirata  <kazu@cs.umass.edu>
+
+	* alias.c (OUTGOING_REGNO): Don't define the default.
+	* builtins.c (OUTGOING_REGNO): Likewise.
+	(INCOMING_REGNO): Likewise.
+	(apply_args_register_offset): Always use OUTGOING_REGNO.
+	* combine.c (OUTGOING_REGNO): Likewise.
+	* sibcall.c (OUTGOING_REGNO): Likewise.
+	* defaults.h (INCOMING_REGNO): Provide the default.
+	(OUTGOING_REGNO): Likewise.
+
 2004-02-21  Jan Hubicka  <jh@suse.cz>
 
 	* params.def (max-peeled-insns, max-completely-peeled-insns,
diff --git a/gcc/alias.c b/gcc/alias.c
index f0cfe4cf7a3..e7ace3fab3b 100644
--- a/gcc/alias.c
+++ b/gcc/alias.c
@@ -2661,9 +2661,6 @@ init_alias_once (void)
 {
   int i;
 
-#ifndef OUTGOING_REGNO
-#define OUTGOING_REGNO(N) N
-#endif
   for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
     /* Check whether this register can hold an incoming pointer
        argument.  FUNCTION_ARG_REGNO_P tests outgoing register
diff --git a/gcc/builtins.c b/gcc/builtins.c
index a5520a3b97c..7e5953a955c 100644
--- a/gcc/builtins.c
+++ b/gcc/builtins.c
@@ -48,14 +48,6 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #define CALLED_AS_BUILT_IN(NODE) \
    (!strncmp (IDENTIFIER_POINTER (DECL_NAME (NODE)), "__builtin_", 10))
 
-/* Register mappings for target machines without register windows.  */
-#ifndef INCOMING_REGNO
-#define INCOMING_REGNO(OUT) (OUT)
-#endif
-#ifndef OUTGOING_REGNO
-#define OUTGOING_REGNO(IN) (IN)
-#endif
-
 #ifndef PAD_VARARGS_DOWN
 #define PAD_VARARGS_DOWN BYTES_BIG_ENDIAN
 #endif
@@ -902,10 +894,7 @@ apply_args_register_offset (int regno)
 
   /* Arguments are always put in outgoing registers (in the argument
      block) if such make sense.  */
-#ifdef OUTGOING_REGNO
-  regno = OUTGOING_REGNO (regno);
-#endif
-  return apply_args_reg_offset[regno];
+  return apply_args_reg_offset[OUTGOING_REGNO (regno)];
 }
 
 /* Return the size required for the block returned by __builtin_apply_args,
diff --git a/gcc/combine.c b/gcc/combine.c
index a1219de570d..8911cb2db32 100644
--- a/gcc/combine.c
+++ b/gcc/combine.c
@@ -813,9 +813,6 @@ setup_incoming_promotions (void)
 
   if (targetm.calls.promote_function_args (TREE_TYPE (cfun->decl)))
     {
-#ifndef OUTGOING_REGNO
-#define OUTGOING_REGNO(N) N
-#endif
       for (regno = 0; regno < FIRST_PSEUDO_REGISTER; regno++)
 	/* Check whether this register can hold an incoming pointer
 	   argument.  FUNCTION_ARG_REGNO_P tests outgoing register
diff --git a/gcc/defaults.h b/gcc/defaults.h
index 57e53f4e6ca..551c9783c3e 100644
--- a/gcc/defaults.h
+++ b/gcc/defaults.h
@@ -690,4 +690,13 @@ You Lose!  You must define PREFERRED_DEBUGGING_TYPE!
 #define CASE_VECTOR_PC_RELATIVE 0
 #endif
 
+/* Register mappings for target machines without register windows.  */
+#ifndef INCOMING_REGNO
+#define INCOMING_REGNO(N) (N)
+#endif
+
+#ifndef OUTGOING_REGNO
+#define OUTGOING_REGNO(N) (N)
+#endif
+
 #endif  /* ! GCC_DEFAULTS_H */
diff --git a/gcc/sibcall.c b/gcc/sibcall.c
index 81509ee9b56..fc9a63f7f86 100644
--- a/gcc/sibcall.c
+++ b/gcc/sibcall.c
@@ -174,10 +174,6 @@ skip_copy_to_return_value (rtx orig_insn)
      called function's return value was copied.  Otherwise we're returning
      some other value.  */
 
-#ifndef OUTGOING_REGNO
-#define OUTGOING_REGNO(N) (N)
-#endif
-
   if (SET_DEST (set) == current_function_return_rtx
       && REG_P (SET_DEST (set))
       && OUTGOING_REGNO (REGNO (SET_DEST (set))) == REGNO (hardret)