From b17e42301f9d1dfa8879d66fce0c87ac7722ae5d Mon Sep 17 00:00:00 2001
From: rsandifo <rsandifo@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 5 Aug 2004 07:13:56 +0000
Subject: [PATCH] 	* config/i386/i386.c (ix86_expand_prologue): If the
 function uses a 	frame pointer, restore eax with an ebp-relative
 address.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@85595 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/ChangeLog                                    |  5 ++++
 gcc/config/i386/i386.c                           |  9 ++++++-
 gcc/testsuite/ChangeLog                          |  4 +++
 gcc/testsuite/gcc.c-torture/execute/20040805-1.c | 31 ++++++++++++++++++++++++
 4 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/gcc.c-torture/execute/20040805-1.c

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 47916a6b899..5df219577c6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-05  Richard Sandiford  <rsandifo@redhat.com>
+
+	* config/i386/i386.c (ix86_expand_prologue): If the function uses a
+	frame pointer, restore eax with an ebp-relative address.
+
 2004-08-04  Geoffrey Keating  <geoffk@apple.com>
 
 	PR 14516
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 5b37ea8aeb8..f05ff5e5ede 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -5399,7 +5399,14 @@ ix86_expand_prologue (void)
 
       if (eax_live)
 	{
-	  rtx t = plus_constant (stack_pointer_rtx, allocate);
+	  rtx t;
+	  if (frame_pointer_needed)
+	    t = plus_constant (hard_frame_pointer_rtx,
+			       allocate
+			       - frame.to_allocate
+			       - frame.nregs * UNITS_PER_WORD);
+	  else
+	    t = plus_constant (stack_pointer_rtx, allocate);
 	  emit_move_insn (eax, gen_rtx_MEM (SImode, t));
 	}
     }
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 94e6a7903f4..3eadb5adb43 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-05  Richard Sandiford  <rsandifo@redhat.com>
+
+	* gcc.c-torture/execute/20040805-1.c: New test.
+
 2004-08-04  Andrew Pinski  <pinskia@physics.uc.edu>
 
 	* gcc.dg/20020118-1.c: Declare abort.
diff --git a/gcc/testsuite/gcc.c-torture/execute/20040805-1.c b/gcc/testsuite/gcc.c-torture/execute/20040805-1.c
new file mode 100644
index 00000000000..f09fc49a268
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/execute/20040805-1.c
@@ -0,0 +1,31 @@
+#if __INT_MAX__ < 32768 || (defined(STACK_SIZE) && STACK_SIZE < 0x12000)
+int main () { exit (0); }
+#else
+int a[2] = { 2, 3 };
+
+static int __attribute__((noinline))
+bar (int x, void *b)
+{
+  a[0]++;
+  return x;
+}
+
+static int __attribute__((noinline))
+foo (int x)
+{
+  char buf[0x10000];
+  int y = a[0];
+  a[1] = y;
+  x = bar (x, buf);
+  y = bar (y, buf);
+  return x + y;
+}
+
+int
+main ()
+{
+  if (foo (100) != 102)
+    abort ();
+  exit (0);
+}
+#endif
-- 
2.11.4.GIT