i386.h (CONDITIONAL_REGISTER_USAGE): Do not shadow "i" variable.

	* config/i386/i386.h (CONDITIONAL_REGISTER_USAGE): Do not
	shadow "i" variable.

From-SVN: r144532

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cada14d8be444e5baa38a05a4e90df658c629ac4..213a5dc7e0085cec15842547738866072d70cdd5 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-01  Uros Bizjak  <ubizjak@gmail.com>
+
+       * config/i386/i386.h (CONDITIONAL_REGISTER_USAGE): Do not
+       shadow "i" variable.
+
 2009-03-01  Richard Guenther  <rguenther@suse.de>
 
        PR tree-optimization/39331

diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h
index 7600a4563f3203db6a337273953d1b4de18f9407..aa46097f39ef29d7cb48e6b063de8aba007d2ba9 100644 (file)
--- a/gcc/config/i386/i386.h
+++ b/gcc/config/i386/i386.h
@@ -934,46 +934,37 @@ do {                                                                      \
     j = PIC_OFFSET_TABLE_REGNUM;                                       \
     if (j != INVALID_REGNUM)                                           \
       {                                                                        \
-       fixed_regs[j] = 1;                                              \
-       call_used_regs[j] = 1;                                          \
+       fixed_regs[j] = call_used_regs[j] = 1;                          \
       }                                                                        \
     if (TARGET_64BIT                                                   \
-        && ((cfun && cfun->machine->call_abi == MS_ABI)                        \
-            || (!cfun && DEFAULT_ABI == MS_ABI)))                      \
+       && ((cfun && cfun->machine->call_abi == MS_ABI)                 \
+           || (!cfun && DEFAULT_ABI == MS_ABI)))                       \
       {                                                                        \
-        int i;                                                         \
-        call_used_regs[4 /*RSI*/] = 0;                                  \
-        call_used_regs[5 /*RDI*/] = 0;                                  \
+       call_used_regs[4 /*RSI*/] = 0;                                  \
+       call_used_regs[5 /*RDI*/] = 0;                                  \
        for (i = 0; i < 8; i++)                                         \
          call_used_regs[45+i] = 0;                                     \
-       call_used_regs[27] = call_used_regs[28] = 0;                    \
+       call_used_regs[27 /*XMM6*/] = 0;                                \
+       call_used_regs[28 /*XMM7*/] = 0;                                \
       }                                                                        \
     if (! TARGET_MMX)                                                  \
-      {                                                                        \
-       int i;                                                          \
-        for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)                    \
-          if (TEST_HARD_REG_BIT (reg_class_contents[(int)MMX_REGS], i))        \
-           fixed_regs[i] = call_used_regs[i] = 1, reg_names[i] = "";   \
-      }                                                                        \
+      for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)                      \
+       if (TEST_HARD_REG_BIT (reg_class_contents[(int)MMX_REGS], i))   \
+         fixed_regs[i] = call_used_regs[i] = 1, reg_names[i] = "";     \
     if (! TARGET_SSE)                                                  \
+      for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)                      \
+       if (TEST_HARD_REG_BIT (reg_class_contents[(int)SSE_REGS], i))   \
+         fixed_regs[i] = call_used_regs[i] = 1, reg_names[i] = "";     \
+    if (! (TARGET_80387 || TARGET_FLOAT_RETURNS_IN_80387))             \
       {                                                                        \
-       int i;                                                          \
-        for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)                    \
-          if (TEST_HARD_REG_BIT (reg_class_contents[(int)SSE_REGS], i))        \
-           fixed_regs[i] = call_used_regs[i] = 1, reg_names[i] = "";   \
-      }                                                                        \
-    if (! TARGET_80387 && ! TARGET_FLOAT_RETURNS_IN_80387)             \
-      {                                                                        \
-       int i;                                                          \
        HARD_REG_SET x;                                                 \
-        COPY_HARD_REG_SET (x, reg_class_contents[(int)FLOAT_REGS]);    \
-        for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)                    \
-          if (TEST_HARD_REG_BIT (x, i))                                \
+       COPY_HARD_REG_SET (x, reg_class_contents[(int)FLOAT_REGS]);     \
+       for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)                     \
+         if (TEST_HARD_REG_BIT (x, i))                                 \
            fixed_regs[i] = call_used_regs[i] = 1, reg_names[i] = "";   \
       }                                                                        \
     if (! TARGET_64BIT)                                                        \
       {                                                                        \
-       int i;                                                          \
        for (i = FIRST_REX_INT_REG; i <= LAST_REX_INT_REG; i++)         \
          reg_names[i] = "";                                            \
        for (i = FIRST_REX_SSE_REG; i <= LAST_REX_SSE_REG; i++)         \