This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]

Re: [addrmodes] Move stuff to defaults.h

From: Paolo Bonzini <paolo dot bonzini at lu dot unisi dot ch>
To: GCC Patches <gcc-patches at gcc dot gnu dot org>
Date: Mon, 21 Aug 2006 13:07:34 +0200
Subject: Re: [addrmodes] Move stuff to defaults.h
References: <ecc359$239$1@sea.gmane.org>

Paolo Bonzini wrote:

Now that the logic is simpler, we can move stuff from addresses.h to defaults.h, just like we do for other target macros.

Patch is here. Committed to branch.

Paolo

2006-08-21  Paolo Bonzini  <bonzini@gnu.org>

	* addresses.h (ok_for_base_p_1): Remove, replace with REGNO_MODE_OK_FOR_REG_BASE_P.
	* defaults.h (REGNO_MODE_CODE_OK_FOR_BASE_P): Provide default definition.
	(MODE_CODE_BASE_REG_CLASS): Likewise.

Index: defaults.h
===================================================================
--- defaults.h	(revision 116292)
+++ defaults.h	(revision 116293)
@@ -895,4 +895,21 @@ Software Foundation, 51 Franklin Street,
 #define INCOMING_FRAME_SP_OFFSET 0
 #endif
 
+#ifndef MODE_CODE_BASE_REG_CLASS
+#ifdef MODE_BASE_REG_CLASS
+#define MODE_CODE_BASE_REG_CLASS(MODE, OUTER, INDEX) MODE_BASE_REG_CLASS(MODE)
+#else
+#define MODE_CODE_BASE_REG_CLASS(MODE, OUTER, INDEX) BASE_REG_CLASS
+#endif
+#endif
+
+#ifndef REGNO_MODE_CODE_OK_FOR_BASE_P
+#ifdef REGNO_MODE_OK_FOR_BASE_P(REGNO, MODE, OUTER, INDEX)
+#define REGNO_MODE_CODE_OK_FOR_BASE_P(REGNO, MODE, OUTER, INDEX) REGNO_MODE_OK_FOR_BASE_P (REGNO, MODE)
+#else
+#define REGNO_MODE_CODE_OK_FOR_BASE_P(REGNO, MODE, OUTER, INDEX) REGNO_OK_FOR_BASE_P(REGNO)
+#endif
+#endif
+
+
 #endif  /* ! GCC_DEFAULTS_H */
Index: ChangeLog.addrmodes
===================================================================
--- ChangeLog.addrmodes	(revision 116292)
+++ ChangeLog.addrmodes	(revision 116293)
@@ -1,5 +1,11 @@
 2006-08-21  Paolo Bonzini  <bonzini@gnu.org>
 
+	* addresses.h (ok_for_base_p_1): Remove, replace with REGNO_MODE_OK_FOR_REG_BASE_P.
+	* defaults.h (REGNO_MODE_CODE_OK_FOR_BASE_P): Provide default definition.
+	(MODE_CODE_BASE_REG_CLASS): Likewise.
+
+2006-08-21  Paolo Bonzini  <bonzini@gnu.org>
+
 	* addresses.h (base_reg_class): Stop using MODE_BASE_REG_REG_CLASS.
 	(ok_for_base_p_1): Likewise, stop using REGNO_MODE_OK_FOR_REG_BASE_P.
 
Index: addresses.h
===================================================================
--- addresses.h	(revision 116292)
+++ addresses.h	(revision 116293)
@@ -27,44 +27,16 @@ base_reg_class (enum machine_mode mode A
 		enum rtx_code outer_code ATTRIBUTE_UNUSED,
 		enum rtx_code index_code ATTRIBUTE_UNUSED)
 {
-#ifdef MODE_CODE_BASE_REG_CLASS
   return MODE_CODE_BASE_REG_CLASS (mode, outer_code, index_code);
-#else
-#ifdef MODE_BASE_REG_CLASS
-  return MODE_BASE_REG_CLASS (mode);
-#else
-  return BASE_REG_CLASS;
-#endif
-#endif
-}
-
-/* Wrapper function to unify target macros REGNO_MODE_CODE_OK_FOR_BASE_P,
-   REGNO_MODE_OK_FOR_REG_BASE_P, REGNO_MODE_OK_FOR_BASE_P and
-   REGNO_OK_FOR_BASE_P.
-   Arguments as for the REGNO_MODE_CODE_OK_FOR_BASE_P macro.  */
-
-static inline bool
-ok_for_base_p_1 (unsigned regno, enum machine_mode mode ATTRIBUTE_UNUSED,
-		 enum rtx_code outer_code ATTRIBUTE_UNUSED,
-		 enum rtx_code index_code ATTRIBUTE_UNUSED)
-{
-#ifdef REGNO_MODE_CODE_OK_FOR_BASE_P
-  return REGNO_MODE_CODE_OK_FOR_BASE_P (regno, mode, outer_code, index_code);
-#else
-#ifdef REGNO_MODE_OK_FOR_BASE_P
-  return REGNO_MODE_OK_FOR_BASE_P (regno, mode);
-#else
-  return REGNO_OK_FOR_BASE_P (regno);
-#endif
-#endif
 }
 
-/* Wrapper around ok_for_base_p_1, for use after register allocation is
+/* Wrapper around REGNO_MODE_CODE_OK_FOR_BASE_P, for use after register allocation is
    complete.  Arguments as for the called function.  */
 
 static inline bool
-regno_ok_for_base_p (unsigned regno, enum machine_mode mode,
-		     enum rtx_code outer_code, enum rtx_code index_code)
+regno_ok_for_base_p (unsigned regno, enum machine_mode mode ATTRIBUTE_UNUSED,
+		     enum rtx_code outer_code ATTRIBUTE_UNUSED,
+		     enum rtx_code index_code ATTRIBUTE_UNUSED)
 {
   if (regno >= FIRST_PSEUDO_REGISTER && reg_renumber[regno] >= 0)
     {
@@ -74,15 +46,16 @@ regno_ok_for_base_p (unsigned regno, enu
         return false;
     }
 
-  return ok_for_base_p_1 (regno, mode, outer_code, index_code);
+  return REGNO_MODE_CODE_OK_FOR_BASE_P (regno, mode, outer_code, index_code);
 }
 
-/* Wrapper around ok_for_base_p_1, for use after register allocation is
+/* Wrapper around REGNO_MODE_CODE_OK_FOR_BASE_P, for use after register allocation is
    complete.  Arguments as for the called function.  */
 
 static inline bool
-ok_for_base_p (rtx reg, enum machine_mode mode,
-	       enum rtx_code outer_code, enum rtx_code index_code)
+ok_for_base_p (rtx reg, enum machine_mode mode ATTRIBUTE_UNUSED,
+               enum rtx_code outer_code ATTRIBUTE_UNUSED,
+               enum rtx_code index_code ATTRIBUTE_UNUSED)
 {
   unsigned regno = REGNO (reg);
   if (regno >= FIRST_PSEUDO_REGISTER && reg_renumber[regno] >= 0)
@@ -93,7 +66,7 @@ ok_for_base_p (rtx reg, enum machine_mod
         return false;
     }
 
-  return ok_for_base_p_1 (regno, mode, outer_code, index_code);
+  return REGNO_MODE_CODE_OK_FOR_BASE_P (regno, mode, outer_code, index_code);
 }
 
   
@@ -101,11 +74,12 @@ ok_for_base_p (rtx reg, enum machine_mod
    should count as OK.  Arguments as for regno_ok_for_base_p.  */
 
 static inline bool
-regno_ok_for_base_p_nonstrict (unsigned regno, enum machine_mode mode,
-                               enum rtx_code outer_code, enum rtx_code index_code)
+regno_ok_for_base_p_nonstrict (unsigned regno, enum machine_mode mode ATTRIBUTE_UNUSED,
+	                       enum rtx_code outer_code ATTRIBUTE_UNUSED,
+	                       enum rtx_code index_code ATTRIBUTE_UNUSED)
 {
   return regno >= FIRST_PSEUDO_REGISTER
-	 || ok_for_base_p_1 (regno, mode, outer_code, index_code);
+	 || REGNO_MODE_CODE_OK_FOR_BASE_P (regno, mode, outer_code, index_code);
 }
 
    
@@ -113,15 +87,16 @@ regno_ok_for_base_p_nonstrict (unsigned 
    should count as OK.  Arguments as for regno_ok_for_base_p.  */
 
 static inline bool
-ok_for_base_p_nonstrict (rtx reg, enum machine_mode mode,
-                         enum rtx_code outer_code, enum rtx_code index_code)
+ok_for_base_p_nonstrict (rtx reg, enum machine_mode mode ATTRIBUTE_UNUSED,
+	                 enum rtx_code outer_code ATTRIBUTE_UNUSED,
+	                 enum rtx_code index_code ATTRIBUTE_UNUSED)
 {
   unsigned regno = REGNO (reg);
   if (regno >= FIRST_PSEUDO_REGISTER)
     return true;
 
   return regno >= FIRST_PSEUDO_REGISTER
-         || ok_for_base_p_1 (regno, mode, outer_code, index_code);
+         || REGNO_MODE_CODE_OK_FOR_BASE_P (regno, mode, outer_code, index_code);
 }
 
 /* Wrapper around REGNO_OK_FOR_INDEX_P, for use after register allocation is

Follow-Ups:
- Re: [addrmodes] Move stuff to defaults.h
  - From: Bernd Schmidt

References:
- [addrmodes] Move stuff to defaults.h
  - From: Paolo Bonzini

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]