From cf38c229a1328a7e827f379a5b0a1c4fc381ef0d Mon Sep 17 00:00:00 2001
From: Mark Kettenis <kettenis@gnu.org>
Date: Fri, 20 Aug 2004 22:15:03 +0000
Subject: [PATCH] * gdb.arch/i386-prologue.exp (skip_breakpoint): New function.
  Use it to skip the breakpoints encoded in the inline assembly.

---
 gdb/testsuite/ChangeLog                  |  5 +++++
 gdb/testsuite/gdb.arch/i386-prologue.exp | 24 ++++++++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 63d51457f6..f8bdfc62b3 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-20  Mark Kettenis  <kettenis@gnu.org>
+
+	* gdb.arch/i386-prologue.exp (skip_breakpoint): New function.  Use
+	it to skip the breakpoints encoded in the inline assembly.
+
 2004-08-20  Michael Chastain  <mec.gnu@mindspring.com>
 
 	* Makefile.in: Add gdb.fortran.
diff --git a/gdb/testsuite/gdb.arch/i386-prologue.exp b/gdb/testsuite/gdb.arch/i386-prologue.exp
index 4ec9239994..48aad1c13a 100644
--- a/gdb/testsuite/gdb.arch/i386-prologue.exp
+++ b/gdb/testsuite/gdb.arch/i386-prologue.exp
@@ -50,6 +50,22 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list
     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
 }
 
+
+# The code used by the tests here encodes some breakpoints by using
+# inline assembler.  This will generate a SIGTRAP which will be caught
+# by GDB.  At that point the instruction pointer will point at the
+# next instruction, and execution can continue without any problems.
+# Some systems however (QNX Neutrino, Solaris) will adjust the
+# instruction pointer to point at the breakpoint instruction instead.
+# On these systems we cannot continue unless we skip it.  This
+# procedure takes care of that.
+
+proc skip_breakpoint { msg } {
+    gdb_test "if (*(unsigned char *)\$pc == 0xcc)\nset \$pc = \$pc + 1\nend" \
+	    "" "skip breakpoint in ${msg}"
+}
+
+
 gdb_exit
 gdb_start
 gdb_reinitialize_dir $srcdir/$subdir
@@ -67,6 +83,8 @@ if ![runto_main] then {
 
 gdb_test "continue" "Program received signal SIGTRAP.*" "continue to standard"
 
+skip_breakpoint standard
+
 gdb_test "backtrace 10" \
 	"#0\[ \t\]*$hex in standard.*\r\n#1\[ \t\]*$hex in main.*" \
 	"backtrace in standard"
@@ -79,6 +97,8 @@ gdb_test "info frame" \
 
 gdb_test "continue" "Program received signal SIGTRAP.*" "continue to gdb1253"
 
+skip_breakpoint gdb1253
+
 gdb_test "backtrace 10" \
 	"#0\[ \t\]*$hex in gdb1253.*\r\n#1\[ \t\]*$hex in main.*" \
 	"backtrace in gdb1253"
@@ -91,6 +111,8 @@ gdb_test "info frame" \
 
 gdb_test "continue" "Program received signal SIGTRAP.*" "continue to gdb1718"
 
+skip_breakpoint gdb1718
+
 gdb_test "backtrace 10" \
 	"#0\[ \t\]*$hex in gdb1718.*\r\n#1\[ \t\]*$hex in main.*" \
 	"backtrace in gdb1718"
@@ -104,6 +126,8 @@ gdb_test "info frame" \
 
 gdb_test "continue" "Program received signal SIGTRAP.*" "continue to gdb1338"
 
+skip_breakpoint gdb1338
+
 gdb_test "backtrace 10" \
 	"#0\[ \t\]*$hex in gdb1338.*\r\n#1\[ \t\]*$hex in main.*" \
 	"backtrace in gdb1338"