This is the mail archive of the
binutils-cvs@sourceware.org
mailing list for the binutils project.
[binutils-gdb] x86: don't default variable shift count insns to 8-bit operand size
- From: Jan Beulich <jbeulich at sourceware dot org>
- To: bfd-cvs at sourceware dot org
- Date: 13 Nov 2017 11:23:03 -0000
- Subject: [binutils-gdb] x86: don't default variable shift count insns to 8-bit operand size
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=b76bc5d54e36f15efd954898d9aa075c2bea02dd
commit b76bc5d54e36f15efd954898d9aa075c2bea02dd
Author: Jan Beulich <jbeulich@novell.com>
Date: Mon Nov 13 12:22:21 2017 +0100
x86: don't default variable shift count insns to 8-bit operand size
Just like %dx in I/O instructions isn't suitable to derive operand size
information, %cl source operands of shift instructions aren't.
Diff:
---
gas/ChangeLog | 7 +++++++
gas/config/tc-i386.c | 3 ++-
gas/testsuite/gas/i386/inval.l | 7 +++++++
gas/testsuite/gas/i386/inval.s | 4 ++++
4 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/gas/ChangeLog b/gas/ChangeLog
index d18c381..768ec17 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,12 @@
2017-11-13 Jan Beulich <jbeulich@suse.com>
+ * config/tc-i386.c (process_suffix): Treat .shiftcount just like
+ .inoutportreg.
+ * testsuite/gas/i386/inval.s: Add ambiguous shift/rotate cases.
+ * testsuite/gas/i386/inval.l: Adjust expectations.
+
+2017-11-13 Jan Beulich <jbeulich@suse.com>
+
* config/tc-i386-intel.c (i386_intel_simplify_register): Also
recognize RegRiz/RegEiz as index-only registers.
* testsuite/gas/i386/intel.s: Add tests exercising base/index
diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index 4161c8c..f20be8e 100644
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -5431,7 +5431,8 @@ process_suffix (void)
}
for (op = i.operands; --op >= 0;)
- if (!i.tm.operand_types[op].bitfield.inoutportreg)
+ if (!i.tm.operand_types[op].bitfield.inoutportreg
+ && !i.tm.operand_types[op].bitfield.shiftcount)
{
if (i.types[op].bitfield.reg8)
{
diff --git a/gas/testsuite/gas/i386/inval.l b/gas/testsuite/gas/i386/inval.l
index bec6b75..53eb7e7 100644
--- a/gas/testsuite/gas/i386/inval.l
+++ b/gas/testsuite/gas/i386/inval.l
@@ -80,6 +80,9 @@
.*:87: Error: .*
.*:88: Error: .*
.*:90: Error: .*
+.*:92: Error: .*shl.*
+.*:93: Error: .*rol.*
+.*:94: Error: .*rcl.*
GAS LISTING .*
@@ -176,3 +179,7 @@ GAS LISTING .*
[ ]*88[ ]+movzx eax, \[eax\]
[ ]*89[ ]+
[ ]*90[ ]+movnti word ptr \[eax\], ax
+[ ]*[1-9][0-9]*[ ]+
+[ ]*[1-9][0-9]*[ ]+shl \[eax\], 1
+[ ]*[1-9][0-9]*[ ]+rol \[ecx\], 2
+[ ]*[1-9][0-9]*[ ]+rcl \[edx\], cl
diff --git a/gas/testsuite/gas/i386/inval.s b/gas/testsuite/gas/i386/inval.s
index 4818baa..35d99cd 100644
--- a/gas/testsuite/gas/i386/inval.s
+++ b/gas/testsuite/gas/i386/inval.s
@@ -88,3 +88,7 @@ movzx ax, [eax]
movzx eax, [eax]
movnti word ptr [eax], ax
+
+ shl [eax], 1
+ rol [ecx], 2
+ rcl [edx], cl