summaryrefslogtreecommitdiffstats
path: root/disassembler
diff options
context:
space:
mode:
authorIan Rogers <irogers@google.com>2014-04-24 06:20:29 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-04-24 06:20:29 +0000
commit96a4f29350bf279d48bff70e21e3264cce216683 (patch)
tree185fd3643ae9503c2506c24b26c9869dd34fbbf3 /disassembler
parentae55e6c0c6a6fa393742a00ac5b7748f9ce45344 (diff)
parentfba52f1b4bf753790c1d98265c4b0fabb54c7536 (diff)
downloadart-96a4f29350bf279d48bff70e21e3264cce216683.zip
art-96a4f29350bf279d48bff70e21e3264cce216683.tar.gz
art-96a4f29350bf279d48bff70e21e3264cce216683.tar.bz2
Merge "ART: Fixes an issue with REX prefix for instructions with no ModRM byte"
Diffstat (limited to 'disassembler')
-rw-r--r--disassembler/disassembler_x86.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/disassembler/disassembler_x86.cc b/disassembler/disassembler_x86.cc
index 68e77d4..1b96a2b 100644
--- a/disassembler/disassembler_x86.cc
+++ b/disassembler/disassembler_x86.cc
@@ -735,7 +735,7 @@ DISASSEMBLER_ENTRY(cmp,
std::ostringstream args;
if (reg_in_opcode) {
DCHECK(!has_modrm);
- DumpReg(args, rex, *instr & 0x7, false, prefix[2], GPR);
+ DumpBaseReg(args, rex, *instr & 0x7);
}
instr++;
uint32_t address_bits = 0;