* i386.h (i386_optab): Add entries for "sldr", "smsw" and "str" to

	accept WordReg.
	* i386-dis.c (grps): Change "sldt", "str", and "smsw" entries
	to "sldtQ", "strQ", "smswQ" respectively; all with Ev operand
	category instead of Ew.

diff --git a/include/opcode/ChangeLog b/include/opcode/ChangeLog
index 78beed7..fab2053 100644 (file)
--- a/include/opcode/ChangeLog
+++ b/include/opcode/ChangeLog
@@ -1,3 +1,9 @@
+2001-11-13  Zack Weinberg <zack@codesourcery.com>
+           Alan Modra  <amodra@bigpond.net.au>
+
+       * i386.h (i386_optab): Add entries for "sldr", "smsw" and "str" to
+       accept WordReg.
+
 2001-11-04  Chris Demetriou  <cgd@broadcom.com>
 
        * mips.h (OPCODE_IS_MEMBER): Remove extra space.

diff --git a/include/opcode/i386.h b/include/opcode/i386.h
index 38de44a..571990e 100644 (file)
--- a/include/opcode/i386.h
+++ b/include/opcode/i386.h
@@ -553,9 +553,12 @@ static const template i386_optab[] = {
 
 {"sgdt",   1, 0x0f01, 0, Cpu286, wlq_Suf|Modrm,                { WordMem, 0, 0} },
 {"sidt",   1, 0x0f01, 1, Cpu286, wlq_Suf|Modrm,                { WordMem, 0, 0} },
-{"sldt",   1, 0x0f00, 0, Cpu286, wlq_Suf|Modrm,                { WordReg|WordMem, 0, 0} },
-{"smsw",   1, 0x0f01, 4, Cpu286, wlq_Suf|Modrm,                { WordReg|WordMem, 0, 0} },
-{"str",           1, 0x0f00, 1, Cpu286, w_Suf|Modrm|IgnoreSize,{ Reg16|ShortMem, 0, 0} },
+{"sldt",   1, 0x0f00, 0, Cpu286, wlq_Suf|Modrm,                { WordReg|InvMem, 0, 0} },
+{"sldt",   1, 0x0f00, 0, Cpu286, w_Suf|Modrm|IgnoreSize,{ ShortMem, 0, 0} },
+{"smsw",   1, 0x0f01, 4, Cpu286, wlq_Suf|Modrm,                { WordReg|InvMem, 0, 0} },
+{"smsw",   1, 0x0f01, 4, Cpu286, w_Suf|Modrm|IgnoreSize,{ ShortMem, 0, 0} },
+{"str",           1, 0x0f00, 1, Cpu286, wlq_Suf|Modrm,         { WordReg|InvMem, 0, 0} },
+{"str",           1, 0x0f00, 1, Cpu286, w_Suf|Modrm|IgnoreSize,{ ShortMem, 0, 0} },
 
 {"verr",   1, 0x0f00, 4, Cpu286, w_Suf|Modrm|IgnoreSize,{ Reg16|ShortMem, 0, 0} },
 {"verw",   1, 0x0f00, 5, Cpu286, w_Suf|Modrm|IgnoreSize,{ Reg16|ShortMem, 0, 0} },

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 8ca74e2..1afccac 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,9 @@
+2001-11-13  Zack Weinberg <zack@codesourcery.com>
+
+       * i386-dis.c (grps): Change "sldt", "str", and "smsw" entries
+       to "sldtQ", "strQ", "smswQ" respectively; all with Ev operand
+       category instead of Ew.
+
 2001-11-12  Niraj Gupta <ngupta@zumanetworks.com>
 
        * m68k-opc.c: Fix definitions of wddata[bwl].

diff --git a/opcodes/i386-dis.c b/opcodes/i386-dis.c
index 3eb40c6..9a16d52 100644 (file)
--- a/opcodes/i386-dis.c
+++ b/opcodes/i386-dis.c
@@ -1337,8 +1337,8 @@ static const struct dis386 grps[][8] = {
   },
   /* GRP6 */
   {
-    { "sldt",  Ew, XX, XX },
-    { "str",   Ew, XX, XX },
+    { "sldtQ", Ev, XX, XX },
+    { "strQ",  Ev, XX, XX },
     { "lldt",  Ew, XX, XX },
     { "ltr",   Ew, XX, XX },
     { "verr",  Ew, XX, XX },
@@ -1352,7 +1352,7 @@ static const struct dis386 grps[][8] = {
     { "sidtQ",  M, XX, XX },
     { "lgdtQ",  M, XX, XX },
     { "lidtQ",  M, XX, XX },
-    { "smsw",  Ew, XX, XX },
+    { "smswQ", Ev, XX, XX },
     { "(bad)", XX, XX, XX },
     { "lmsw",  Ew, XX, XX },
     { "invlpg",        Ew, XX, XX },