i386.c (ix86_expand_prologue): If the function uses a frame pointer, restore eax...

	* config/i386/i386.c (ix86_expand_prologue): If the function uses a
	frame pointer, restore eax with an ebp-relative address.

From-SVN: r85595

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 47916a6b899696962cb5cee44946afcf2dbac078..5df219577c69351729c78607fec008b8953ca11a 100644 (file)
--- 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 5b37ea8aeb83e759f96726c206ea468b641a65d8..f05ff5e5ede975b7111609ce0e3e6675335d970d 100644 (file)
--- 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 94e6a7903f446728984f8ee7ce5baaa3622b4515..3eadb5adb43fa0d70d467199eec1276ce5a8be76 100644 (file)
--- 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 (file)
index 0000000..f09fc49
--- /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