6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-21 18:24:23 +00:00
Code Issues Projects Releases Wiki Activity

my work on adding segment registers to LEA missed the

Browse Source 
disassembler.  Remove some code from the disassembler to
compensate, unbreaking disassembly of lea's.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@108226 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner
2010-07-13 04:23:55 +00:00
parent fd920fa59a
commit 37a746bc85
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/Target/X86/Disassembler/X86Disassembler.cpp
View File

@ -252,13 +252,8 @@ static bool translateRMRegister(MCInst &mcInst,
/// @param mcInst - The MCInst to append to. /// @param mcInst - The MCInst to append to.
/// @param insn - The instruction to extract Mod, R/M, and SIB fields /// @param insn - The instruction to extract Mod, R/M, and SIB fields
/// from. /// from.
/// @param sr - Whether or not to emit the segment register. The
/// LEA instruction does not expect a segment-register
/// operand.
/// @return - 0 on success; nonzero otherwise /// @return - 0 on success; nonzero otherwise
static bool translateRMMemory(MCInst &mcInst, static bool translateRMMemory(MCInst &mcInst, InternalInstruction &insn) {
InternalInstruction &insn,
bool sr) {
// Addresses in an MCInst are represented as five operands: // Addresses in an MCInst are represented as five operands:
// 1. basereg (register) The R/M base, or (if there is a SIB) the // 1. basereg (register) The R/M base, or (if there is a SIB) the
// SIB base // SIB base
@ -385,10 +380,7 @@ static bool translateRMMemory(MCInst &mcInst,
mcInst.addOperand(scaleAmount); mcInst.addOperand(scaleAmount);
mcInst.addOperand(indexReg); mcInst.addOperand(indexReg);
mcInst.addOperand(displacement); mcInst.addOperand(displacement);
mcInst.addOperand(segmentReg);
if (sr)
mcInst.addOperand(segmentReg);
return false; return false;
} }
@ -439,9 +431,8 @@ static bool translateRM(MCInst &mcInst,
case TYPE_M1616: case TYPE_M1616:
case TYPE_M1632: case TYPE_M1632:
case TYPE_M1664: case TYPE_M1664:
return translateRMMemory(mcInst, insn, true);
case TYPE_LEA: case TYPE_LEA:
return translateRMMemory(mcInst, insn, false); return translateRMMemory(mcInst, insn);
} }
} }

3
test/MC/Disassembler/simple-tests.txt
View File

@ -57,3 +57,6 @@
# CHECK: movq %cr0, %rcx # CHECK: movq %cr0, %rcx
0x0f 0x20 0xc1 0x0f 0x20 0xc1
# CHECK: leal 4(%rsp), %ecx
0x8d 0x4c 0x24 0x04