Define x86 CALL_USED_REGISTERS_MASK

Define x86 CALL_USED_REGISTERS_MASK used on x86 CALL_USED_REGISTERS.

	* config/i386/i386.c (ix86_conditional_register_usage): Use
	CALL_USED_REGISTERS_MASK.
	* config/i386/i386.h (CALL_USED_REGISTERS_MASK): New macro.

From-SVN: r228568

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7d578791196fef92f704684c6b58b8c79aadc5d1..ea7d4167802291ab788ea61575797d2c791d5b68 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2015-10-07  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * config/i386/i386.c (ix86_conditional_register_usage): Use
+       CALL_USED_REGISTERS_MASK.
+       * config/i386/i386.h (CALL_USED_REGISTERS_MASK): New macro.
+
 2015-10-07  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR bootstrap/67385

diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index c44f0af9528c1843924514bf2e45a5edf6297845..c5ebff5eaaff508286f26b5a2b89a4c64067a9a6 100644 (file)
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -5583,9 +5583,7 @@ ix86_conditional_register_usage (void)
     }
 
   /*  See the definition of CALL_USED_REGISTERS in i386.h.  */
-  c_mask = (TARGET_64BIT_MS_ABI ? (1 << 3)
-           : TARGET_64BIT ? (1 << 2)
-           : (1 << 1));
+  c_mask = CALL_USED_REGISTERS_MASK (TARGET_64BIT_MS_ABI);
   
   CLEAR_HARD_REG_SET (reg_class_contents[(int)CLOBBERED_REGS]);
 

diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h
index a24dea544c676830eca6329ed8889d6df43f335a..ad17460885091175bc27dc99317304c38e18ac15 100644 (file)
--- a/gcc/config/i386/i386.h
+++ b/gcc/config/i386/i386.h
@@ -1018,6 +1018,9 @@ extern const char *host_detect_local_cpu (int argc, const char **argv);
 
    Proper values are computed in TARGET_CONDITIONAL_REGISTER_USAGE.  */
 
+#define CALL_USED_REGISTERS_MASK(IS_64BIT_MS_ABI) \
+  ((IS_64BIT_MS_ABI) ? (1 << 3) : TARGET_64BIT ? (1 << 2) : (1 << 1))
+
 #define CALL_USED_REGISTERS                                    \
 /*ax,dx,cx,bx,si,di,bp,sp,st,st1,st2,st3,st4,st5,st6,st7*/     \
 {  1, 1, 1, 0, 4, 4, 0, 1, 1,  1,  1,  1,  1,  1,  1,  1,      \