* cse.c (cse_reg_info_free_list, cse_reg_info_used_list,

[pf3gnuchains/gcc-fork.git] / gcc / local-alloc.c

diff --git a/gcc/local-alloc.c b/gcc/local-alloc.c
index 64db8c4..10117da 100644 (file)
--- a/gcc/local-alloc.c
+++ b/gcc/local-alloc.c
@@ -67,7 +67,6 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "rtl.h"
 #include "tm_p.h"
 #include "flags.h"
-#include "basic-block.h"
 #include "regs.h"
 #include "function.h"
 #include "insn-config.h"
@@ -1118,7 +1117,8 @@ update_equiv_regs (void)
   /* Clear all dead REGNOs from all basic block's live info.  */
   if (clear_regnos)
     {
-      int j;
+      unsigned j;
+      
       if (clear_regnos > 8)
        {
          FOR_EACH_BB (bb)
@@ -1128,14 +1128,17 @@ update_equiv_regs (void)
            }
        }
       else
-       EXECUTE_IF_SET_IN_REG_SET (&cleared_regs, 0, j,
-         {
-           FOR_EACH_BB (bb)
-             {
-               CLEAR_REGNO_REG_SET (bb->global_live_at_start, j);
-               CLEAR_REGNO_REG_SET (bb->global_live_at_end, j);
-             }
-         });
+       {
+         reg_set_iterator rsi;
+         EXECUTE_IF_SET_IN_REG_SET (&cleared_regs, 0, j, rsi)
+           {
+             FOR_EACH_BB (bb)
+               {
+                 CLEAR_REGNO_REG_SET (bb->global_live_at_start, j);
+                 CLEAR_REGNO_REG_SET (bb->global_live_at_end, j);
+               }
+           }
+       }
     }
 
   /* Clean up.  */
@@ -1311,9 +1314,8 @@ block_alloc (int b)
                  if (hard_reg != NULL_RTX)
                    {
                      if (REG_P (hard_reg)
-                         && IN_RANGE (REGNO (hard_reg),
-                                      0, FIRST_PSEUDO_REGISTER - 1)
-                         && ! call_used_regs[REGNO (hard_reg)])
+                         && REGNO (hard_reg) < FIRST_PSEUDO_REGISTER
+                         && !call_used_regs[REGNO (hard_reg)])
                        continue;
                    }
 
@@ -2008,7 +2010,7 @@ reg_is_born (rtx reg, int birth)
     {
       regno = REGNO (SUBREG_REG (reg));
       if (regno < FIRST_PSEUDO_REGISTER)
-       regno = subreg_hard_regno (reg, 1);
+       regno = subreg_regno (reg);
     }
   else
     regno = REGNO (reg);