* gdb.arch/i386-sse.exp: Test xmm[8-15] if amd64.

	* gdb.arch/i386-see.c: Ditto.

3 files changed, 62 insertions, 14 deletions

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 5e10375..1fcc308 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-03  Doug Evans  <dje@google.com>
+
+	* gdb.arch/i386-sse.exp: Test xmm[8-15] if amd64.
+	* gdb.arch/i386-see.c: Ditto.
+
 2009-05-30  Pierre Muller  <muller@ics.u-strasbg.fr>
 
 	* gdb.base/macscp.exp (info_macro): Return undefined if undefined.
diff --git a/gdb/testsuite/gdb.arch/i386-sse.c b/gdb/testsuite/gdb.arch/i386-sse.c
index 4a2540f..5d7524f 100644
--- a/gdb/testsuite/gdb.arch/i386-sse.c
+++ b/gdb/testsuite/gdb.arch/i386-sse.c
@@ -25,16 +25,26 @@ typedef struct {
 } v4sf_t;
 
 
-v4sf_t data[8] =
+v4sf_t data[] =
   {
-    { {  0.0, 0.25, 0.50, 0.75 } },
-    { {  1.0, 1.25, 1.50, 1.75 } },
-    { {  2.0, 2.25, 2.50, 2.75 } },
-    { {  3.0, 3.25, 3.50, 3.75 } },
-    { {  4.0, 4.25, 4.50, 4.75 } },
-    { {  5.0, 5.25, 5.50, 5.75 } },
-    { {  6.0, 6.25, 6.50, 6.75 } },
-    { {  7.0, 7.25, 7.50, 7.75 } },
+    { {  0.0,  0.25,  0.50,  0.75 } },
+    { {  1.0,  1.25,  1.50,  1.75 } },
+    { {  2.0,  2.25,  2.50,  2.75 } },
+    { {  3.0,  3.25,  3.50,  3.75 } },
+    { {  4.0,  4.25,  4.50,  4.75 } },
+    { {  5.0,  5.25,  5.50,  5.75 } },
+    { {  6.0,  6.25,  6.50,  6.75 } },
+    { {  7.0,  7.25,  7.50,  7.75 } },
+#ifdef __x86_64__
+    { {  8.0,  8.25,  8.50,  8.75 } },
+    { {  9.0,  9.25,  9.50,  9.75 } },
+    { { 10.0, 10.25, 10.50, 10.75 } },
+    { { 11.0, 11.25, 11.50, 11.75 } },
+    { { 12.0, 12.25, 12.50, 12.75 } },
+    { { 13.0, 13.25, 13.50, 13.75 } },
+    { { 14.0, 14.25, 14.50, 14.75 } },
+    { { 15.0, 15.25, 15.50, 15.75 } },
+#endif
   };
 
 
@@ -65,6 +75,19 @@ main (int argc, char **argv)
            : /* no output operands */
            : "r" (data) 
            : "xmm0", "xmm1", "xmm2", "xmm3", "xmm4", "xmm5", "xmm6", "xmm7");
+#ifdef __x86_64__
+      asm ("movaps 128(%0), %%xmm8\n\t"
+           "movaps 144(%0), %%xmm9\n\t"
+           "movaps 160(%0), %%xmm10\n\t"
+           "movaps 176(%0), %%xmm11\n\t"
+           "movaps 192(%0), %%xmm12\n\t"
+           "movaps 208(%0), %%xmm13\n\t"
+           "movaps 224(%0), %%xmm14\n\t"
+           "movaps 240(%0), %%xmm15\n\t"
+           : /* no output operands */
+           : "r" (data) 
+           : "xmm8", "xmm9", "xmm10", "xmm11", "xmm12", "xmm13", "xmm14", "xmm15");
+#endif
 
       asm ("nop"); /* first breakpoint here */
 
@@ -80,6 +103,20 @@ main (int argc, char **argv)
            : /* no output operands */
            : "r" (data) 
            : "xmm0", "xmm1", "xmm2", "xmm3", "xmm4", "xmm5", "xmm6", "xmm7");
+#ifdef __x86_64__
+      asm (
+           "movaps %%xmm8, 128(%0)\n\t"
+           "movaps %%xmm9, 144(%0)\n\t"
+           "movaps %%xmm10, 160(%0)\n\t"
+           "movaps %%xmm11, 176(%0)\n\t"
+           "movaps %%xmm12, 192(%0)\n\t"
+           "movaps %%xmm13, 208(%0)\n\t"
+           "movaps %%xmm14, 224(%0)\n\t"
+           "movaps %%xmm15, 240(%0)\n\t"
+           : /* no output operands */
+           : "r" (data) 
+           : "xmm8", "xmm9", "xmm10", "xmm11", "xmm12", "xmm13", "xmm14", "xmm15");
+#endif
 
       puts ("Bye!"); /* second breakpoint here */
     }
diff --git a/gdb/testsuite/gdb.arch/i386-sse.exp b/gdb/testsuite/gdb.arch/i386-sse.exp
index 2ef529f..f59d751 100644
--- a/gdb/testsuite/gdb.arch/i386-sse.exp
+++ b/gdb/testsuite/gdb.arch/i386-sse.exp
@@ -25,8 +25,8 @@ if $tracelevel {
 set prms_id 0
 set bug_id 0
 
-if ![istarget "i?86-*-*"] then {
-    verbose "Skipping i386 SSE tests."
+if { ![istarget i?86-*-*] && ![istarget x86_64-*-* ] } {
+    verbose "Skipping x86 SSE tests."
     return
 }
 
@@ -79,7 +79,13 @@ gdb_test "break [gdb_get_line_number "first breakpoint here"]" \
          "set first breakpoint in main"
 gdb_continue_to_breakpoint "continue to first breakpoint in main"
 
-foreach r {0 1 2 3 4 5 6 7} {
+if [istarget i?86-*-*] {
+    set nr_regs 8
+} else {
+    set nr_regs 16
+}
+
+for { set r 0 } { $r < $nr_regs } { incr r } {
     gdb_test "print \$xmm$r.v4_float" \
         ".. = \\{$r, $r.25, $r.5, $r.75\\}.*" \
         "check float contents of %xmm$r"
@@ -88,7 +94,7 @@ foreach r {0 1 2 3 4 5 6 7} {
         "check int8 contents of %xmm$r"
 }
 
-foreach r {0 1 2 3 4 5 6 7} {
+for { set r 0 } { $r < $nr_regs } { incr r } {
     gdb_test "set var \$xmm$r.v4_float\[0\] = $r + 10" "" "set %xmm$r"
 }
 
@@ -97,7 +103,7 @@ gdb_test "break [gdb_get_line_number "second breakpoint here"]" \
          "set second breakpoint in main"
 gdb_continue_to_breakpoint "continue to second breakpoint in main"
 
-foreach r {0 1 2 3 4 5 6 7} {
+for { set r 0 } { $r < $nr_regs } { incr r } {
     gdb_test "print data\[$r\]" \
         ".. = \\{f = \\{[expr $r + 10], $r.25, $r.5, $r.75\\}\\}.*" \
         "check contents of data\[$r\]"