diff options
| author | Jim Grosbach <grosbach@apple.com> | 2012-10-30 01:04:51 +0000 |
|---|---|---|
| committer | Jim Grosbach <grosbach@apple.com> | 2012-10-30 01:04:51 +0000 |
| commit | 8ba1474181fc3997cc8449d75065e1021c72d49b (patch) | |
| tree | 078093fda4e5c3f603865a26a8ddf62492937689 /test | |
| parent | c09856b5357af621fcb84a7b2b6bfbf630c244ef (diff) | |
| download | llvm-8ba1474181fc3997cc8449d75065e1021c72d49b.tar.gz llvm-8ba1474181fc3997cc8449d75065e1021c72d49b.tar.bz2 llvm-8ba1474181fc3997cc8449d75065e1021c72d49b.tar.xz | |
ARM: Better disassembly for pc-relative LDR.
When the operand is a plain immediate rather than a label, print it
as [pc, #imm] like we do for the Thumb2 wide encoding variant.
rdar://12154503
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@166991 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test')
| -rw-r--r-- | test/MC/ARM/basic-thumb-instructions.s | 4 | ||||
| -rw-r--r-- | test/MC/Disassembler/ARM/marked-up-thumb.txt | 2 | ||||
| -rw-r--r-- | test/MC/Disassembler/ARM/thumb-printf.txt | 6 | ||||
| -rw-r--r-- | test/MC/Disassembler/ARM/thumb-tests.txt | 2 | ||||
| -rw-r--r-- | test/MC/Disassembler/ARM/thumb1.txt | 2 |
5 files changed, 9 insertions, 7 deletions
diff --git a/test/MC/ARM/basic-thumb-instructions.s b/test/MC/ARM/basic-thumb-instructions.s index 4ee34ce6b4..22e21da88e 100644 --- a/test/MC/ARM/basic-thumb-instructions.s +++ b/test/MC/ARM/basic-thumb-instructions.s @@ -259,8 +259,8 @@ _func: @ CHECK: ldr r1, _foo @ encoding: [A,0x49] @ fixup A - offset: 0, value: _foo, kind: fixup_arm_thumb_cp -@ CHECK: ldr r3, #604 @ encoding: [0x97,0x4b] -@ CHECK: ldr r3, #368 @ encoding: [0x5c,0x4b] +@ CHECK: ldr r3, [pc, #604] @ encoding: [0x97,0x4b] +@ CHECK: ldr r3, [pc, #368] @ encoding: [0x5c,0x4b] @------------------------------------------------------------------------------ @ LDR (register) diff --git a/test/MC/Disassembler/ARM/marked-up-thumb.txt b/test/MC/Disassembler/ARM/marked-up-thumb.txt index d7807cde8b..65be28618b 100644 --- a/test/MC/Disassembler/ARM/marked-up-thumb.txt +++ b/test/MC/Disassembler/ARM/marked-up-thumb.txt @@ -1,5 +1,5 @@ # RUN: llvm-mc -triple=thumbv7-apple-darwin -mcpu=cortex-a8 -mdis < %s | FileCheck %s -# CHECK: ldr <reg:r4>, <imm:#32> +# CHECK: ldr <reg:r4>, <mem:[pc, <imm:#32>]> 0x08 0x4c # CHECK: push {<reg:r1>, <reg:r2>, <reg:r7>} 0x86 0xb4 diff --git a/test/MC/Disassembler/ARM/thumb-printf.txt b/test/MC/Disassembler/ARM/thumb-printf.txt index 8158a73edc..ca820444ad 100644 --- a/test/MC/Disassembler/ARM/thumb-printf.txt +++ b/test/MC/Disassembler/ARM/thumb-printf.txt @@ -7,17 +7,17 @@ # CHECK-NEXT: add r3, sp, #20 # CHECK-NEXT: ldr r5, [r3], #4 # CHECK-NEXT: str r3, [sp] -# CHECK-NEXT: ldr r3, #52 +# CHECK-NEXT: ldr r3, [pc, #52] # CHECK-NEXT: add r3, pc # CHECK-NEXT: ldr r0, [r3] # CHECK-NEXT: ldr r4, [r0] -# CHECK-NEXT: ldr r0, #48 +# CHECK-NEXT: ldr r0, [pc, #48] # CHECK-NEXT: add r0, pc # CHECK-NEXT: ldr r0, [r0] # CHECK-NEXT: ldr r0, [r0] # CHECK-NEXT: blx #191548 # CHECK-NEXT: cbnz r0, #6 -# CHECK-NEXT: ldr r1, #40 +# CHECK-NEXT: ldr r1, [pc, #40] # CHECK-NEXT: add r1, pc # CHECK-NEXT: ldr r1, [r1] # CHECK-NEXT: b #0 diff --git a/test/MC/Disassembler/ARM/thumb-tests.txt b/test/MC/Disassembler/ARM/thumb-tests.txt index c08585a371..757ce6e397 100644 --- a/test/MC/Disassembler/ARM/thumb-tests.txt +++ b/test/MC/Disassembler/ARM/thumb-tests.txt @@ -30,7 +30,7 @@ # CHECK: ldm r0!, {r1} 0x02 0xc8 -# CHECK: ldr r5, #432 +# CHECK: ldr r5, [pc, #432] 0x6c 0x4d # CHECK: str r0, [r3] diff --git a/test/MC/Disassembler/ARM/thumb1.txt b/test/MC/Disassembler/ARM/thumb1.txt index 5b70262310..de9596aab7 100644 --- a/test/MC/Disassembler/ARM/thumb1.txt +++ b/test/MC/Disassembler/ARM/thumb1.txt @@ -160,6 +160,7 @@ # CHECK: ldr r1, [sp] # CHECK: ldr r2, [sp, #24] # CHECK: ldr r3, [sp, #1020] +# CHECK: ldr r1, [pc, #12] 0x29 0x68 @@ -168,6 +169,7 @@ 0x00 0x99 0x06 0x9a 0xff 0x9b +0x03 0x49 #------------------------------------------------------------------------------ # LDR (register) |