2009-02-27 H.J. Lu <hongjiu.lu@intel.com>

	* i386-dis.c (OP_EX): Call OP_E_memory instead of OP_E.

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index ce7b57af42156ad147e55fa0121ade57a98dad3e..ca35ba7051a743fb12524f50423eb0e57b873f0f 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,7 @@
+2009-02-27  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * i386-dis.c (OP_EX): Call OP_E_memory instead of OP_E.
+
 2009-02-26  Peter Bergner  <bergner@vnet.ibm.com>
 
        * ppc-dis.c (powerpc_init_dialect): Extend -Mpower7 to disassemble

diff --git a/opcodes/i386-dis.c b/opcodes/i386-dis.c
index 83de1f72536647dc4ab517e9954dcd3a49ad4bc6..2e44ed0a8ac239247b4806b1b7f909c7535f9e1b 100644 (file)
--- a/opcodes/i386-dis.c
+++ b/opcodes/i386-dis.c
@@ -12676,11 +12676,17 @@ static void
 OP_EX (int bytemode, int sizeflag)
 {
   int add;
+
+  /* Skip mod/rm byte.  */
+  MODRM_CHECK;
+  codep++;
+
   if (modrm.mod != 3)
     {
-      OP_E (bytemode, sizeflag);
+      OP_E_memory (bytemode, sizeflag, 0);
       return;
     }
+
   USED_REX (REX_B);
   if (rex & REX_B)
     add = 8;
@@ -12693,9 +12699,6 @@ OP_EX (int bytemode, int sizeflag)
          || bytemode == q_swap_mode))
     swap_operand ();
 
-  /* Skip mod/rm byte.  */
-  MODRM_CHECK;
-  codep++;
   if (need_vex
       && bytemode != xmm_mode
       && bytemode != xmmq_mode)