propagate from branch 'com.redhat.elfutils.roland.pending' (head 6b4ecd4bacd23aaea4922adc10aab7908c45d23e)

            to branch 'com.redhat.elfutils' (head 80a9de86977a1031c60888fe4072688434a961be)

1 files changed, 10 insertions, 0 deletions

diff --git a/libcpu/i386_disasm.c b/libcpu/i386_disasm.c
index d8bcf9b3..9024571c 100644
--- a/libcpu/i386_disasm.c
+++ b/libcpu/i386_disasm.c
@@ -589,12 +589,22 @@ i386_disasm (const uint8_t **startp, const uint8_t *end, GElf_Addr addr,
 #endif
 
 			case 0x98:
+			  if (prefixes == (has_rex_w | has_rex))
+			    {
+			      str = "cltq";
+			      break;
+			    }
 			  if (prefixes & ~has_data16)
 			    goto print_prefix;
 			  str = prefixes & has_data16 ? "cbtw" : "cwtl";
 			  break;
 
 			case 0x99:
+			  if (prefixes == (has_rex_w | has_rex))
+			    {
+			      str = "cqto";
+			      break;
+			    }
 			  if (prefixes & ~has_data16)
 			    goto print_prefix;
 			  str = prefixes & has_data16 ? "cwtd" : "cltd";