2004-02-17 Andrew Pinski <pinskia@physics.uc.edu>

[pf3gnuchains/gcc-fork.git] / gcc / cfgcleanup.c

diff --git a/gcc/cfgcleanup.c b/gcc/cfgcleanup.c
index 52d5819..38a2915 100644 (file)
--- a/gcc/cfgcleanup.c
+++ b/gcc/cfgcleanup.c
@@ -48,6 +48,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "params.h"
 #include "tm_p.h"
 #include "target.h"
+#include "regs.h"
 
 /* cleanup_cfg maintains following flags for each basic block.  */
 
@@ -194,8 +195,8 @@ try_simplify_condjump (basic_block cbranch_block)
        }
     }
   /* Delete the block with the unconditional jump, and clean up the mess.  */
-  delete_block (jump_block);
-  tidy_fallthru_edge (cbranch_jump_edge, cbranch_block, cbranch_dest_block);
+  delete_basic_block (jump_block);
+  tidy_fallthru_edge (cbranch_jump_edge);
 
   return true;
 }
@@ -220,7 +221,7 @@ mark_effect (rtx exp, regset nonequal)
          CLEAR_REGNO_REG_SET (nonequal, regno);
          if (regno < FIRST_PSEUDO_REGISTER)
            {
-             int n = HARD_REGNO_NREGS (regno, GET_MODE (dest));
+             int n = hard_regno_nregs[regno][GET_MODE (dest)];
              while (--n > 0)
                CLEAR_REGNO_REG_SET (nonequal, regno + n);
            }
@@ -239,7 +240,7 @@ mark_effect (rtx exp, regset nonequal)
       SET_REGNO_REG_SET (nonequal, regno);
       if (regno < FIRST_PSEUDO_REGISTER)
        {
-         int n = HARD_REGNO_NREGS (regno, GET_MODE (dest));
+         int n = hard_regno_nregs[regno][GET_MODE (dest)];
          while (--n > 0)
            SET_REGNO_REG_SET (nonequal, regno + n);
        }
@@ -265,7 +266,7 @@ mentions_nonequal_regs (rtx *x, void *data)
        return 1;
       if (regno < FIRST_PSEUDO_REGISTER)
        {
-         int n = HARD_REGNO_NREGS (regno, GET_MODE (*x));
+         int n = hard_regno_nregs[regno][GET_MODE (*x)];
          while (--n > 0)
            if (REGNO_REG_SET_P (nonequal, regno + n))
              return 1;
@@ -1530,7 +1531,7 @@ try_crossjump_to_edge (int mode, edge e1, edge e2)
   to_remove = redirect_from->succ->dest;
 
   redirect_edge_and_branch_force (redirect_from->succ, redirect_to);
-  delete_block (to_remove);
+  delete_basic_block (to_remove);
 
   update_forwarder_flag (redirect_from);
 
@@ -1694,7 +1695,7 @@ try_optimize_cfg (int mode)
                    fprintf (rtl_dump_file, "Deleting block %i.\n",
                             b->index);
 
-                 delete_block (b);
+                 delete_basic_block (b);
                  if (!(mode & CLEANUP_CFGLAYOUT))
                    changed = true;
                  b = c;
@@ -1755,7 +1756,7 @@ try_optimize_cfg (int mode)
 
                  c = b->prev_bb == ENTRY_BLOCK_PTR ? b->next_bb : b->prev_bb;
                  redirect_edge_succ_nodup (b->pred, b->succ->dest);
-                 delete_block (b);
+                 delete_basic_block (b);
                  changed = true;
                  b = c;
                }
@@ -1873,7 +1874,7 @@ delete_unreachable_blocks (void)
 
       if (!(b->flags & BB_REACHABLE))
        {
-         delete_block (b);
+         delete_basic_block (b);
          changed = true;
        }
     }