i386.h (FIXED_REGISTERS): Update encoding to be -ffixed-reg safe, by preserving the...

	* config/i386/i386.h (FIXED_REGISTERS): Update encoding to be
	-ffixed-reg safe, by preserving the meanings of zero and one.
	(CALL_USED_REGISTERS): Likewise.
	(CONDITIONAL_REGISTER_USAGE): Update to process new encodings.

From-SVN: r86185

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a16eabf0f0787b911959305f30f7a001062b3dd0..89ce5f380fc95f06c121e97ff00b017442b7dd8c 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2004-08-18  Roger Sayle  <roger@eyesopen.com>
+
+       * config/i386/i386.h (FIXED_REGISTERS): Update encoding to be
+       -ffixed-reg safe, by preserving the meanings of zero and one.
+       (CALL_USED_REGISTERS): Likewise.
+       (CONDITIONAL_REGISTER_USAGE): Update to process new encodings.
+
 2004-08-18  Kaz Kojima  <kkojima@gcc.gnu.org>
 
        * config/sh/sh.c (split_branches): Check the result of

diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h
index b4a7ed8bf1eb394c25e23e9d250018261dd4c761..3fdd6197e4f7b0652b0d5ba89398f9154c410204 100644 (file)
--- a/gcc/config/i386/i386.h
+++ b/gcc/config/i386/i386.h
@@ -932,23 +932,25 @@ extern int x86_prefetch_sse;
    and are not available for the register allocator.
    On the 80386, the stack pointer is such, as is the arg pointer.
 
-   The value is a mask - bit 1 is set for fixed registers
-   for 32bit target, while 2 is set for fixed registers for 64bit.
-   Proper value is computed in the CONDITIONAL_REGISTER_USAGE.
+   The value is zero if the register is not fixed on either 32 or
+   64 bit targets, one if the register if fixed on both 32 and 64
+   bit targets, two if it is only fixed on 32bit targets and three
+   if its only fixed on 64bit targets.
+   Proper values are computed in the CONDITIONAL_REGISTER_USAGE.
  */
 #define FIXED_REGISTERS                                                \
 /*ax,dx,cx,bx,si,di,bp,sp,st,st1,st2,st3,st4,st5,st6,st7*/     \
-{  0, 0, 0, 0, 0, 0, 0, 3, 0,  0,  0,  0,  0,  0,  0,  0,      \
+{  0, 0, 0, 0, 0, 0, 0, 1, 0,  0,  0,  0,  0,  0,  0,  0,      \
 /*arg,flags,fpsr,dir,frame*/                                   \
-    3,    3,   3,  3,    3,                                    \
+    1,    1,   1,  1,    1,                                    \
 /*xmm0,xmm1,xmm2,xmm3,xmm4,xmm5,xmm6,xmm7*/                    \
      0,   0,   0,   0,   0,   0,   0,   0,                     \
 /*mmx0,mmx1,mmx2,mmx3,mmx4,mmx5,mmx6,mmx7*/                    \
      0,   0,   0,   0,   0,   0,   0,   0,                     \
 /*  r8,  r9, r10, r11, r12, r13, r14, r15*/                    \
-     1,   1,   1,   1,   1,   1,   1,   1,                     \
+     2,   2,   2,   2,   2,   2,   2,   2,                     \
 /*xmm8,xmm9,xmm10,xmm11,xmm12,xmm13,xmm14,xmm15*/              \
-     1,   1,    1,    1,    1,    1,    1,    1}
+     2,   2,    2,    2,    2,    2,    2,    2}
 
 
 /* 1 for registers not available across function calls.
@@ -958,23 +960,25 @@ extern int x86_prefetch_sse;
    and the register where structure-value addresses are passed.
    Aside from that, you can include as many other registers as you like.
 
-   The value is a mask - bit 1 is set for call used
-   for 32bit target, while 2 is set for call used for 64bit.
-   Proper value is computed in the CONDITIONAL_REGISTER_USAGE.
+   The value is zero if the register is not fixed on either 32 or
+   64 bit targets, one if the register if fixed on both 32 and 64
+   bit targets, two if it is only fixed on 32bit targets and three
+   if its only fixed on 64bit targets.
+   Proper values are computed in the CONDITIONAL_REGISTER_USAGE.
 */
 #define CALL_USED_REGISTERS                                    \
 /*ax,dx,cx,bx,si,di,bp,sp,st,st1,st2,st3,st4,st5,st6,st7*/     \
-{  3, 3, 3, 0, 2, 2, 0, 3, 3,  3,  3,  3,  3,  3,  3,  3,      \
+{  1, 1, 1, 0, 3, 3, 0, 1, 1,  1,  1,  1,  1,  1,  1,  1,      \
 /*arg,flags,fpsr,dir,frame*/                                   \
-     3,   3,   3,  3,    3,                                    \
+     1,   1,   1,  1,    1,                                    \
 /*xmm0,xmm1,xmm2,xmm3,xmm4,xmm5,xmm6,xmm7*/                    \
-     3,   3,   3,   3,   3,  3,    3,   3,                     \
+     1,   1,   1,   1,   1,  1,    1,   1,                     \
 /*mmx0,mmx1,mmx2,mmx3,mmx4,mmx5,mmx6,mmx7*/                    \
-     3,   3,   3,   3,   3,   3,   3,   3,                     \
+     1,   1,   1,   1,   1,   1,   1,   1,                     \
 /*  r8,  r9, r10, r11, r12, r13, r14, r15*/                    \
-     3,   3,   3,   3,   1,   1,   1,   1,                     \
+     1,   1,   1,   1,   2,   2,   2,   2,                     \
 /*xmm8,xmm9,xmm10,xmm11,xmm12,xmm13,xmm14,xmm15*/              \
-     3,   3,    3,    3,    3,    3,    3,    3}               \
+     1,   1,    1,    1,    1,    1,    1,    1}               \
 
 /* Order in which to allocate registers.  Each register must be
    listed once, even those in FIXED_REGISTERS.  List frame pointer
@@ -1004,9 +1008,11 @@ do {                                                                     \
     int i;                                                             \
     for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)                                \
       {                                                                        \
-        fixed_regs[i] = (fixed_regs[i] & (TARGET_64BIT ? 2 : 1)) != 0; \
-        call_used_regs[i] = (call_used_regs[i]                         \
-                            & (TARGET_64BIT ? 2 : 1)) != 0;            \
+       if (fixed_regs[i] > 1)                                          \
+         fixed_regs[i] = (fixed_regs[i] == (TARGET_64BIT ? 3 : 2));    \
+       if (call_used_regs[i] > 1)                                      \
+         call_used_regs[i] = (call_used_regs[i]                        \
+                              == (TARGET_64BIT ? 3 : 2));              \
       }                                                                        \
     if (PIC_OFFSET_TABLE_REGNUM != INVALID_REGNUM)                     \
       {                                                                        \