pa.c (pa_emit_move_sequence): Handle floating point reloads for other unsupported...

	* config/pa/pa.c (pa_emit_move_sequence): Handle floating point
	reloads for other unsupported memory operands.

From-SVN: r232253

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5c99e3d2061d8c6076b71e324a256a1c98bf92ce..bd84e1f36d635ad2d36d357a063bf93be698589f 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2016-01-11  John David Anglin  <danglin@gcc.gnu.org>
+
+       * config/pa/pa.c (pa_emit_move_sequence): Handle floating point
+       reloads for other unsupported memory operands.
+
 2016-01-12  Kugan Vivekanandarajah  <kuganv@linaro.org>
            Jim Wilson  <jim.wilson@linaro.org>
 

diff --git a/gcc/config/pa/pa.c b/gcc/config/pa/pa.c
index 0e99e465d874d8da9f4dee773beedb84f37e6ebc..8b1c8327c79733b09716344938cd243c31ed2c5c 100644 (file)
--- a/gcc/config/pa/pa.c
+++ b/gcc/config/pa/pa.c
@@ -1681,7 +1681,8 @@ pa_emit_move_sequence (rtx *operands, machine_mode mode, rtx scratch_reg)
 
   /* Handle secondary reloads for loads/stores of FP registers from
      REG+D addresses where D does not fit in 5 or 14 bits, including
-     (subreg (mem (addr))) cases.  */
+     (subreg (mem (addr))) cases, and reloads for other unsupported
+     memory operands.  */
   if (scratch_reg
       && FP_REG_P (operand0)
       && (MEM_P (operand1)
@@ -1693,30 +1694,43 @@ pa_emit_move_sequence (rtx *operands, machine_mode mode, rtx scratch_reg)
       if (GET_CODE (op1) == SUBREG)
        op1 = XEXP (op1, 0);
 
-      if (reg_plus_base_memory_operand (op1, GET_MODE (op1))
-         && !(TARGET_PA_20
-              && !TARGET_ELF32
-              && INT_14_BITS (XEXP (XEXP (op1, 0), 1)))
-         && !INT_5_BITS (XEXP (XEXP (op1, 0), 1)))
+      if (reg_plus_base_memory_operand (op1, GET_MODE (op1)))
        {
-         /* SCRATCH_REG will hold an address and maybe the actual data.
-            We want it in WORD_MODE regardless of what mode it was
-            originally given to us.  */
-         scratch_reg = force_mode (word_mode, scratch_reg);
-
-         /* D might not fit in 14 bits either; for such cases load D into
-            scratch reg.  */
-         if (!INT_14_BITS (XEXP (XEXP (op1, 0), 1)))
+         if (!(TARGET_PA_20
+               && !TARGET_ELF32
+               && INT_14_BITS (XEXP (XEXP (op1, 0), 1)))
+             && !INT_5_BITS (XEXP (XEXP (op1, 0), 1)))
            {
-             emit_move_insn (scratch_reg, XEXP (XEXP (op1, 0), 1));
-             emit_move_insn (scratch_reg,
-                             gen_rtx_fmt_ee (GET_CODE (XEXP (op1, 0)),
-                                             Pmode,
-                                             XEXP (XEXP (op1, 0), 0),
-                                             scratch_reg));
+             /* SCRATCH_REG will hold an address and maybe the actual data.
+                We want it in WORD_MODE regardless of what mode it was
+                originally given to us.  */
+             scratch_reg = force_mode (word_mode, scratch_reg);
+
+             /* D might not fit in 14 bits either; for such cases load D
+                into scratch reg.  */
+             if (!INT_14_BITS (XEXP (XEXP (op1, 0), 1)))
+               {
+                 emit_move_insn (scratch_reg, XEXP (XEXP (op1, 0), 1));
+                 emit_move_insn (scratch_reg,
+                                 gen_rtx_fmt_ee (GET_CODE (XEXP (op1, 0)),
+                                                 Pmode,
+                                                 XEXP (XEXP (op1, 0), 0),
+                                                 scratch_reg));
+               }
+             else
+               emit_move_insn (scratch_reg, XEXP (op1, 0));
+             emit_insn (gen_rtx_SET (operand0,
+                                 replace_equiv_address (op1, scratch_reg)));
+             return 1;
            }
-         else
-           emit_move_insn (scratch_reg, XEXP (op1, 0));
+       }
+      else if ((!INT14_OK_STRICT && symbolic_memory_operand (op1, VOIDmode))
+              || IS_LO_SUM_DLT_ADDR_P (XEXP (op1, 0))
+              || IS_INDEX_ADDR_P (XEXP (op1, 0)))
+       {
+         /* Load memory address into SCRATCH_REG.  */
+         scratch_reg = force_mode (word_mode, scratch_reg);
+         emit_move_insn (scratch_reg, XEXP (op1, 0));
          emit_insn (gen_rtx_SET (operand0,
                                  replace_equiv_address (op1, scratch_reg)));
          return 1;
@@ -1733,30 +1747,43 @@ pa_emit_move_sequence (rtx *operands, machine_mode mode, rtx scratch_reg)
       if (GET_CODE (op0) == SUBREG)
        op0 = XEXP (op0, 0);
 
-      if (reg_plus_base_memory_operand (op0, GET_MODE (op0))
-         && !(TARGET_PA_20
-              && !TARGET_ELF32
-              && INT_14_BITS (XEXP (XEXP (op0, 0), 1)))
-         && !INT_5_BITS (XEXP (XEXP (op0, 0), 1)))
+      if (reg_plus_base_memory_operand (op0, GET_MODE (op0)))
        {
-         /* SCRATCH_REG will hold an address and maybe the actual data.
-            We want it in WORD_MODE regardless of what mode it was
-            originally given to us.  */
-         scratch_reg = force_mode (word_mode, scratch_reg);
-
-         /* D might not fit in 14 bits either; for such cases load D into
-            scratch reg.  */
-         if (!INT_14_BITS (XEXP (XEXP (op0, 0), 1)))
+         if (!(TARGET_PA_20
+               && !TARGET_ELF32
+               && INT_14_BITS (XEXP (XEXP (op0, 0), 1)))
+             && !INT_5_BITS (XEXP (XEXP (op0, 0), 1)))
            {
-             emit_move_insn (scratch_reg, XEXP (XEXP (op0, 0), 1));
-             emit_move_insn (scratch_reg,
-                             gen_rtx_fmt_ee (GET_CODE (XEXP (op0, 0)),
-                                             Pmode,
-                                             XEXP (XEXP (op0, 0), 0),
-                                             scratch_reg));
+             /* SCRATCH_REG will hold an address and maybe the actual data.
+                We want it in WORD_MODE regardless of what mode it was
+                originally given to us.  */
+             scratch_reg = force_mode (word_mode, scratch_reg);
+
+             /* D might not fit in 14 bits either; for such cases load D
+                into scratch reg.  */
+             if (!INT_14_BITS (XEXP (XEXP (op0, 0), 1)))
+               {
+                 emit_move_insn (scratch_reg, XEXP (XEXP (op0, 0), 1));
+                 emit_move_insn (scratch_reg,
+                                 gen_rtx_fmt_ee (GET_CODE (XEXP (op0, 0)),
+                                                 Pmode,
+                                                 XEXP (XEXP (op0, 0), 0),
+                                                 scratch_reg));
+               }
+             else
+               emit_move_insn (scratch_reg, XEXP (op0, 0));
+             emit_insn (gen_rtx_SET (replace_equiv_address (op0, scratch_reg),
+                                     operand1));
+             return 1;
            }
-         else
-           emit_move_insn (scratch_reg, XEXP (op0, 0));
+       }
+      else if ((!INT14_OK_STRICT && symbolic_memory_operand (op0, VOIDmode))
+              || IS_LO_SUM_DLT_ADDR_P (XEXP (op0, 0))
+              || IS_INDEX_ADDR_P (XEXP (op0, 0)))
+       {
+         /* Load memory address into SCRATCH_REG.  */
+         scratch_reg = force_mode (word_mode, scratch_reg);
+         emit_move_insn (scratch_reg, XEXP (op0, 0));
          emit_insn (gen_rtx_SET (replace_equiv_address (op0, scratch_reg),
                                  operand1));
          return 1;