Revert previous delta

From-SVN: r27166

gcc/ChangeLog

+Wed May 26 08:49:31 1999  Nick Clifton  <nickc@cygnus.com>
+
+	* flow.c: Revert previous delta.
+
 Wed May 26 06:05:10 1999  Nick Clifton  <nickc@cygnus.com>
 
 	* flow.c (insn_dead_p): Check against frame_pointer_rtx not

gcc/flow.c

@@ -2957,7 +2957,7 @@ insn_dead_p (x, needed, call_ok, notes)
 	  /* Don't delete insns to set global regs.  */
 	  if ((regno < FIRST_PSEUDO_REGISTER && global_regs[regno])
 	      /* Make sure insns to set frame pointer aren't deleted.  */
-	      || r == frame_pointer_rtx
+	      || regno == FRAME_POINTER_REGNUM
 #if FRAME_POINTER_REGNUM != HARD_FRAME_POINTER_REGNUM
 	      || regno == HARD_FRAME_POINTER_REGNUM
 #endif
@@ -3268,8 +3268,7 @@ mark_set_1 (needed, dead, x, insn, significant)
     mem_set_list = gen_rtx_EXPR_LIST (VOIDmode, reg, mem_set_list);
 
   if (GET_CODE (reg) == REG
-      && reg != frame_pointer_rtx
-      && (regno = REGNO (reg), 1)
+      && (regno = REGNO (reg), regno != FRAME_POINTER_REGNUM)
 #if FRAME_POINTER_REGNUM != HARD_FRAME_POINTER_REGNUM
       && regno != HARD_FRAME_POINTER_REGNUM
 #endif
@@ -3734,7 +3733,7 @@ mark_used_regs (needed, live, x, final, insn)
 #if FRAME_POINTER_REGNUM != ARG_POINTER_REGNUM
 		|| (regno == ARG_POINTER_REGNUM && fixed_regs[regno])
 #endif
-		|| (x == frame_pointer_rtx))
+		|| regno == FRAME_POINTER_REGNUM)
 	      {
 		/* If this is a register we are going to try to eliminate,
 		   don't mark it live here.  If we are successful in
@@ -3910,8 +3909,7 @@ mark_used_regs (needed, live, x, final, insn)
 	if ((GET_CODE (testreg) == PARALLEL
 	     && GET_MODE (testreg) == BLKmode)
 	    || (GET_CODE (testreg) == REG
-		&& testreg != frame_pointer_rtx
-		&& (regno = REGNO (testreg), 1)
+		&& (regno = REGNO (testreg), regno != FRAME_POINTER_REGNUM)
 #if FRAME_POINTER_REGNUM != HARD_FRAME_POINTER_REGNUM
 		&& regno != HARD_FRAME_POINTER_REGNUM
 #endif