mips.h (ISA_HAS_BRANCHLIKELY, [...]): Disable if TARGET_MIPS16.

* config/mips/mips.h (ISA_HAS_BRANCHLIKELY, ISA_HAS_CONDMOVE,
ISA_HAS_FP4, ISA_HAS_MADD_MSUB, ISA_HAS_NMADD_NMSUB,
ISA_HAS_CLZ_CLO, ISA_HAS_DCLZ_DCLO): Disable if TARGET_MIPS16.

From-SVN: r51917

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2b89d1cd689ebbc62907d0522819015c9c85b665..d338f06570a5c65edc32ca25da7f90007f5a3c9e 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2002-04-05  Alexandre Oliva  <aoliva@redhat.com>
+
+       * config/mips/mips.h (ISA_HAS_BRANCHLIKELY, ISA_HAS_CONDMOVE,
+       ISA_HAS_FP4, ISA_HAS_MADD_MSUB, ISA_HAS_NMADD_NMSUB,
+       ISA_HAS_CLZ_CLO, ISA_HAS_DCLZ_DCLO): Disable if TARGET_MIPS16.
+
 2002-04-05  Andreas Schwab  <schwab@suse.de>
 
        * c-convert.c: Include c-common.h.

diff --git a/gcc/config/mips/mips.h b/gcc/config/mips/mips.h
index 553edb7ace7f9c60db5415b7c7246a783d96b11c..976f0b7543f1782206dbcfb53a77b002538c6532 100644 (file)
--- a/gcc/config/mips/mips.h
+++ b/gcc/config/mips/mips.h
@@ -634,52 +634,51 @@ extern void               sbss_section PARAMS ((void));
 /* Disable branchlikely for tx39 until compare rewrite.  They haven't
    been generated up to this point.  */
 #define ISA_HAS_BRANCHLIKELY   (mips_isa != 1                          \
-                                /* || TARGET_MIPS3900 */)
+                                && ! TARGET_MIPS16)
 
 /* ISA has the conditional move instructions introduced in mips4.  */
-#define ISA_HAS_CONDMOVE        (mips_isa == 4                         \
-                                || mips_isa == 32                      \
-                                || mips_isa == 64)
+#define ISA_HAS_CONDMOVE        ((mips_isa == 4                                \
+                                 || mips_isa == 32                     \
+                                 || mips_isa == 64)                    \
+                                && ! TARGET_MIPS16)
 
 /* ISA has just the integer condition move instructions (movn,movz) */
 #define ISA_HAS_INT_CONDMOVE     0
 
-
-
 /* ISA has the mips4 FP condition code instructions: FP-compare to CC,
    branch on CC, and move (both FP and non-FP) on CC.  */
 #define ISA_HAS_8CC            (mips_isa == 4                          \
                                 || mips_isa == 32                      \
                                 || mips_isa == 64)
 
-
 /* This is a catch all for the other new mips4 instructions: indexed load and
    indexed prefetch instructions, the FP madd,msub,nmadd, and nmsub instructions,
    and the FP recip and recip sqrt instructions */
 #define ISA_HAS_FP4             (mips_isa == 4                         \
-                               )
+                                && ! TARGET_MIPS16)
 
 /* ISA has conditional trap instructions.  */
-#define ISA_HAS_COND_TRAP      (mips_isa >= 2 && ! TARGET_MIPS16)
+#define ISA_HAS_COND_TRAP      (mips_isa >= 2                          \
+                                && ! TARGET_MIPS16)
 
 /* ISA has multiply-accumulate instructions, madd and msub.  */
-#define ISA_HAS_MADD_MSUB       (mips_isa == 32                         \
-                                || mips_isa == 64                       \
-                                )
+#define ISA_HAS_MADD_MSUB       ((mips_isa == 32                       \
+                                 || mips_isa == 64                     \
+                                 ) && ! TARGET_MIPS16)
 
 /* ISA has nmadd and nmsub instructions.  */
 #define ISA_HAS_NMADD_NMSUB    (mips_isa == 4                          \
-                               )
+                                && ! TARGET_MIPS16)
 
 /* ISA has count leading zeroes/ones instruction (not implemented).  */
-#define ISA_HAS_CLZ_CLO         (mips_isa == 32                         \
-                                || mips_isa == 64                       \
-                                )
+#define ISA_HAS_CLZ_CLO         ((mips_isa == 32                       \
+                                  || mips_isa == 64                    \
+                                 ) && ! TARGET_MIPS16)
 
 /* ISA has double-word count leading zeroes/ones instruction (not
    implemented).  */
-#define ISA_HAS_DCLZ_DCLO       (mips_isa == 64)
-
+#define ISA_HAS_DCLZ_DCLO       (mips_isa == 64                                \
+                                && ! TARGET_MIPS16)
 
 /* CC1_SPEC causes -mips3 and -mips4 to set -mfp64 and -mgp64; -mips1 or
    -mips2 sets -mfp32 and -mgp32.  This can be overridden by an explicit