diff options
| author | Craig Topper <craig.topper@gmail.com> | 2014-01-25 22:48:43 +0000 |
|---|---|---|
| committer | Craig Topper <craig.topper@gmail.com> | 2014-01-25 22:48:43 +0000 |
| commit | c45addd6e4c7965ecd68ee89693200ddae0d29a4 (patch) | |
| tree | 64aef8e54bfc3e438d2256cced13b757af8a51db | |
| parent | 1299df2a0b75f4d18a3142466423a1b21a92c45b (diff) | |
| download | llvm-c45addd6e4c7965ecd68ee89693200ddae0d29a4.tar.gz llvm-c45addd6e4c7965ecd68ee89693200ddae0d29a4.tar.bz2 llvm-c45addd6e4c7965ecd68ee89693200ddae0d29a4.tar.xz | |
Set displacementSize to 1 for instrucitons with mod==0x1. Fixes PR17310. Modified from patch by James Courtier-Dutton.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@200100 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Target/X86/Disassembler/X86DisassemblerDecoder.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/Target/X86/Disassembler/X86DisassemblerDecoder.c b/lib/Target/X86/Disassembler/X86DisassemblerDecoder.c index 85f74358d9..66088bd88e 100644 --- a/lib/Target/X86/Disassembler/X86DisassemblerDecoder.c +++ b/lib/Target/X86/Disassembler/X86DisassemblerDecoder.c @@ -1311,6 +1311,7 @@ static int readModRM(struct InternalInstruction* insn) { case 0x1: insn->eaBase = (EABase)(insn->eaBaseBase + rm); insn->eaDisplacement = EA_DISP_8; + insn->displacementSize = 1; if (readDisplacement(insn)) return -1; break; @@ -1356,6 +1357,8 @@ static int readModRM(struct InternalInstruction* insn) { } break; case 0x1: + insn->displacementSize = 1; + // FALLTHROUGH case 0x2: insn->eaDisplacement = (mod == 0x1 ? EA_DISP_8 : EA_DISP_32); switch (rm) { |