commit e4e04bbd86d1131b9f380a52a46b1a3b83335d5f
author Ian Rogers <irogers@google.com> Fri May 30 20:26:12 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 30 20:26:12 2014 +0000
tree b56931ad3ad83b28d6888ecdac80efd32b1e2a37
parent afa8e909b7fbf53cb45573c458c031d3174069c9
parent 67d18be2a5bddbd8ee9ef144b34ccaeba08a1db2

Merge "Support disassembly of 16-bit immediates"

disassembler/disassembler_x86.cc

diff --git a/disassembler/disassembler_x86.cc b/disassembler/disassembler_x86.cc
index cba4ebf..614eca1 100644
--- a/disassembler/disassembler_x86.cc
+++ b/disassembler/disassembler_x86.cc
@@ -1040,8 +1040,13 @@
       instr++;
     } else {
       CHECK_EQ(immediate_bytes, 4u);
-      args << StringPrintf("%d", *reinterpret_cast<const int32_t*>(instr));
-      instr += 4;
+      if (prefix[2] == 0x66) {  // Operand size override from 32-bit to 16-bit.
+        args << StringPrintf("%d", *reinterpret_cast<const int16_t*>(instr));
+        instr += 2;
+      } else {
+        args << StringPrintf("%d", *reinterpret_cast<const int32_t*>(instr));
+        instr += 4;
+      }
     }
   } else if (branch_bytes > 0) {
     DCHECK(!has_modrm);