rs6000.md (extenddftf2): Change to define_insn which copies first FPR and clears second.

        * config/rs6000/rs6000.md (extenddftf2): Change to define_insn
        which copies first FPR and clears second.
        (extendsftf2): Same.
        (floatditf2): Fix typo.
        (floatsitf2): Same.
        (fix_trunctfdi2): Same.
        (fix_trunctfsi2): Same.

From-SVN: r57990

2 files changed, 45 insertions, 33 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f41698a..4492c11 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2002-10-09  David Edelsohn  <edelsohn@gnu.org>
+
+	* config/rs6000/rs6000.md (extenddftf2): Change to define_insn
+	which copies first FPR and clears second.
+	(extendsftf2): Same.
+	(floatditf2): Fix typo.
+	(floatsitf2): Same.
+	(fix_trunctfdi2): Same.
+	(fix_trunctfsi2): Same.
+
 2002-10-09  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* conflict.c (arc_hash): Change return type to hashval_t.
diff --git a/gcc/config/rs6000/rs6000.md b/gcc/config/rs6000/rs6000.md
index be20469..bc89259 100644
--- a/gcc/config/rs6000/rs6000.md
+++ b/gcc/config/rs6000/rs6000.md
@@ -8516,8 +8516,8 @@
   operands[2] = gen_lowpart (DImode, operands[0]);
   /* HIGHPART is lower memory address when WORDS_BIG_ENDIAN.  */
 #if HOST_BITS_PER_WIDE_INT >= 64
-  val = ((HOST_WIDE_INT)(unsigned long)l[endian] << 32 |
-        ((HOST_WIDE_INT)(unsigned long)l[1 - endian]));
+  val = ((HOST_WIDE_INT)(unsigned long)l[endian] << 32
+         | ((HOST_WIDE_INT)(unsigned long)l[1 - endian]));
 
   operands[3] = gen_int_mode (val, DImode);
 #else
@@ -8797,12 +8797,12 @@
   operands[2] = gen_lowpart (DImode, operands[0]);
   operands[3] = gen_highpart (DImode, operands[0]);
 #if HOST_BITS_PER_WIDE_INT >= 64
-  val = ((HOST_WIDE_INT)(unsigned long)l[0] << 32 |
-        ((HOST_WIDE_INT)(unsigned long)l[1]));
+  val = ((HOST_WIDE_INT)(unsigned long)l[0] << 32
+         | ((HOST_WIDE_INT)(unsigned long)l[1]));
   operands[4] = gen_int_mode (val, DImode);
 
-  val = ((HOST_WIDE_INT)(unsigned long)l[2] << 32 |
-        ((HOST_WIDE_INT)(unsigned long)l[3]));
+  val = ((HOST_WIDE_INT)(unsigned long)l[2] << 32
+         | ((HOST_WIDE_INT)(unsigned long)l[3]));
   operands[5] = gen_int_mode (val, DImode);
 #else
   operands[4] = immed_double_const (l[1], l[0], DImode);
@@ -8810,33 +8810,33 @@
 #endif
 }")
 
-(define_insn_and_split "extenddftf2"
+(define_insn "extenddftf2"
   [(set (match_operand:TF 0 "gpc_reg_operand" "=f")
 	(float_extend:TF (match_operand:DF 1 "gpc_reg_operand" "f")))]
   "DEFAULT_ABI == ABI_AIX && TARGET_HARD_FLOAT && TARGET_FPRS
    && TARGET_LONG_DOUBLE_128"
-  "#"
-  ""
-  [(set (match_dup 2) (match_dup 3))]
-  "
+  "*
 {
-  operands[2] = gen_rtx_REG (DFmode, REGNO (operands[0] + 1));
-  operands[3] = CONST0_RTX (DFmode);
-}")
+  if (REGNO (operands[0]) == REGNO (operands[1]))
+    return \"fsub %L0,%L0,%L0\";
+  else
+    return \"fmr %0,%1\;fsub %L0,%L0,%L0\";
+}"
+  [(set_attr "type" "fp")])
 
-(define_insn_and_split "extendsftf2"
+(define_insn "extendsftf2"
   [(set (match_operand:TF 0 "gpc_reg_operand" "=f")
 	(float_extend:TF (match_operand:SF 1 "gpc_reg_operand" "f")))]
   "DEFAULT_ABI == ABI_AIX && TARGET_HARD_FLOAT && TARGET_FPRS
    && TARGET_LONG_DOUBLE_128"
-  "#"
-  ""
-  [(set (match_dup 2) (match_dup 3))]
-  "
+  "*
 {
-  operands[2] = gen_rtx_REG (SFmode, REGNO (operands[0] + 1));
-  operands[3] = CONST0_RTX (SFmode);
-}")
+  if (REGNO (operands[0]) == REGNO (operands[1]))
+    return \"fsub %L0,%L0,%L0\";
+  else
+    return \"fmr %0,%1\;fsub %L0,%L0,%L0\";
+}"
+  [(set_attr "type" "fp")])
 
 (define_insn "trunctfdf2"
   [(set (match_operand:DF 0 "gpc_reg_operand" "=f")
@@ -8870,8 +8870,8 @@
   "#"
   "&& reload_completed"
   [(set (match_dup 2)
-	(float:DF (match_operand:DI 1 "gpc_reg_operand" "")))
-   (set (match_operand:TF 0 "gpc_reg_operand" "")
+	(float:DF (match_dup 1)))
+   (set (match_dup 0)
 	(float_extend:TF (match_dup 2)))]
   "")
 
@@ -8884,34 +8884,36 @@
   "#"
   "&& reload_completed"
   [(set (match_dup 2)
-	(float:DF (match_operand:SI 1 "gpc_reg_operand" "")))
-   (set (match_operand:TF 0 "gpc_reg_operand" "")
+	(float:DF (match_dup 1)))
+   (set (match_dup 0)
 	(float_extend:TF (match_dup 2)))]
   "")
 
 (define_insn_and_split "fix_trunctfdi2"
   [(set (match_operand:DI 0 "gpc_reg_operand" "=*f")
-        (fix:DI (match_operand:TF 1 "gpc_reg_operand" "f")))]
+        (fix:DI (match_operand:TF 1 "gpc_reg_operand" "f")))
+   (clobber (match_scratch:DF 2 "=f"))]
   "DEFAULT_ABI == ABI_AIX && TARGET_POWERPC64
    && TARGET_HARD_FLOAT && TARGET_FPRS && TARGET_LONG_DOUBLE_128"
   "#"
   "&& reload_completed"
   [(set (match_dup 2)
-	(float_truncate:DF (match_operand:TF 1 "gpc_reg_operand" "")))
-   (set (match_operand:DI 0 "gpc_reg_operand" "")
-	(fix:SI (match_dup 2)))]
+	(float_truncate:DF (match_dup 1)))
+   (set (match_dup 0)
+	(fix:DI (match_dup 2)))]
   "")
 
 (define_insn_and_split "fix_trunctfsi2"
   [(set (match_operand:SI 0 "gpc_reg_operand" "=r")
-        (fix:SI (match_operand:TF 1 "gpc_reg_operand" "f")))]
+        (fix:SI (match_operand:TF 1 "gpc_reg_operand" "f")))
+   (clobber (match_scratch:DF 2 "=f"))]
   "DEFAULT_ABI == ABI_AIX && TARGET_HARD_FLOAT && TARGET_FPRS
    && TARGET_LONG_DOUBLE_128"
   "#"
   "&& reload_completed"
   [(set (match_dup 2)
-	(float_truncate:DF (match_operand:TF 1 "gpc_reg_operand" "")))
-   (set (match_operand:SI 0 "gpc_reg_operand" "")
+	(float_truncate:DF (match_dup 1)))
+   (set (match_dup 0)
 	(fix:SI (match_dup 2)))]
   "")