* gdb.arch/i386-prologue.exp: Add testcase for PR breakpoints/2080.

3 files changed, 58 insertions, 2 deletions

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index ee17900db20..dfcae4987de 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2006-02-13  Mark Kettenis  <kettenis@gnu.org>
+
+	* gdb.arch/i386-prologue.exp: Add testcase for PR breakpoints/2080.
+
 2006-02-13  Jim Blandy  <jimb@redhat.com>
 
 	* gdb.base/scope.exp (test_at_main): Remove logic to handle the
diff --git a/gdb/testsuite/gdb.arch/i386-prologue.c b/gdb/testsuite/gdb.arch/i386-prologue.c
index e6846576fde..1ce8b68fd7c 100644
--- a/gdb/testsuite/gdb.arch/i386-prologue.c
+++ b/gdb/testsuite/gdb.arch/i386-prologue.c
@@ -1,6 +1,6 @@
 /* Unwinder test program.
 
-   Copyright 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -34,6 +34,7 @@ int
 main (void)
 {
   standard ();
+  stack_align ();
   gdb1253 ();
   gdb1718 ();
   gdb1338 ();
@@ -110,3 +111,20 @@ asm(".text\n"
     "    movl  %ebp,%esp\n"
     "    popl  %ebp\n"
     "    ret\n");
+
+asm(".text\n"
+    "    .align 8\n"
+    SYMBOL (stack_align) ":\n"
+    "    leal  4(%esp), %ecx\n"
+    "    andl  $-16, %esp\n"
+    "    pushl -4(%ecx)\n"
+    "    pushl %ebp\n"
+    "    movl  %esp, %ebp\n"
+    "    pushl %edi\n"
+    "    pushl %ecx\n"
+    "    int   $0x03\n"
+    "    popl  %ecx\n"
+    "    popl  %edi\n"
+    "    popl  %ebp\n"
+    "    leal  -4(%ecx), %esp\n"
+    "    ret\n");
diff --git a/gdb/testsuite/gdb.arch/i386-prologue.exp b/gdb/testsuite/gdb.arch/i386-prologue.exp
index 48aad1c13ae..39f2a6dfd95 100644
--- a/gdb/testsuite/gdb.arch/i386-prologue.exp
+++ b/gdb/testsuite/gdb.arch/i386-prologue.exp
@@ -1,4 +1,4 @@
-# Copyright 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -93,6 +93,38 @@ gdb_test "info frame" \
 	".*Saved registers:.*ebp at.*edi at.*eip at.*" \
 	"saved registers in standard"
 
+
+# Testcase from breakpoints/2080.
+
+gdb_test "break *(stack_align + 7)" \
+	"Breakpoint \[0-9\]* at $hex"
+
+gdb_test "continue" \
+	"Breakpoint \[0-9\]*.*stack_align.*" \
+	"continue to stack_align + 7"
+
+setup_kfail *-*-* gdb/2080
+gdb_test "backtrace 10" \
+	"#0\[ \t\]*$hex in stack_align.*\r\n#1\[ \t\]*$hex in main.*" \
+	"first backtrace in stack_align"
+
+gdb_test "continue" \
+	"Program received signal SIGTRAP.*" \
+	"continue in stack_align"
+
+skip_breakpoint stack_align
+
+setup_kfail *-*-* gdb/2080
+gdb_test "backtrace 10" \
+	"#0\[ \t\]*$hex in stack_align.*\r\n#1\[ \t\]*$hex in main.*" \
+	"second backtrace in stack_align"
+
+setup_kfail *-*-* gdb/2080
+gdb_test "info frame" \
+	".*Saved registers:.*ecx at.*ebp at.*edi at.*eip at.*" \
+	"saved registers in stack_align"
+
+
 # Testcase from symtab/1253.
 
 gdb_test "continue" "Program received signal SIGTRAP.*" "continue to gdb1253"
@@ -107,6 +139,7 @@ gdb_test "info frame" \
 	".*Saved registers:.*ebp at.*edi at.*eip at.*" \
 	"saved registers in gdb1253"
 
+
 # Testcase from backtrace/1718.
 
 gdb_test "continue" "Program received signal SIGTRAP.*" "continue to gdb1718"
@@ -122,6 +155,7 @@ gdb_test "info frame" \
 	".*Saved registers:.*esi at.*ebx at.*eip at.*" \
 	"saved registers in gdb1718"
 
+
 # Testcase from backtrace/1338.
 
 gdb_test "continue" "Program received signal SIGTRAP.*" "continue to gdb1338"