m32c.h (CLASS_LIKELY_SPILLED_P): Remove.

	* config/m32c/m32c.h (CLASS_LIKELY_SPILLED_P): Remove.
	* config/m32c/m32c-protos.h (m32c_class_likely_spilled_p): Remove.
	* config/m32c/m32c.c (TARGET_CLASS_LIKELY_SPILLED_P): Define.
	(m32c_class_likely_spilled_p): Make static. Change argument type to
	reg_class_t. Change result type to bool.

From-SVN: r163788

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4062f95e144315a49a39ea2dceae42e97ad6dce3..0e34ff74b296f498d5b9f8cc93d60815e36744ed 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-02  Anatoly Sokolov  <aesok@post.ru>
+
+       * config/m32c/m32c.h (CLASS_LIKELY_SPILLED_P): Remove.
+       * config/m32c/m32c-protos.h (m32c_class_likely_spilled_p): Remove.
+       * config/m32c/m32c.c (TARGET_CLASS_LIKELY_SPILLED_P): Define.
+       (m32c_class_likely_spilled_p): Make static. Change argument type to
+       reg_class_t. Change result type to bool.
+
 2010-09-02  Michael Meissner  <meissner@linux.vnet.ibm.com>
 
        * config/rs6000/rs6000.opt (-mfriz): New switch to control whether

diff --git a/gcc/config/m32c/m32c-protos.h b/gcc/config/m32c/m32c-protos.h
index b7061e3358e283af75a73ee594b4cbd810f5d6cb..5d1c3bb9819ca165807cbceb76ef4a78d0955437 100644 (file)
--- a/gcc/config/m32c/m32c-protos.h
+++ b/gcc/config/m32c/m32c-protos.h
@@ -22,7 +22,6 @@
 #define MM enum machine_mode
 #define UINT unsigned int
 
-int  m32c_class_likely_spilled_p (int);
 void m32c_conditional_register_usage (void);
 int  m32c_const_ok_for_constraint_p (HOST_WIDE_INT, char, const char *);
 UINT m32c_dwarf_frame_regnum (int);

diff --git a/gcc/config/m32c/m32c.c b/gcc/config/m32c/m32c.c
index 7be6fce643616961cafb19a3547208744793a422..066d1a8488603807b2af7b35e40771bc721980de 100644 (file)
--- a/gcc/config/m32c/m32c.c
+++ b/gcc/config/m32c/m32c.c
@@ -823,14 +823,19 @@ m32c_secondary_reload_class (int rclass, enum machine_mode mode, rtx x)
   return NO_REGS;
 }
 
-/* Implements CLASS_LIKELY_SPILLED_P.  A_REGS is needed for address
+/* Implements TARGET_CLASS_LIKELY_SPILLED_P.  A_REGS is needed for address
    reloads.  */
-int
-m32c_class_likely_spilled_p (int regclass)
+
+#undef TARGET_CLASS_LIKELY_SPILLED_P
+#define TARGET_CLASS_LIKELY_SPILLED_P m32c_class_likely_spilled_p
+
+static bool
+m32c_class_likely_spilled_p (reg_class_t regclass)
 {
   if (regclass == A_REGS)
-    return 1;
-  return reg_class_size[regclass] == 1;
+    return true;
+
+  return (reg_class_size[(int) regclass] == 1);
 }
 
 /* Implements CLASS_MAX_NREGS.  We calculate this according to its

diff --git a/gcc/config/m32c/m32c.h b/gcc/config/m32c/m32c.h
index e1ba207ffdce051c2a51d876ae064df4184978b8..c0eccb42d4f0f4eae826b469baa84f8c485c0bbc 100644 (file)
--- a/gcc/config/m32c/m32c.h
+++ b/gcc/config/m32c/m32c.h
@@ -421,8 +421,6 @@ enum reg_class
 
 #define TARGET_SMALL_REGISTER_CLASSES_FOR_MODE_P hook_bool_mode_true
 
-#define CLASS_LIKELY_SPILLED_P(C) m32c_class_likely_spilled_p (C)
-
 #define CLASS_MAX_NREGS(C,M) m32c_class_max_nregs (C, M)
 
 #define CANNOT_CHANGE_MODE_CLASS(F,T,C) m32c_cannot_change_mode_class(F,T,C)