PR optimization/9812

* rtl.h (mem_for_const_double): Delete prototype.
* varasm.c (mem_for_const_double): Delete function.
* config/m68k/hp320.h, config/m68k/linux.h, config/m68k/m68kelf.h,
config/m68k/m68kv4.h, config/m68k/netbsd-elf.h
(LEGITIMATE_PIC_OPERAND_P): Delete duplicate definitions.
* config/m68k/m68k.h (LEGITIMATE_CONSTANT_P): Disallow XFmode.
(LEGITIMATE_PIC_OPERAND_P): Delete CONST_DOUBLE tests.
* config/m68k/m68k.md (movxf): Add reload_in_progress guard.  Add
comment about confused support for XFmode constants.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3bf8197820740f24f5c1bc2d3032ecf544774ca5..51b9ffe60e25c286dab5cb0cce80573981f0f2df 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,16 @@
+2003-07-06  James E Wilson  <wilson@tuliptree.org>
+
+       PR optimization/9812
+       * rtl.h (mem_for_const_double): Delete prototype.
+       * varasm.c (mem_for_const_double): Delete function.
+       * config/m68k/hp320.h, config/m68k/linux.h, config/m68k/m68kelf.h,
+       config/m68k/m68kv4.h, config/m68k/netbsd-elf.h
+       (LEGITIMATE_PIC_OPERAND_P): Delete duplicate definitions.
+       * config/m68k/m68k.h (LEGITIMATE_CONSTANT_P): Disallow XFmode.
+       (LEGITIMATE_PIC_OPERAND_P): Delete CONST_DOUBLE tests.
+       * config/m68k/m68k.md (movxf): Add reload_in_progress guard.  Add
+       comment about confused support for XFmode constants.
+
 Mon Jul  7 02:03:56 CEST 2003  Jan Hubicka  <jh@suse.cz>
 
        * cfglayout.c (fixup_reorder_chain): Call delete_dead_jumptables.

diff --git a/gcc/config/m68k/hp320.h b/gcc/config/m68k/hp320.h
index a755aca672c0be9421078764a85804c70a06ccfe..17ce3504d9b269e24e69909108aeb5f2ce3295a0 100644 (file)
--- a/gcc/config/m68k/hp320.h
+++ b/gcc/config/m68k/hp320.h
@@ -555,18 +555,6 @@ do { size_t i, limit = (SIZE);             \
 
 #endif /* not HPUX_ASM */
 
-/* In m68k svr4, a symbol_ref rtx can be a valid PIC operand if it is an
-   operand of a function call.  */
-#undef LEGITIMATE_PIC_OPERAND_P
-#define LEGITIMATE_PIC_OPERAND_P(X) \
-  ((! symbolic_operand (X, VOIDmode) \
-    && ! (GET_CODE (X) == CONST_DOUBLE && mem_for_const_double (X) != 0        \
-         && GET_CODE (mem_for_const_double (X)) == MEM                 \
-         && symbolic_operand (XEXP (mem_for_const_double (X), 0),      \
-                              VOIDmode)))                              \
-   || (GET_CODE (X) == SYMBOL_REF && SYMBOL_REF_FLAG (X))              \
-   || PCREL_GENERAL_OPERAND_OK)
-
 /* hpux8 and later have C++ compatible include files, so do not
    pretend they are `extern "C"'.  */
 #define NO_IMPLICIT_EXTERN_C

diff --git a/gcc/config/m68k/linux.h b/gcc/config/m68k/linux.h
index 073eed76196a3b7e3c9de50e561bad870d1dc285..efedd4f2d1efca9a0b86f950f2abdd1ad8a74767 100644 (file)
--- a/gcc/config/m68k/linux.h
+++ b/gcc/config/m68k/linux.h
@@ -283,18 +283,6 @@ do {                                                                       \
    ? gen_rtx_REG ((MODE), 16)                                          \
    : gen_rtx_REG ((MODE), 0))
 
-/* In m68k svr4, a symbol_ref rtx can be a valid PIC operand if it is
-   an operand of a function call.  */
-#undef LEGITIMATE_PIC_OPERAND_P
-#define LEGITIMATE_PIC_OPERAND_P(X) \
-  ((! symbolic_operand (X, VOIDmode) \
-    && ! (GET_CODE (X) == CONST_DOUBLE && mem_for_const_double (X) != 0        \
-         && GET_CODE (mem_for_const_double (X)) == MEM                 \
-         && symbolic_operand (XEXP (mem_for_const_double (X), 0),      \
-                              VOIDmode)))                              \
-   || (GET_CODE (X) == SYMBOL_REF && SYMBOL_REF_FLAG (X))              \
-   || PCREL_GENERAL_OPERAND_OK)
-
 /* For m68k SVR4, structures are returned using the reentrant
    technique.  */
 #undef PCC_STATIC_STRUCT_RETURN

diff --git a/gcc/config/m68k/m68k.h b/gcc/config/m68k/m68k.h
index cb6c1900b0082cad42685f7585fb49a3b381846e..8ee78ba9aa911e6f4b0299b595ef15fd1c79a0a0 100644 (file)
--- a/gcc/config/m68k/m68k.h
+++ b/gcc/config/m68k/m68k.h
@@ -998,7 +998,7 @@ __transfer_from_trampoline ()                                       \
 /* Nonzero if the constant value X is a legitimate general operand.
    It is given that X satisfies CONSTANT_P or is a CONST_DOUBLE.  */
 
-#define LEGITIMATE_CONSTANT_P(X) 1
+#define LEGITIMATE_CONSTANT_P(X) (GET_MODE (X) != XFmode)
 
 /* Nonzero if the constant value X is a legitimate general operand
    when generating PIC code.  It is given that flag_pic is on and 
@@ -1015,12 +1015,8 @@ __transfer_from_trampoline ()                                    \
 #endif
 
 #define LEGITIMATE_PIC_OPERAND_P(X)    \
-  ((! symbolic_operand (X, VOIDmode)                           \
-    && ! (GET_CODE (X) == CONST_DOUBLE && mem_for_const_double (X) != 0        \
-         && GET_CODE (mem_for_const_double (X)) == MEM                 \
-         && symbolic_operand (XEXP (mem_for_const_double (X), 0),      \
-                              VOIDmode)))                              \
-   || (GET_CODE (X) == SYMBOL_REF && SYMBOL_REF_FLAG (X))              \
+  (! symbolic_operand (X, VOIDmode)                            \
+   || (GET_CODE (X) == SYMBOL_REF && SYMBOL_REF_FLAG (X))      \
    || PCREL_GENERAL_OPERAND_OK)
 
 /* The macros REG_OK_FOR..._P assume that the arg is a REG rtx

diff --git a/gcc/config/m68k/m68k.md b/gcc/config/m68k/m68k.md
index 7d29741b8eb7d516775bde381a64585f13fa8365..4542d73acbce52b01a06219229bba9c3456f5840 100644 (file)
--- a/gcc/config/m68k/m68k.md
+++ b/gcc/config/m68k/m68k.md
@@ -999,27 +999,35 @@
   "TARGET_5200"
   "* return output_move_double (operands);")
 
+;; ??? The XFmode patterns are schizophrenic about whether constants are
+;; allowed.  Most but not all have predicates and constraint that disallow
+;; constants.  Most but not all have output templates that handle constants.
+;; See also LEGITIMATE_CONSTANT_P.
+
 (define_expand "movxf"
   [(set (match_operand:XF 0 "nonimmediate_operand" "")
        (match_operand:XF 1 "general_operand" ""))]
   ""
   "
 {
-  if (CONSTANT_P (operands[1]))
-    {
-      operands[1] = force_const_mem (XFmode, operands[1]);
-      if (! memory_address_p (XFmode, XEXP (operands[1], 0))
-         && ! reload_in_progress)
-       operands[1] = adjust_address (operands[1], XFmode, 0);
-    }
-  if (flag_pic && TARGET_PCREL && ! reload_in_progress)
+  /* We can't rewrite operands during reload.  */
+  if (! reload_in_progress)
     {
-      /* Don't allow writes to memory except via a register;
-        the m68k doesn't consider PC-relative addresses to be writable.  */
-      if (GET_CODE (operands[0]) == MEM
-         && symbolic_operand (XEXP (operands[0], 0), SImode))
-       operands[0] = gen_rtx (MEM, XFmode,
-                              force_reg (SImode, XEXP (operands[0], 0)));
+      if (CONSTANT_P (operands[1]))
+       {
+         operands[1] = force_const_mem (XFmode, operands[1]);
+         if (! memory_address_p (XFmode, XEXP (operands[1], 0)))
+           operands[1] = adjust_address (operands[1], XFmode, 0);
+       }
+      if (flag_pic && TARGET_PCREL)
+       {
+         /* Don't allow writes to memory except via a register; the
+            m68k doesn't consider PC-relative addresses to be writable.  */
+         if (GET_CODE (operands[0]) == MEM
+             && symbolic_operand (XEXP (operands[0], 0), SImode))
+           operands[0] = gen_rtx (MEM, XFmode,
+                                  force_reg (SImode, XEXP (operands[0], 0)));
+       }
     }
 }")
 

diff --git a/gcc/config/m68k/m68kelf.h b/gcc/config/m68k/m68kelf.h
index 68fe5aaa88478e1aeb36b6ad0c06b4ba67bee3c3..f481871c48dac7ac913870fc034b5c23bbea0b84 100644 (file)
--- a/gcc/config/m68k/m68kelf.h
+++ b/gcc/config/m68k/m68kelf.h
@@ -246,16 +246,6 @@ extern int switch_table_difference_label_flag;
 #undef ASM_OUTPUT_BEFORE_CASE_LABEL
 #define ASM_OUTPUT_BEFORE_CASE_LABEL(FILE,PREFIX,NUM,TABLE)            \
   fprintf ((FILE), "%s&%d\n", SWBEG_ASM_OP, XVECLEN (PATTERN (TABLE), 1));
-
-/* In m68k svr4, a symbol_ref rtx can be a valid PIC operand if it is an
-   operand of a function call.  */
-#undef LEGITIMATE_PIC_OPERAND_P
-
-#define LEGITIMATE_PIC_OPERAND_P(X)    \
-  (! symbolic_operand (X, VOIDmode)                            \
-   || (GET_CODE (X) == SYMBOL_REF && SYMBOL_REF_FLAG (X))      \
-   || PCREL_GENERAL_OPERAND_OK)
-
 /* end of stuff from m68kv4.h */
 
 #undef SGS_CMP_ORDER

diff --git a/gcc/config/m68k/m68kv4.h b/gcc/config/m68k/m68kv4.h
index 66de39168b724f113a56c4263e282b064172890e..f826f0fbf04fb353f5236199047aafa022d8c30c 100644 (file)
--- a/gcc/config/m68k/m68kv4.h
+++ b/gcc/config/m68k/m68kv4.h
@@ -277,18 +277,6 @@ int switch_table_difference_label_flag;
 #define ASM_OUTPUT_BEFORE_CASE_LABEL(FILE,PREFIX,NUM,TABLE)            \
   fprintf ((FILE), "%s&%d\n", SWBEG_ASM_OP, XVECLEN (PATTERN (TABLE), 1));
 
-/* In m68k svr4, a symbol_ref rtx can be a valid PIC operand if it is an
-   operand of a function call.  */
-#undef LEGITIMATE_PIC_OPERAND_P
-#define LEGITIMATE_PIC_OPERAND_P(X) \
-  ((! symbolic_operand (X, VOIDmode) \
-    && ! (GET_CODE (X) == CONST_DOUBLE && mem_for_const_double (X) != 0        \
-         && GET_CODE (mem_for_const_double (X)) == MEM                 \
-         && symbolic_operand (XEXP (mem_for_const_double (X), 0),      \
-                              VOIDmode)))                              \
-   || (GET_CODE (X) == SYMBOL_REF && SYMBOL_REF_FLAG (X))              \
-   || PCREL_GENERAL_OPERAND_OK)
-
 /* Output assembler code for a block containing the constant parts
    of a trampoline, leaving space for the variable parts.  */
 

diff --git a/gcc/config/m68k/netbsd-elf.h b/gcc/config/m68k/netbsd-elf.h
index 0787c6accd642114007ec3acce6d3bbbc992417e..14fcf1a962a98b5926365d55e837124e4f3de0c1 100644 (file)
--- a/gcc/config/m68k/netbsd-elf.h
+++ b/gcc/config/m68k/netbsd-elf.h
@@ -385,20 +385,6 @@ while (0)
 #define BIGGEST_ALIGNMENT 64
 
 
-/* In m68k svr4, a symbol_ref rtx can be a valid PIC operand if it is
-   an operand of a function call. */
-
-#undef LEGITIMATE_PIC_OPERAND_P
-#define LEGITIMATE_PIC_OPERAND_P(X)                                    \
-  ((! symbolic_operand (X, VOIDmode)                                   \
-    && ! (GET_CODE (X) == CONST_DOUBLE && mem_for_const_double (X)     \
-         && GET_CODE (mem_for_const_double (X)) == MEM                 \
-         && symbolic_operand (XEXP (mem_for_const_double (X), 0),      \
-                              VOIDmode)))                              \
-   || (GET_CODE (X) == SYMBOL_REF && SYMBOL_REF_FLAG (X))              \
-   || PCREL_GENERAL_OPERAND_OK)
-
-
 /* For m68k SVR4, structures are returned using the reentrant
    technique. */
 

diff --git a/gcc/rtl.h b/gcc/rtl.h
index 10b4d5be4cc5995abf738073c90a15ced5a5ac6a..975a752ae8250df9ce459a4e69204bbff01ae607 100644 (file)
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -1477,7 +1477,6 @@ extern void end_full_sequence (rtx*, rtx*);
 /* In varasm.c  */
 extern rtx immed_double_const (HOST_WIDE_INT, HOST_WIDE_INT,
                               enum machine_mode);
-extern rtx mem_for_const_double (rtx);
 extern rtx force_const_mem (enum machine_mode, rtx);
 
 /* In varasm.c  */

diff --git a/gcc/varasm.c b/gcc/varasm.c
index 5769dc87c81651d93a4fee7c3d18db7d1086cb41..aa1c3557de79e72bd7717517bb59f7fc953a2fb7 100644 (file)
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -2931,23 +2931,6 @@ record_constant_rtx (enum machine_mode mode, rtx x)
   return ptr;
 }
 \f
-/* Given a constant rtx X, return a MEM for the location in memory at which
-   this constant has been placed.  Return 0 if it not has been placed yet.  */
-
-rtx
-mem_for_const_double (rtx x)
-{
-  enum machine_mode mode = GET_MODE (x);
-  struct constant_descriptor_rtx *desc;
-
-  for (desc = const_rtx_hash_table[const_hash_rtx (mode, x)]; desc;
-       desc = desc->next)
-    if (compare_constant_rtx (mode, x, desc))
-      return desc->rtl;
-
-  return 0;
-}
-
 /* Given a constant rtx X, make (or find) a memory constant for its value
    and return a MEM rtx to refer to it in memory.  */