6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-07-29 10:25:12 +00:00
Code Issues Projects Releases Wiki Activity

Fix diassembler handling of rex.b when mod=00/01/10 and bbb=101. Mod=00 should ignore the base register entirely. Mod=01/10 should treat this as R13 plus displacment. Fixes PR18860.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@201507 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Craig Topper
2014-02-17 10:03:43 +00:00
parent e139a1e0e4
commit 3457506fb9
2 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Target/X86/Disassembler/X86DisassemblerDecoder.c
View File

@@ -1167,6 +1167,7 @@ static int readSIB(struct InternalInstruction* insn) {
switch (base) { switch (base) {
case 0x5: case 0x5:
case 0xd:
switch (modFromModRM(insn->modRM)) { switch (modFromModRM(insn->modRM)) {
case 0x0: case 0x0:
insn->eaDisplacement = EA_DISP_32; insn->eaDisplacement = EA_DISP_32;
@@ -1174,13 +1175,11 @@ static int readSIB(struct InternalInstruction* insn) {
break; break;
case 0x1: case 0x1:
insn->eaDisplacement = EA_DISP_8; insn->eaDisplacement = EA_DISP_8;
insn->sibBase = (insn->addressSize == 4 ? insn->sibBase = (SIBBase)(sibBaseBase + base);
SIB_BASE_EBP : SIB_BASE_RBP);
break; break;
case 0x2: case 0x2:
insn->eaDisplacement = EA_DISP_32; insn->eaDisplacement = EA_DISP_32;
insn->sibBase = (insn->addressSize == 4 ? insn->sibBase = (SIBBase)(sibBaseBase + base);
SIB_BASE_EBP : SIB_BASE_RBP);
break; break;
case 0x3: case 0x3:
debug("Cannot have Mod = 0b11 and a SIB byte"); debug("Cannot have Mod = 0b11 and a SIB byte");

24
test/MC/Disassembler/X86/x86-64.txt
View File

@@ -241,3 +241,27 @@
# CHECK: pextrw $3, %xmm3, (%rax) # CHECK: pextrw $3, %xmm3, (%rax)
0x66 0x0f 0x3a 0x15 0x18 0x03 0x66 0x0f 0x3a 0x15 0x18 0x03
# CHECK: $0, 305419896(,%r8)
0x43 0x80 0x04 0x05 0x78 0x56 0x34 0x12 0x00
# CHECK: $0, 305419896(%r13,%r8)
0x43 0x80 0x84 0x05 0x78 0x56 0x34 0x12 0x00
# CHECK: $0, 305419896(,%r8)
0x42 0x80 0x04 0x05 0x78 0x56 0x34 0x12 0x00
# CHECK: $0, 305419896(%rbp,%r8)
0x42 0x80 0x84 0x05 0x78 0x56 0x34 0x12 0x00
# CHECK: $0, 305419896(,%r12)
0x42 0x80 0x04 0x25 0x78 0x56 0x34 0x12 0x00
# CHECK: $0, 305419896(%rbp,%r12)
0x42 0x80 0x84 0x25 0x78 0x56 0x34 0x12 0x00
# CHECK: $0, 305419896
0x80 0x04 0x25 0x78 0x56 0x34 0x12 0x00
# CHECK: $0, 305419896(%rbp)
0x80 0x84 0x25 0x78 0x56 0x34 0x12 0x00