* features/Makefile, features/arm-with-iwmmxt.xml,

	features/gdbserver-regs.xsl, features/number-regs.xsl,
	features/sort-regs.xsl, features/xscale-iwmmxt.xml: New files.
	* regformats/arm-with-iwmmxt.dat: Generate.
	* NEWS: Mention iWMMXt.

	* gdb.arch/iwmmxt-regs.c, gdb.arch/iwmmxt-regs.exp: New.

	* Makefile.in (OBS): Add $(XML_BUILTIN).
	(XML_DIR, XML_TARGET, XML_FILES, XML_BUILTIN): New.
	(clean): Update.
	(target.xml, xml-builtin.c, stamp-xml, arm-with-iwmmxt.o)
	(arm-with-iwmmxt.c): New.
	* config.in, configure: Regenerate.
	* configure.ac: Check for iWMMXt.  Handle srv_xmltarget,
	srv_xmlbuiltin, and srv_xmlfiles.  Define USE_XML.
	* configure.srv: Mention srv_xmltarget and srv_xmlfiles.
	(arm*-*-linux*): Add iWMMXt and regset support.
	* linux-arm-low.c (PTRACE_GETWMMXREGS, PTRACE_SETWMMXREGS): Define.
	(arm_fill_gregset, arm_store_gregset, arm_fill_wmmxregset)
	(arm_store_wmmxregset, target_regsets): New.
	* server.c (get_features_xml): Take annex argument.  Check builtin
	XML documents.
	(handle_query): Handle multiple annexes.

2 files changed, 166 insertions, 0 deletions

diff --git a/gdb/testsuite/gdb.arch/iwmmxt-regs.c b/gdb/testsuite/gdb.arch/iwmmxt-regs.c
new file mode 100644
index 0000000..9c30570
--- /dev/null
+++ b/gdb/testsuite/gdb.arch/iwmmxt-regs.c
@@ -0,0 +1,88 @@
+/* Register test program.
+
+   Copyright 2007 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
+read_regs (unsigned long long regs[16], unsigned long control_regs[6])
+{
+  asm volatile ("wstrd wr0, %0" : "=m" (regs[0]));
+  asm volatile ("wstrd wr1, %0" : "=m" (regs[1]));
+  asm volatile ("wstrd wr2, %0" : "=m" (regs[2]));
+  asm volatile ("wstrd wr3, %0" : "=m" (regs[3]));
+  asm volatile ("wstrd wr4, %0" : "=m" (regs[4]));
+  asm volatile ("wstrd wr5, %0" : "=m" (regs[5]));
+  asm volatile ("wstrd wr6, %0" : "=m" (regs[6]));
+  asm volatile ("wstrd wr7, %0" : "=m" (regs[7]));
+  asm volatile ("wstrd wr8, %0" : "=m" (regs[8]));
+  asm volatile ("wstrd wr9, %0" : "=m" (regs[9]));
+  asm volatile ("wstrd wr10, %0" : "=m" (regs[10]));
+  asm volatile ("wstrd wr11, %0" : "=m" (regs[11]));
+  asm volatile ("wstrd wr12, %0" : "=m" (regs[12]));
+  asm volatile ("wstrd wr13, %0" : "=m" (regs[13]));
+  asm volatile ("wstrd wr14, %0" : "=m" (regs[14]));
+  asm volatile ("wstrd wr15, %0" : "=m" (regs[15]));
+
+  asm volatile ("wstrw wcssf, %0" : "=m" (control_regs[0]));
+  asm volatile ("wstrw wcasf, %0" : "=m" (control_regs[1]));
+  asm volatile ("wstrw wcgr0, %0" : "=m" (control_regs[2]));
+  asm volatile ("wstrw wcgr1, %0" : "=m" (control_regs[3]));
+  asm volatile ("wstrw wcgr2, %0" : "=m" (control_regs[4]));
+  asm volatile ("wstrw wcgr3, %0" : "=m" (control_regs[5]));
+}
+
+void
+write_regs (unsigned long long regs[16], unsigned long control_regs[6])
+{
+  asm volatile ("wldrd wr0, %0" : : "m" (regs[0]));
+  asm volatile ("wldrd wr1, %0" : : "m" (regs[1]));
+  asm volatile ("wldrd wr2, %0" : : "m" (regs[2]));
+  asm volatile ("wldrd wr3, %0" : : "m" (regs[3]));
+  asm volatile ("wldrd wr4, %0" : : "m" (regs[4]));
+  asm volatile ("wldrd wr5, %0" : : "m" (regs[5]));
+  asm volatile ("wldrd wr6, %0" : : "m" (regs[6]));
+  asm volatile ("wldrd wr7, %0" : : "m" (regs[7]));
+  asm volatile ("wldrd wr8, %0" : : "m" (regs[8]));
+  asm volatile ("wldrd wr9, %0" : : "m" (regs[9]));
+  asm volatile ("wldrd wr10, %0" : : "m" (regs[10]));
+  asm volatile ("wldrd wr11, %0" : : "m" (regs[11]));
+  asm volatile ("wldrd wr12, %0" : : "m" (regs[12]));
+  asm volatile ("wldrd wr13, %0" : : "m" (regs[13]));
+  asm volatile ("wldrd wr14, %0" : : "m" (regs[14]));
+  asm volatile ("wldrd wr15, %0" : : "m" (regs[15]));
+
+  asm volatile ("wldrw wcssf, %0" : : "m" (control_regs[0]));
+  asm volatile ("wldrw wcasf, %0" : : "m" (control_regs[1]));
+  asm volatile ("wldrw wcgr0, %0" : : "m" (control_regs[2]));
+  asm volatile ("wldrw wcgr1, %0" : : "m" (control_regs[3]));
+  asm volatile ("wldrw wcgr2, %0" : : "m" (control_regs[4]));
+  asm volatile ("wldrw wcgr3, %0" : : "m" (control_regs[5]));
+}
+
+int
+main ()
+{
+  unsigned long long regs[16];
+  unsigned long control_regs[6];
+
+  read_regs (regs, control_regs);
+  write_regs (regs, control_regs);
+
+  return 0;
+}
diff --git a/gdb/testsuite/gdb.arch/iwmmxt-regs.exp b/gdb/testsuite/gdb.arch/iwmmxt-regs.exp
new file mode 100644
index 0000000..c040157
--- /dev/null
+++ b/gdb/testsuite/gdb.arch/iwmmxt-regs.exp
@@ -0,0 +1,78 @@
+# Copyright 2007 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.
+#
+
+# Tests for ARM iWMMXt register setting and fetching.
+
+if ![istarget "arm*-*-*"] then {
+    verbose "Skipping iWMMXt register tests."
+    return
+}
+
+set testfile "iwmmxt-regs"
+set binfile ${objdir}/${subdir}/${testfile}
+set src1 ${srcdir}/${subdir}/${testfile}.c
+
+# Try to compile the test case.  If we can't, assume this is not an
+# iWMMXt toolchain and bail out.
+if { [gdb_compile ${src1} ${binfile} executable {quiet debug}] != "" } {
+    verbose "Skipping iWMMXt register tests."
+    return
+}
+
+gdb_start
+gdb_reinitialize_dir $srcdir/$subdir
+gdb_load ${binfile}
+
+#
+# Run to `main' where we begin our tests.
+#
+
+if ![runto_main] then {
+    gdb_suppress_tests
+}
+
+# Set all the registers to arbitrary values.
+for {set i 0} {$i < 16} {incr i 1} {
+    gdb_test "set \$wr$i.u64 = ((${i}LL << 32) | ${i})" "" "set reg wr$i"
+}
+gdb_test "set \$wcssf = 300" "" "set reg wcssf"
+gdb_test "set \$wcasf = 200" "" "set reg wcasf"
+for {set i 0} {$i < 4} {incr i 1} {
+    gdb_test "set \$wcgr$i = 100 + $i" "" "set reg wcgr$i"
+}
+
+# See if the sets stuck.
+gdb_test "next" ".*write_regs.*" "next over read_regs"
+
+for {set i 0} {$i < 16} {incr i 1} {
+    gdb_test "p \$wr$i.u64 == ((${i}LL << 32) | ${i})" "\\\$$decimal = 1" "test reg wr$i"
+}
+# Don't test wcssf.
+gdb_test "p \$wcasf" "\\\$$decimal = 200" "test reg wcasf"
+for {set i 0} {$i < 4} {incr i 1} {
+    gdb_test "p \$wcgr$i == 100 + $i" "\\\$$decimal = 1" "test reg wcgr$i"
+}
+
+# Also verify the copies read by the target.
+for {set i 0} {$i < 16} {incr i 1} {
+    gdb_test "p regs\[$i\] == ((${i}LL << 32) | ${i})" "\\\$$decimal = 1" "test stored wr$i"
+}
+# Don't test wcssf.
+gdb_test "p control_regs\[1\]" "\\\$$decimal = 200" "test stored wcasf"
+for {set i 0} {$i < 4} {incr i 1} {
+    gdb_test "p control_regs\[$i + 2\] == 100 + $i" "\\\$$decimal = 1" "test stored wcgr$i"
+}