gcc/fortran:

[pf3gnuchains/gcc-fork.git] / gcc / caller-save.c

diff --git a/gcc/caller-save.c b/gcc/caller-save.c
index 54f88a1..a5cd2e3 100644 (file)
--- a/gcc/caller-save.c
+++ b/gcc/caller-save.c
@@ -36,6 +36,7 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
 #include "toplev.h"
 #include "tm_p.h"
 #include "addresses.h"
+#include "df.h"
 
 #ifndef MAX_MOVE_MAX
 #define MAX_MOVE_MAX MOVE_MAX
@@ -189,8 +190,8 @@ init_caller_save (void)
   savepat = gen_rtx_SET (VOIDmode, test_mem, test_reg);
   restpat = gen_rtx_SET (VOIDmode, test_reg, test_mem);
 
-  saveinsn = gen_rtx_INSN (VOIDmode, 0, 0, 0, 0, 0, savepat, -1, 0, 0);
-  restinsn = gen_rtx_INSN (VOIDmode, 0, 0, 0, 0, 0, restpat, -1, 0, 0);
+  saveinsn = gen_rtx_INSN (VOIDmode, 0, 0, 0, 0, 0, savepat, -1, 0);
+  restinsn = gen_rtx_INSN (VOIDmode, 0, 0, 0, 0, 0, restpat, -1, 0);
 
   for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
     for (mode = 0 ; mode < MAX_MACHINE_MODE; mode++)
@@ -200,7 +201,7 @@ init_caller_save (void)
 
          /* Update the register number and modes of the register
             and memory operand.  */
-         REGNO (test_reg) = i;
+         SET_REGNO (test_reg, i);
          PUT_MODE (test_reg, mode);
          PUT_MODE (test_mem, mode);
 
@@ -296,7 +297,7 @@ setup_save_areas (void)
       {
        unsigned int regno = reg_renumber[i];
        unsigned int endregno
-         = regno + hard_regno_nregs[regno][GET_MODE (regno_reg_rtx[i])];
+         = end_hard_regno (GET_MODE (regno_reg_rtx[i]), regno);
 
        for (r = regno; r < endregno; r++)
          if (call_used_regs[r])
@@ -407,7 +408,9 @@ save_call_clobbered_regs (void)
                  regno += insert_restore (chain, 1, regno, MOVE_MAX_WORDS, save_mode);
            }
 
-         if (code == CALL_INSN && ! find_reg_note (insn, REG_NORETURN, NULL))
+         if (code == CALL_INSN
+             && ! SIBLING_CALL_P (insn)
+             && ! find_reg_note (insn, REG_NORETURN, NULL))
            {
              unsigned regno;
              HARD_REG_SET hard_regs_to_save;
@@ -450,11 +453,6 @@ save_call_clobbered_regs (void)
                 during the call, but the subreg that is set isn't.  */
              CLEAR_HARD_REG_SET (this_insn_sets);
              note_stores (PATTERN (insn), mark_set_regs, &this_insn_sets);
-             /* Sibcalls are considered to set the return value,
-                compare flow.c:propagate_one_insn.  */
-             if (SIBLING_CALL_P (insn) && current_function_return_rtx)
-               mark_set_regs (current_function_return_rtx, NULL_RTX,
-                              &this_insn_sets);
 
              /* Compute which hard regs must be saved before this call.  */
              AND_COMPL_HARD_REG_SET (hard_regs_to_save, call_fixed_reg_set);
@@ -499,7 +497,6 @@ static void
 mark_set_regs (rtx reg, rtx setter ATTRIBUTE_UNUSED, void *data)
 {
   int regno, endregno, i;
-  enum machine_mode mode = GET_MODE (reg);
   HARD_REG_SET *this_insn_sets = data;
 
   if (GET_CODE (reg) == SUBREG)
@@ -514,7 +511,7 @@ mark_set_regs (rtx reg, rtx setter ATTRIBUTE_UNUSED, void *data)
           && REGNO (reg) < FIRST_PSEUDO_REGISTER)
     {
       regno = REGNO (reg);
-      endregno = regno + hard_regno_nregs[regno][mode];
+      endregno = END_HARD_REGNO (reg);
     }
   else
     return;
@@ -554,7 +551,7 @@ add_stored_regs (rtx reg, rtx setter, void *data)
        return;
 
       regno = REGNO (reg) + offset;
-      endregno = regno + hard_regno_nregs[regno][mode];
+      endregno = end_hard_regno (mode, regno);
     }
 
   for (i = regno; i < endregno; i++)
@@ -601,11 +598,7 @@ mark_referenced_regs (rtx x)
                       : reg_renumber[regno]);
 
       if (hardregno >= 0)
-       {
-         int nregs = hard_regno_nregs[hardregno][GET_MODE (x)];
-         while (nregs-- > 0)
-           SET_HARD_REG_BIT (referenced_regs, hardregno + nregs);
-       }
+       add_to_hard_reg_set (&referenced_regs, GET_MODE (x), hardregno);
       /* If this is a pseudo that did not get a hard register, scan its
         memory location, since it might involve the use of another
         register, which might be saved.  */