diff options
| author | Johnny Chen <johnny.chen@apple.com> | 2011-04-01 18:26:38 +0000 |
|---|---|---|
| committer | Johnny Chen <johnny.chen@apple.com> | 2011-04-01 18:26:38 +0000 |
| commit | fe6fba3fe632cadad20bc19f733b09f4ebc0e45d (patch) | |
| tree | 10d642c3dac87c66ffda7422137f5d5416f8b944 | |
| parent | 2b4d9b7f11624a86d02caf4f4ae30e4b05621241 (diff) | |
| download | bcm5719-llvm-fe6fba3fe632cadad20bc19f733b09f4ebc0e45d.tar.gz bcm5719-llvm-fe6fba3fe632cadad20bc19f733b09f4ebc0e45d.zip | |
Fix LDRi12 immediate operand, which was changed to be the second operand in $addrmode_imm12 => (ops GPR:$base, i32imm:$offsimm).
rdar://problem/9219356
llvm-svn: 128722
| -rw-r--r-- | llvm/lib/Target/ARM/Disassembler/ARMDisassemblerCore.cpp | 7 | ||||
| -rw-r--r-- | llvm/test/MC/Disassembler/ARM/arm-tests.txt | 9 |
2 files changed, 13 insertions, 3 deletions
diff --git a/llvm/lib/Target/ARM/Disassembler/ARMDisassemblerCore.cpp b/llvm/lib/Target/ARM/Disassembler/ARMDisassemblerCore.cpp index d3caca624df..c28f7e12efb 100644 --- a/llvm/lib/Target/ARM/Disassembler/ARMDisassemblerCore.cpp +++ b/llvm/lib/Target/ARM/Disassembler/ARMDisassemblerCore.cpp @@ -1098,10 +1098,11 @@ static bool DisassembleLdStFrm(MCInst &MI, unsigned Opcode, uint32_t insn, OpIdx += 1; } - // Disassemble the 12-bit immediate offset. + // Disassemble the 12-bit immediate offset, which is the second operand in + // $addrmode_imm12 => (ops GPR:$base, i32imm:$offsimm). + // unsigned Imm12 = slice(insn, 11, 0); - unsigned Offset = ARM_AM::getAM2Opc(AddrOpcode, Imm12, ARM_AM::no_shift, - IndexMode); + int Offset = AddrOpcode == ARM_AM::add ? 1 * Imm12 : -1 * Imm12; MI.addOperand(MCOperand::CreateImm(Offset)); OpIdx += 1; } else { diff --git a/llvm/test/MC/Disassembler/ARM/arm-tests.txt b/llvm/test/MC/Disassembler/ARM/arm-tests.txt index f10dea20227..7947c6a3d59 100644 --- a/llvm/test/MC/Disassembler/ARM/arm-tests.txt +++ b/llvm/test/MC/Disassembler/ARM/arm-tests.txt @@ -164,6 +164,15 @@ # CHECK: ldr r3, [pc, #144] 0x90 0x30 0x9f 0xe5 +# CHECK: ldr r3, [r0, #-4] +0x4 0x30 0x10 0xe5 + +# CHECK: ldr r5, [sp, r0, lsl #1]! +0x80 0x50 0xbd 0xe7 + +# CHECK: ldr r5, [r7], -r0, lsr #2 +0x20 0x51 0x17 0xe6 + # CHECK: strdeq r2, r3, [r0], -r8 0xf8 0x24 0x00 0x00 |
