Move `normal_memory_operand' from gcc2 merge into the operand

predicates section of the file.

From-SVN: r24890

diff --git a/gcc/config/alpha/alpha.c b/gcc/config/alpha/alpha.c
index 8370329b81ea2d42c2427976cfbbb1612c99aa1e..7a057017b0bc05ad5fef065c39e263a74d09457f 100644 (file)
--- a/gcc/config/alpha/alpha.c
+++ b/gcc/config/alpha/alpha.c
@@ -848,17 +848,6 @@ reg_not_elim_operand (op, mode)
 
   return register_operand (op, mode);
 }
-\f
-/* Return 1 if this function can directly return via $26.  */
-
-int
-direct_return ()
-{
-  return (! TARGET_OPEN_VMS && reload_completed && alpha_sa_size () == 0
-         && get_frame_size () == 0
-         && current_function_outgoing_args_size == 0
-         && current_function_pretend_args_size == 0);
-}
 
 /* Return 1 is OP is a memory location that is not an reference (using
    an AND) to an unaligned location.  Take into account what reload
@@ -882,6 +871,17 @@ normal_memory_operand (op, mode)
 
   return GET_CODE (op) == MEM && GET_CODE (XEXP (op, 0)) != AND;
 }
+\f
+/* Return 1 if this function can directly return via $26.  */
+
+int
+direct_return ()
+{
+  return (! TARGET_OPEN_VMS && reload_completed && alpha_sa_size () == 0
+         && get_frame_size () == 0
+         && current_function_outgoing_args_size == 0
+         && current_function_pretend_args_size == 0);
+}
 
 /* REF is an alignable memory location.  Place an aligned SImode
    reference into *PALIGNED_MEM and the number of bits to shift into