gdb/

	* Makefile.in (arm-tdep.o): Update dependencies.
	* arm-tdep.c (thumb_skip_prologue): Remove.
	(thumb_analyze_prologue): New function.
	(arm_skip_prologue): Use thumb_analyze_prologue.
	(thumb_scan_prologue): Ditto.
gdb/testsuite/
	* gdb.arch/thumb-prologue.c, gdb.arch/thumb-prologue.exp: New files.

2 files changed, 156 insertions, 0 deletions

diff --git a/gdb/testsuite/gdb.arch/thumb-prologue.c b/gdb/testsuite/gdb.arch/thumb-prologue.c
new file mode 100644
index 0000000..f618963
--- /dev/null
+++ b/gdb/testsuite/gdb.arch/thumb-prologue.c
@@ -0,0 +1,96 @@
+/* Unwinder test program.
+
+   Copyright 2006 Free Software Foundation, Inc.
+
+   This file is part of GDB.
+
+   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
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+void tpcs_frame (void);
+
+int
+main (void)
+{
+  tpcs_frame ();
+  return 0;
+}
+
+/* Normally Thumb functions use r7 as the frame pointer.  However,
+   with the GCC option -mtpcs-frame, they may use fp instead.  */
+
+asm(".text\n"
+    "	.align 2\n"
+    "	.thumb_func\n"
+    "	.code 16\n"
+    "tpcs_frame_1:\n"
+    "	sub	sp, #16\n"
+    "	push	{r7}\n"
+    "	add	r7, sp, #20\n"
+    "	str	r7, [sp, #8]\n"
+    "	mov	r7, pc\n"
+    "	str	r7, [sp, #16]\n"
+    "	mov	r7, fp\n"
+    "	str	r7, [sp, #4]\n"
+    "	mov	r7, lr\n"
+    "	str	r7, [sp, #12]\n"
+    "	add	r7, sp, #16\n"
+    "	mov	fp, r7\n"
+    "	mov	r7, sl\n"
+    "	push	{r7}\n"
+
+    /* Trap.  */
+    "	.short	0xdffe\n"
+
+    "	pop	{r2}\n"
+    "	mov	sl, r2\n"
+    "	pop	{r7}\n"
+    "	pop	{r1, r2}\n"
+    "	mov	fp, r1\n"
+    "	mov	sp, r2\n"
+    "	bx	lr\n"
+
+    "	.align 2\n"
+    "	.thumb_func\n"
+    "	.code 16\n"
+    "tpcs_frame:\n"
+    "	sub	sp, #16\n"
+    "	push	{r7}\n"
+    "	add	r7, sp, #20\n"
+    "	str	r7, [sp, #8]\n"
+    "	mov	r7, pc\n"
+    "	str	r7, [sp, #16]\n"
+    "	mov	r7, fp\n"
+    "	str	r7, [sp, #4]\n"
+    "	mov	r7, lr\n"
+    "	str	r7, [sp, #12]\n"
+    "	add	r7, sp, #16\n"
+    "	mov	fp, r7\n"
+    "	mov	r7, sl\n"
+    "	push	{r7}\n"
+
+    /* Clobber saved regs.  */
+    "	mov	r7, #0\n"
+    "	mov	lr, r7\n"
+    "	bl	tpcs_frame_1\n"
+
+    "	pop	{r2}\n"
+    "	mov	sl, r2\n"
+    "	pop	{r7}\n"
+    "	pop	{r1, r2}\n"
+    "	mov	fp, r1\n"
+    "	mov	sp, r2\n"
+    "	bx	lr\n"
+);
diff --git a/gdb/testsuite/gdb.arch/thumb-prologue.exp b/gdb/testsuite/gdb.arch/thumb-prologue.exp
new file mode 100644
index 0000000..1353768
--- /dev/null
+++ b/gdb/testsuite/gdb.arch/thumb-prologue.exp
@@ -0,0 +1,60 @@
+# Copyright 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
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
+
+# Test ARM/Thumb prologue analyzer.
+
+if {![istarget arm*-*]} then {
+    verbose "Skipping ARM prologue tests."
+    return
+}
+
+set testfile "thumb-prologue"
+set srcfile ${testfile}.c
+set binfile ${objdir}/${subdir}/${testfile}
+
+# Don't use "debug", so that we don't have line information for the assembly
+# fragments.
+if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {"additional_flags=-mthumb"}] != "" } {
+    untested "ARM prologue tests"
+    return -1
+}
+
+
+gdb_exit
+gdb_start
+gdb_reinitialize_dir $srcdir/$subdir
+gdb_load ${binfile}
+
+#
+# Run to `main' where we begin our tests.
+#
+
+if ![runto_main] then {
+    untested "ARM prologue tests"
+    return -1
+}
+
+# Testcase for TPCS prologue.
+
+gdb_test "continue" "Program received signal SIG.*" "continue to TPCS"
+
+gdb_test "backtrace 10" \
+	"#0\[ \t\]*$hex in tpcs_frame_1 .*\r\n#1\[ \t\]*$hex in tpcs_frame .*\r\n#2\[ \t\]*$hex in main.*" \
+	"backtrace in TPCS"
+
+gdb_test "info frame" \
+	".*Saved registers:.*r7 at.*r10 at.*r11 at.*lr at.*pc at .*" \
+	"saved registers in TPCS"