[ColdFire 10/63] Rename TARGET_68040_ONLY to TARGET_68040

Richard Sandiford richard@codesourcery.com
Wed Jan 10 10:55:00 GMT 2007


At this point in the series, we've got rid of the architecture MASK_*s
and added TUNE_* macros.  TARGET_68040_ONLY can now be called TARGET_68040,
for consistency with the other ISA macros.

Richard


gcc/
200x-xx-xx  Julian Brown  <julian@codesourcery.com>

	* config/m68k/m68k.h: Use TARGET_68040 instead of TARGET_68040_ONLY.
	(TARGET_68040_ONLY): Rename to...
	(TARGET_68040): ...this.
	* config/m68k/m68k.c: Use TARGET_68040 instead of TARGET_68040_ONLY.
	* config/m68k/m68k.md: Likewise.

Index: gcc/config/m68k/m68k.h
===================================================================
--- gcc/config/m68k/m68k.h	2007-01-09 15:01:52.000000000 +0000
+++ gcc/config/m68k/m68k.h	2007-01-09 15:01:53.000000000 +0000
@@ -67,7 +67,7 @@ #define TARGET_CPU_CPP_BUILTINS()					\
     {									\
       builtin_define ("__m68k__");					\
       builtin_define_std ("mc68000");					\
-      if (TARGET_68040_ONLY)						\
+      if (TARGET_68040)							\
 	{								\
 	  if (TUNE_68060)						\
 	    builtin_define_std ("mc68060");				\
@@ -182,7 +182,7 @@ #define FL_MMU 	     0   /* Used by mult
 
 #define TARGET_68010		((m68k_cpu_flags & FL_ISA_68010) != 0)
 #define TARGET_68020		((m68k_cpu_flags & FL_ISA_68020) != 0)
-#define TARGET_68040_ONLY	((m68k_cpu_flags & FL_ISA_68040) != 0)
+#define TARGET_68040		((m68k_cpu_flags & FL_ISA_68040) != 0)
 #define TARGET_COLDFIRE		((m68k_cpu_flags & FL_COLDFIRE) != 0)
 #define TARGET_COLDFIRE_FPU	(m68k_fpu == FPUTYPE_COLDFIRE)
 #define TARGET_68881		(m68k_fpu == FPUTYPE_68881)
@@ -220,7 +220,7 @@ #define LONG_DOUBLE_TYPE_SIZE 80
 /* Set the value of FLT_EVAL_METHOD in float.h.  When using 68040 fp
    instructions, we get proper intermediate rounding, otherwise we
    get extended precision results.  */
-#define TARGET_FLT_EVAL_METHOD ((TARGET_68040_ONLY || ! TARGET_68881) ? 0 : 2)
+#define TARGET_FLT_EVAL_METHOD ((TARGET_68040 || ! TARGET_68881) ? 0 : 2)
 
 #define BITS_BIG_ENDIAN 1
 #define BYTES_BIG_ENDIAN 1
Index: gcc/config/m68k/m68k.c
===================================================================
--- gcc/config/m68k/m68k.c	2007-01-09 15:01:52.000000000 +0000
+++ gcc/config/m68k/m68k.c	2007-01-09 15:01:53.000000000 +0000
@@ -3086,12 +3086,12 @@ print_operand (FILE *file, rtx op, int l
     asm_fprintf (file, "%Rfpcr");
   else if (letter == '$')
     {
-      if (TARGET_68040_ONLY)
+      if (TARGET_68040)
 	fprintf (file, "s");
     }
   else if (letter == '&')
     {
-      if (TARGET_68040_ONLY)
+      if (TARGET_68040)
 	fprintf (file, "d");
     }
   else if (letter == '/')
Index: gcc/config/m68k/m68k.md
===================================================================
--- gcc/config/m68k/m68k.md	2007-01-09 15:01:49.000000000 +0000
+++ gcc/config/m68k/m68k.md	2007-01-09 15:01:53.000000000 +0000
@@ -1659,7 +1659,7 @@ (define_insn ""
   [(set (match_operand:SF 0 "nonimmediate_operand" "=f")
 	(float_truncate:SF
 	  (match_operand:DF 1 "general_operand" "fmG")))]
-  "TARGET_68881 && TARGET_68040_ONLY"
+  "TARGET_68881 && TARGET_68040"
 {
   if (FP_REG_P (operands[1]))
     return "f%$move%.x %1,%0";
@@ -2834,7 +2834,7 @@ (define_insn "mul<mode>3_floatsi_68881"
 		 (match_operand:FP 1 "general_operand" "0")))]
   "TARGET_68881"
 {
-  return TARGET_68040_ONLY
+  return TARGET_68040
 	 ? "f<FP:round>mul%.l %2,%0"
 	 : "f<FP:round_mul>mul%.l %2,%0";
 })
@@ -2845,7 +2845,7 @@ (define_insn "mul<mode>3_floathi_68881"
 		 (match_operand:FP 1 "general_operand" "0")))]
   "TARGET_68881"
 {
-  return TARGET_68040_ONLY
+  return TARGET_68040
 	 ? "f<FP:round>mul%.w %2,%0"
 	 : "f<FP:round_mul>mul%.w %2,%0";
 })
@@ -2856,7 +2856,7 @@ (define_insn "mul<mode>3_floatqi_68881"
 		 (match_operand:FP 1 "general_operand" "0")))]
   "TARGET_68881"
 {
-  return TARGET_68040_ONLY
+  return TARGET_68040
 	 ? "f<FP:round>mul%.b %2,%0"
 	 : "f<FP:round_mul>mul%.b %2,%0";
 })
@@ -2886,10 +2886,10 @@ (define_insn "mulsf_68881"
   "TARGET_68881"
 {
   if (FP_REG_P (operands[2]))
-    return (TARGET_68040_ONLY
+    return (TARGET_68040
 	    ? "fsmul%.x %2,%0"
 	    : "fsglmul%.x %2,%0");
-  return (TARGET_68040_ONLY
+  return (TARGET_68040
 	  ? "fsmul%.s %f2,%0"
 	  : "fsglmul%.s %f2,%0");
 })
@@ -2929,7 +2929,7 @@ (define_insn "div<mode>3_floatsi_68881"
 		(float:FP (match_operand:SI 2 "general_operand" "dmi"))))]
   "TARGET_68881"
 {
-  return TARGET_68040_ONLY
+  return TARGET_68040
 	 ? "f<FP:round>div%.l %2,%0"
 	 : "f<FP:round_mul>div%.l %2,%0";
 })
@@ -2940,7 +2940,7 @@ (define_insn "div<mode>3_floathi_68881"
 		(float:FP (match_operand:HI 2 "general_operand" "dmn"))))]
   "TARGET_68881"
 {
-  return TARGET_68040_ONLY
+  return TARGET_68040
 	 ? "f<FP:round>div%.w %2,%0"
 	 : "f<FP:round_mul>div%.w %2,%0";
 })
@@ -2951,7 +2951,7 @@ (define_insn "div<mode>3_floatqi_68881"
 		(float:FP (match_operand:QI 2 "general_operand" "dmn"))))]
   "TARGET_68881"
 {
-  return TARGET_68040_ONLY
+  return TARGET_68040
 	 ? "f<FP:round>div%.b %2,%0"
 	 : "f<FP:round_mul>div%.b %2,%0";
 })
@@ -2963,10 +2963,10 @@ (define_insn "div<mode>3_68881"
   "TARGET_68881"
 {
   if (FP_REG_P (operands[2]))
-    return (TARGET_68040_ONLY
+    return (TARGET_68040
 	    ? "f<FP:round>div%.x %2,%0"
 	    : "f<FP:round_mul>div%.x %2,%0");
-  return (TARGET_68040_ONLY
+  return (TARGET_68040
 	  ? "f<FP:round>div%.<FP:prec> %f2,%0"
 	  : "f<FP:round_mul>div%.<FP:prec> %f2,%0");
 })



More information about the Gcc-patches mailing list