aboutsummaryrefslogtreecommitdiff
path: root/gas
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@novell.com>2007-09-12 07:31:47 +0000
committerJan Beulich <jbeulich@novell.com>2007-09-12 07:31:47 +0000
commitec56d5c0f69f681fe8502d22abb63a99e609fb91 (patch)
tree5fe5d66a6928af172061b2012c8e0b687a9c372d /gas
parenta18e2996a2eaddeb1d32cf007fde70e49a1e610f (diff)
downloadgdb-ec56d5c0f69f681fe8502d22abb63a99e609fb91.zip
gdb-ec56d5c0f69f681fe8502d22abb63a99e609fb91.tar.gz
gdb-ec56d5c0f69f681fe8502d22abb63a99e609fb91.tar.bz2
gas/
2007-09-12 Jan Beulich <jbeulich@novell.com> * config/tc-i386.c (md_assemble): Move handling of extrq/insertq after generic operand swapping, and swap only the immediate operands. gas/testsuite/ 2007-09-12 Jan Beulich <jbeulich@novell.com> * gas/i386/amdfam10.s, gas/i386/x86-64-amdfam10.s: Add Intel syntax code. * gas/i386/amdfam10.d, gas/i386/x86-64-amdfam10.d: Adjust.
Diffstat (limited to 'gas')
-rw-r--r--gas/ChangeLog5
-rw-r--r--gas/config/tc-i386.c21
-rw-r--r--gas/testsuite/ChangeLog5
-rw-r--r--gas/testsuite/gas/i386/amdfam10.d16
-rw-r--r--gas/testsuite/gas/i386/amdfam10.s16
-rw-r--r--gas/testsuite/gas/i386/x86-64-amdfam10.d20
-rw-r--r--gas/testsuite/gas/i386/x86-64-amdfam10.s20
7 files changed, 87 insertions, 16 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 1d13235..916ec3c 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-12 Jan Beulich <jbeulich@novell.com>
+
+ * config/tc-i386.c (md_assemble): Move handling of extrq/insertq
+ after generic operand swapping, and swap only the immediate operands.
+
2007-09-11 Nathan Sidwell <nathan@codesourcery.com>
* config/tc-m68k.c (m68k_ip): Add mcfisa_c case.
diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index cb22bbc..065b713 100644
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -2135,20 +2135,6 @@ md_assemble (line)
if (line == NULL)
return;
- /* The order of the immediates should be reversed
- for 2 immediates extrq and insertq instructions */
- if ((i.imm_operands == 2)
- && ((strcmp (mnemonic, "extrq") == 0)
- || (strcmp (mnemonic, "insertq") == 0)))
- {
- swap_2_operands (0, 1);
- /* "extrq" and insertq" are the only two instructions whose operands
- have to be reversed even though they have two immediate operands.
- */
- if (intel_syntax)
- swap_operands ();
- }
-
/* Now we've parsed the mnemonic into a set of templates, and have the
operands at hand. */
@@ -2164,6 +2150,13 @@ md_assemble (line)
&& operand_type_check (i.types[1], imm)))
swap_operands ();
+ /* The order of the immediates should be reversed
+ for 2 immediates extrq and insertq instructions */
+ if (i.imm_operands == 2
+ && (strcmp (mnemonic, "extrq") == 0
+ || strcmp (mnemonic, "insertq") == 0))
+ swap_2_operands (0, 1);
+
if (i.imm_operands)
optimize_imm ();
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 573b354..3a61f51 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-12 Jan Beulich <jbeulich@novell.com>
+ * gas/i386/amdfam10.s, gas/i386/x86-64-amdfam10.s: Add Intel syntax
+ code.
+ * gas/i386/amdfam10.d, gas/i386/x86-64-amdfam10.d: Adjust.
+
2007-09-06 H.J. Lu <hongjiu.lu@intel.com>
* gas/i386/svme.s: Updated to allow eax in 64bit.
diff --git a/gas/testsuite/gas/i386/amdfam10.d b/gas/testsuite/gas/i386/amdfam10.d
index ba63e49..5c20c87 100644
--- a/gas/testsuite/gas/i386/amdfam10.d
+++ b/gas/testsuite/gas/i386/amdfam10.d
@@ -20,4 +20,18 @@ Disassembly of section .text:
32: f2 0f 78 ca 02 04[ ]*insertq \$0x4,\$0x2,%xmm2,%xmm1
38: f2 0f 2b 09[ ]+movntsd %xmm1,\(%ecx\)
3c: f3 0f 2b 09[ ]+movntss %xmm1,\(%ecx\)
-
+[ ]*[a-f0-9]+: f3 0f bd 19[ ]+lzcnt \(%ecx\),%ebx
+[ ]*[a-f0-9]+: 66 f3 0f bd 19[ ]+lzcnt \(%ecx\),%bx
+[ ]*[a-f0-9]+: f3 0f bd d9[ ]+lzcnt %ecx,%ebx
+[ ]*[a-f0-9]+: 66 f3 0f bd d9[ ]+lzcnt %cx,%bx
+[ ]*[a-f0-9]+: f3 0f b8 19[ ]+popcnt \(%ecx\),%ebx
+[ ]*[a-f0-9]+: 66 f3 0f b8 19[ ]+popcnt \(%ecx\),%bx
+[ ]*[a-f0-9]+: f3 0f b8 d9[ ]+popcnt %ecx,%ebx
+[ ]*[a-f0-9]+: 66 f3 0f b8 d9[ ]+popcnt %cx,%bx
+[ ]*[a-f0-9]+: 66 0f 79 ca[ ]+extrq %xmm2,%xmm1
+[ ]*[a-f0-9]+: 66 0f 78 c1 02 04[ ]*extrq \$0x4,\$0x2,%xmm1
+[ ]*[a-f0-9]+: f2 0f 79 ca[ ]+insertq %xmm2,%xmm1
+[ ]*[a-f0-9]+: f2 0f 78 ca 02 04[ ]*insertq \$0x4,\$0x2,%xmm2,%xmm1
+[ ]*[a-f0-9]+: f2 0f 2b 09[ ]+movntsd %xmm1,\(%ecx\)
+[ ]*[a-f0-9]+: f3 0f 2b 09[ ]+movntss %xmm1,\(%ecx\)
+#pass
diff --git a/gas/testsuite/gas/i386/amdfam10.s b/gas/testsuite/gas/i386/amdfam10.s
index bef51fe..4239eb1 100644
--- a/gas/testsuite/gas/i386/amdfam10.s
+++ b/gas/testsuite/gas/i386/amdfam10.s
@@ -17,5 +17,21 @@ foo:
movntsd %xmm1,(%ecx)
movntss %xmm1,(%ecx)
+ .intel_syntax noprefix
+ lzcnt ebx,[ecx]
+ lzcnt bx,[ecx]
+ lzcnt ebx,ecx
+ lzcnt bx,cx
+ popcnt ebx,[ecx]
+ popcnt bx,[ecx]
+ popcnt ebx,ecx
+ popcnt bx,cx
+ extrq xmm1,xmm2
+ extrq xmm1,2,4
+ insertq xmm1,xmm2
+ insertq xmm1,xmm2,2,4
+ movntsd [ecx],xmm1
+ movntss [ecx],xmm1
+
# Force a good alignment.
.p2align 4,0
diff --git a/gas/testsuite/gas/i386/x86-64-amdfam10.d b/gas/testsuite/gas/i386/x86-64-amdfam10.d
index ed142b1..3924093 100644
--- a/gas/testsuite/gas/i386/x86-64-amdfam10.d
+++ b/gas/testsuite/gas/i386/x86-64-amdfam10.d
@@ -24,4 +24,22 @@ Disassembly of section .text:
46: f2 0f 78 ca 02 04[ ]+insertq \$0x4,\$0x2,%xmm2,%xmm1
4c: f2 0f 2b 09[ ]+movntsd %xmm1,\(%rcx\)
50: f3 0f 2b 09[ ]+movntss %xmm1,\(%rcx\)
- ...
+[ ]*[a-f0-9]+: f3 48 0f bd 19[ ]+lzcnt \(%rcx\),%rbx
+[ ]*[a-f0-9]+: f3 0f bd 19[ ]+lzcnt \(%rcx\),%ebx
+[ ]*[a-f0-9]+: 66 f3 0f bd 19[ ]+lzcnt \(%rcx\),%bx
+[ ]*[a-f0-9]+: f3 48 0f bd d9[ ]+lzcnt %rcx,%rbx
+[ ]*[a-f0-9]+: f3 0f bd d9[ ]+lzcnt %ecx,%ebx
+[ ]*[a-f0-9]+: 66 f3 0f bd d9[ ]+lzcnt %cx,%bx
+[ ]*[a-f0-9]+: f3 48 0f b8 19[ ]+popcnt \(%rcx\),%rbx
+[ ]*[a-f0-9]+: f3 0f b8 19[ ]+popcnt \(%rcx\),%ebx
+[ ]*[a-f0-9]+: 66 f3 0f b8 19[ ]+popcnt \(%rcx\),%bx
+[ ]*[a-f0-9]+: f3 48 0f b8 d9[ ]+popcnt %rcx,%rbx
+[ ]*[a-f0-9]+: f3 0f b8 d9[ ]+popcnt %ecx,%ebx
+[ ]*[a-f0-9]+: 66 f3 0f b8 d9[ ]+popcnt %cx,%bx
+[ ]*[a-f0-9]+: 66 0f 79 ca[ ]+extrq %xmm2,%xmm1
+[ ]*[a-f0-9]+: 66 0f 78 c1 02 04[ ]*extrq \$0x4,\$0x2,%xmm1
+[ ]*[a-f0-9]+: f2 0f 79 ca[ ]+insertq %xmm2,%xmm1
+[ ]*[a-f0-9]+: f2 0f 78 ca 02 04[ ]*insertq \$0x4,\$0x2,%xmm2,%xmm1
+[ ]*[a-f0-9]+: f2 0f 2b 09[ ]+movntsd %xmm1,\(%rcx\)
+[ ]*[a-f0-9]+: f3 0f 2b 09[ ]+movntss %xmm1,\(%rcx\)
+#pass
diff --git a/gas/testsuite/gas/i386/x86-64-amdfam10.s b/gas/testsuite/gas/i386/x86-64-amdfam10.s
index df04164..f31dbb0 100644
--- a/gas/testsuite/gas/i386/x86-64-amdfam10.s
+++ b/gas/testsuite/gas/i386/x86-64-amdfam10.s
@@ -21,5 +21,25 @@ foo:
movntsd %xmm1,(%rcx)
movntss %xmm1,(%rcx)
+ .intel_syntax noprefix
+ lzcnt rbx,[rcx]
+ lzcnt ebx,[rcx]
+ lzcnt bx,[rcx]
+ lzcnt rbx,rcx
+ lzcnt ebx,ecx
+ lzcnt bx,cx
+ popcnt rbx,[rcx]
+ popcnt ebx,[rcx]
+ popcnt bx,[rcx]
+ popcnt rbx,rcx
+ popcnt ebx,ecx
+ popcnt bx,cx
+ extrq xmm1,xmm2
+ extrq xmm1,2,4
+ insertq xmm1,xmm2
+ insertq xmm1,xmm2,2,4
+ movntsd [rcx],xmm1
+ movntss [rcx],xmm1
+
# Force a good alignment.
.p2align 4,0