diff options
| author | Owen Anderson <resistor@mac.com> | 2011-09-09 22:24:36 +0000 |
|---|---|---|
| committer | Owen Anderson <resistor@mac.com> | 2011-09-09 22:24:36 +0000 |
| commit | 5bfb0e0a852533bc6b9248285503c05127d2395e (patch) | |
| tree | 8d17e9a3c906561c68dac57c1cf592ba588d7484 /llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp | |
| parent | 8b983d97734230615c48550772f6d3f7765bd6d5 (diff) | |
| download | bcm5719-llvm-5bfb0e0a852533bc6b9248285503c05127d2395e.tar.gz bcm5719-llvm-5bfb0e0a852533bc6b9248285503c05127d2395e.zip | |
Fix assembly/disassembly of Thumb2 ADR instructions with immediate operands.
llvm-svn: 139422
Diffstat (limited to 'llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp')
| -rw-r--r-- | llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp b/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp index 937c65edc72..0edb7a5d93e 100644 --- a/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp +++ b/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp @@ -299,6 +299,8 @@ static DecodeStatus DecodeT2LDRDPreInstruction(llvm::MCInst &Inst,unsigned Insn, uint64_t Address, const void *Decoder); static DecodeStatus DecodeT2STRDPreInstruction(llvm::MCInst &Inst,unsigned Insn, uint64_t Address, const void *Decoder); +static DecodeStatus DecodeT2Adr(llvm::MCInst &Inst, unsigned Val, + uint64_t Address, const void *Decoder); #include "ARMGenDisassemblerTables.inc" #include "ARMGenInstrInfo.inc" @@ -3762,3 +3764,19 @@ DecodeT2STRDPreInstruction(llvm::MCInst &Inst, unsigned Insn, return S; } + +static DecodeStatus DecodeT2Adr(llvm::MCInst &Inst, uint32_t Insn, + uint64_t Address, const void *Decoder) { + unsigned sign1 = fieldFromInstruction32(Insn, 21, 1); + unsigned sign2 = fieldFromInstruction32(Insn, 23, 1); + if (sign1 != sign2) return MCDisassembler::Fail; + + unsigned Val = fieldFromInstruction32(Insn, 0, 8); + Val |= fieldFromInstruction32(Insn, 12, 3) << 8; + Val |= fieldFromInstruction32(Insn, 26, 1) << 11; + Val |= sign1 << 12; + Inst.addOperand(MCOperand::CreateImm(SignExtend32<13>(Val))); + + return MCDisassembler::Success; +} + |
