fix define_insn for scalar-cmp

git-svn-id: https://gcc.gnu.org/svn/gcc/branches/ibm/rfc-2464-bounce2@238309 138bc75d-0d04-0410-961f-82ee72b054a4

10 files changed, 16 insertions, 14 deletions

diff --git a/gcc/config/rs6000/rs6000-c.c b/gcc/config/rs6000/rs6000-c.c
index 91dbddb113f..800394d13a4 100644
--- a/gcc/config/rs6000/rs6000-c.c
+++ b/gcc/config/rs6000/rs6000-c.c
@@ -32,9 +32,6 @@
 #include "langhooks.h"
 #include "c/c-tree.h"
 
-/* kelvin debug */
-#define TARGET_DEBUG_BUILTIN 1
-
 /* Handle the machine specific pragma longcall.  Its syntax is
 
    # pragma longcall ( TOGGLE )
@@ -4814,6 +4811,11 @@ altivec_resolve_overloaded_builtin (location_t loc, tree fndecl,
   if (!rs6000_overloaded_builtin_p (fcode))
     return NULL_TREE;
 
+#ifdef KELVIN_DEBUG
+  fprintf (stderr, "altivec_resolve_overloaded_builtin, code = %4d, %s\n",
+	   (int)fcode, IDENTIFIER_POINTER (DECL_NAME (fndecl)));
+#endif
+  
   if (TARGET_DEBUG_BUILTIN)
     fprintf (stderr, "altivec_resolve_overloaded_builtin, code = %4d, %s\n",
 	     (int)fcode, IDENTIFIER_POINTER (DECL_NAME (fndecl)));
diff --git a/gcc/config/rs6000/vsx.md b/gcc/config/rs6000/vsx.md
index 415517a3840..54b736d5f26 100644
--- a/gcc/config/rs6000/vsx.md
+++ b/gcc/config/rs6000/vsx.md
@@ -2898,7 +2898,7 @@
 (define_insn "*xscmpexpdp"
   [(set (match_operand:CCFP 0 "" "=y")
         (compare:CCFP
-         (unspec:VSX_F [(match_operand:DF 1 "vsx_register_operand" "wa")
+         (unspec:DF [(match_operand:DF 1 "vsx_register_operand" "wa")
 	                (match_operand:DF 2 "vsx_register_operand" "wa")]
           UNSPEC_VSX_SCMPEXPDP)
          (match_operand:SI 3 "zero_constant" "j")))]
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-eq-1.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-eq-1.c
index 15c53e71aa9..44f295cb301 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-eq-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-eq-1.c
@@ -7,7 +7,7 @@
 /* This test should succeed on 32-bit and 64-bit configuration.  */
 #include <altivec.h>
 
-byte compare_exponents_eq (double *exponent1_p, 
+char compare_exponents_eq (double *exponent1_p, 
 			   double *exponent2_p)
 {
   double exponent1 = *exponent1_p;
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-eq-2.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-eq-2.c
index 00104bd81de..fd09f988681 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-eq-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-eq-2.c
@@ -13,5 +13,5 @@ int compare_exponents_eq (double *exponent1_p,
   double exponent1 = *exponent1_p;
   double exponent2 = *exponent2_p;
 
-  return __builtin_vec_scalar_cmp_exp_eq (exponent1, exponent2);	/* { dg-error "Builtin function __builtin_vsx_scalar_cmp_exp_eq requires" } */
+  return __builtin_vec_scalar_cmp_exp_eq (exponent1, exponent2);	/* { dg-error "Builtin function __builtin_vsx_scalar_cmp_exp_dp_eq requires" } */
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-gt-1.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-gt-1.c
index f532a4ef552..6a62429f8c9 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-gt-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-gt-1.c
@@ -7,8 +7,8 @@
 /* This test should succeed on 32-bit and 64-bit configuration.  */
 #include <altivec.h>
 
-byte compare_exponents_gt (double *exponent1_p, 
-			  double *exponent2_p)
+char compare_exponents_gt (double *exponent1_p, 
+			   double *exponent2_p)
 {
   double exponent1 = *exponent1_p;
   double exponent2 = *exponent2_p;
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-gt-2.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-gt-2.c
index 60c4b526dd6..96a42c898a5 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-gt-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-gt-2.c
@@ -13,5 +13,5 @@ int compare_exponents_gt (double *exponent1_p,
   double exponent1 = *exponent1_p;
   double exponent2 = *exponent2_p;
 
-  return __builtin_vec_scalar_cmp_exp_gt (exponent1, exponent2);	/* { dg-error "Builtin function __builtin_vsx_scalar_cmp_exp_gt requires" } */
+  return __builtin_vec_scalar_cmp_exp_gt (exponent1, exponent2);	/* { dg-error "Builtin function __builtin_vsx_scalar_cmp_exp_dp_gt requires" } */
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-lt-1.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-lt-1.c
index f50c1f40b68..051ed47fcf0 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-lt-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-lt-1.c
@@ -7,8 +7,8 @@
 /* This test should succeed on 32-bit and 64-bit configuration.  */
 #include <altivec.h>
 
-byte compare_exponents_lt (double *exponent1_p, 
-			  double *exponent2_p)
+char compare_exponents_lt (double *exponent1_p, 
+			   double *exponent2_p)
 {
   double exponent1 = *exponent1_p;
   double exponent2 = *exponent2_p;
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-lt-2.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-lt-2.c
index c8af81da7ab..b7d7cff3a1d 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-lt-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-lt-2.c
@@ -13,5 +13,5 @@ int compare_exponents_lt (double *exponent1_p,
   double exponent1 = *exponent1_p;
   double exponent2 = *exponent2_p;
 
-  return __builtin_vec_scalar_cmp_exp_lt (exponent1, exponent2);	/* { dg-error "Builtin function __builtin_vsx_scalar_cmp_exp_lt requires" } */
+  return __builtin_vec_scalar_cmp_exp_lt (exponent1, exponent2);	/* { dg-error "Builtin function __builtin_vsx_scalar_cmp_exp_dp_lt requires" } */
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-unordered-1.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-unordered-1.c
index e89221bef1f..4b1a00d1179 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-unordered-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-unordered-1.c
@@ -7,7 +7,7 @@
 /* This test should succeed on 32-bit and 64-bit configuration.  */
 #include <altivec.h>
 
-byte compare_exponents_unordered (double *exponent1_p, 
+char compare_exponents_unordered (double *exponent1_p, 
 				  double *exponent2_p)
 {
   double exponent1 = *exponent1_p;
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-unordered-2.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-unordered-2.c
index cb6aa5b4c6f..1c32b75fec7 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-unordered-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-unordered-2.c
@@ -13,5 +13,5 @@ int compare_exponents_unordered (double *exponent1_p,
   double exponent1 = *exponent1_p;
   double exponent2 = *exponent2_p;
 
-  return __builtin_vec_scalar_cmp_exp_unordered (exponent1, exponent2);	/* { dg-error "Builtin function __builtin_vsx_scalar_cmp_exp_unordered requires" } */
+  return __builtin_vec_scalar_cmp_exp_unordered (exponent1, exponent2);	/* { dg-error "Builtin function __builtin_vsx_scalar_cmp_exp_dp_unordered requires" } */
 }