reload1.c (eliminate_regs_in_insn): Handle another case when eliminating the frame...

        * reload1.c (eliminate_regs_in_insn): Handle another case when
        eliminating the frame pointer to the hard frame pointer.  Add
        missing ep->to_rtx check to one existing case.

From-SVN: r21705

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c78c4d6a9462b73e2db601c7da409183033693d9..d8d68618cbfe4dc57ad16e27f06402125a52cc08 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
 Thu Aug 13 20:14:40 1998  Jim Wilson  <wilson@cygnus.com>
 
+       * reload1.c (eliminate_regs_in_insn): Handle another case when
+       eliminating the frame pointer to the hard frame pointer.  Add
+       missing ep->to_rtx check to one existing case.
+
        * mips/mips.md (movhi_internal2+2): Fix typo mem:SI -> mem:HI.
 
 Thu Aug 13 17:08:11 1998  Jason Merrill  <jason@yorick.cygnus.com>

diff --git a/gcc/reload1.c b/gcc/reload1.c
index 2755ee6273c5c135325c6e64179997e60fd782ea..239afd82df0f818eed40bd172f02e443addc58da 100644 (file)
--- a/gcc/reload1.c
+++ b/gcc/reload1.c
@@ -3416,8 +3416,13 @@ eliminate_regs_in_insn (insn, replace)
                if (src == ep->to_rtx)
                  offset = 0, ok = 1;
                else if (GET_CODE (src) == PLUS
-                        && GET_CODE (XEXP (src, 0)) == CONST_INT)
+                        && GET_CODE (XEXP (src, 0)) == CONST_INT
+                        && XEXP (src, 1) == ep->to_rtx)
                  offset = INTVAL (XEXP (src, 0)), ok = 1;
+               else if (GET_CODE (src) == PLUS
+                        && GET_CODE (XEXP (src, 1)) == CONST_INT
+                        && XEXP (src, 0) == ep->to_rtx)
+                 offset = INTVAL (XEXP (src, 1)), ok = 1;
                else if ((prev_insn = prev_nonnote_insn (insn)) != 0
                         && (prev_set = single_set (prev_insn)) != 0
                         && rtx_equal_p (SET_DEST (prev_set), src))