summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Grosbach <grosbach@apple.com>2011-08-19 18:20:48 +0000
committerJim Grosbach <grosbach@apple.com>2011-08-19 18:20:48 +0000
commit181d2f92b5b1a91b9fd1225d17758ea0f322af6e (patch)
tree05a22551dbf7d8a643d9ee6e9f90138dfe88fc89
parent23983d6bd92dad00aa981d35e3ee3f03eb80fef9 (diff)
downloadbcm5719-llvm-181d2f92b5b1a91b9fd1225d17758ea0f322af6e.tar.gz
bcm5719-llvm-181d2f92b5b1a91b9fd1225d17758ea0f322af6e.zip
Thumb assembly parsing and encoding for LDR(literal).
llvm-svn: 138052
-rw-r--r--llvm/lib/Target/ARM/MCTargetDesc/ARMAsmBackend.cpp2
-rw-r--r--llvm/test/MC/ARM/basic-thumb-instructions.s8
2 files changed, 9 insertions, 1 deletions
diff --git a/llvm/lib/Target/ARM/MCTargetDesc/ARMAsmBackend.cpp b/llvm/lib/Target/ARM/MCTargetDesc/ARMAsmBackend.cpp
index 89b5acefa53..8520c3fe4c4 100644
--- a/llvm/lib/Target/ARM/MCTargetDesc/ARMAsmBackend.cpp
+++ b/llvm/lib/Target/ARM/MCTargetDesc/ARMAsmBackend.cpp
@@ -79,7 +79,7 @@ public:
{ "fixup_arm_thumb_bl", 0, 32, MCFixupKindInfo::FKF_IsPCRel },
{ "fixup_arm_thumb_blx", 0, 32, MCFixupKindInfo::FKF_IsPCRel },
{ "fixup_arm_thumb_cb", 0, 16, MCFixupKindInfo::FKF_IsPCRel },
-{ "fixup_arm_thumb_cp", 1, 8, MCFixupKindInfo::FKF_IsPCRel },
+{ "fixup_arm_thumb_cp", 0, 8, MCFixupKindInfo::FKF_IsPCRel },
{ "fixup_arm_thumb_bcc", 0, 8, MCFixupKindInfo::FKF_IsPCRel },
// movw / movt: 16-bits immediate but scattered into two chunks 0 - 12, 16 - 19.
{ "fixup_arm_movt_hi16", 0, 20, 0 },
diff --git a/llvm/test/MC/ARM/basic-thumb-instructions.s b/llvm/test/MC/ARM/basic-thumb-instructions.s
index 9d19f33d724..63928a1b5fa 100644
--- a/llvm/test/MC/ARM/basic-thumb-instructions.s
+++ b/llvm/test/MC/ARM/basic-thumb-instructions.s
@@ -194,3 +194,11 @@ _func:
@ CHECK: ldr r2, [sp, #24] @ encoding: [0x06,0x9a]
@ CHECK: ldr r3, [sp, #1020] @ encoding: [0xff,0x9b]
+
+@------------------------------------------------------------------------------
+@ LDR (literal)
+@------------------------------------------------------------------------------
+ ldr r1, _foo
+
+@ CHECK: ldr r1, _foo @ encoding: [A,0x49]
+ @ fixup A - offset: 0, value: _foo, kind: fixup_arm_thumb_cp
OpenPOWER on IntegriCloud