Fix for pr24346: arm asm label calculation error in sub
authorJames Molloy <james.molloy@arm.com>
Fri, 1 Apr 2016 09:40:47 +0000 (09:40 +0000)
committerJames Molloy <james.molloy@arm.com>
Fri, 1 Apr 2016 09:40:47 +0000 (09:40 +0000)
commitb876c72bccdfcc2b57a3c36c0ac8874117a50981
tree83256f6bdec5fc9729ccc4b8185f465c09ce3bc2
parentc6ad97a3e7bf1d38e1f73f8351695aa833f10c69
Fix for pr24346: arm asm label calculation error in sub

Some ARM instructions encode 32-bit immediates as a 8-bit integer (0-255)
and a 4-bit rotation (0-30, even) in its least significant 12 bits. The
original fixup, FK_Data_4, patches the instruction by the value bit-to-bit,
regardless of the encoding. For example, assuming the label L1 and L2 are
0x0 and 0x104 respectively, the following instruction:

  add r0, r0, #(L2 - L1) ; expects 0x104, i.e., 260

would be assembled to the following, which adds 1 to r0, instead of 260:

  e2800104 add r0, r0, #4, 2 ; equivalently 1

The new fixup kind fixup_arm_mod_imm takes care of the encoding:

  e2800f41 add r0, r0, #260

Patch by Ting-Yuan Huang!

llvm-svn: 265122
llvm/lib/Target/ARM/MCTargetDesc/ARMAsmBackend.cpp
llvm/lib/Target/ARM/MCTargetDesc/ARMFixupKinds.h
llvm/lib/Target/ARM/MCTargetDesc/ARMMCCodeEmitter.cpp
llvm/test/MC/ARM/arm_fixups.s
llvm/test/MC/ARM/modified-immediate-fixup-error.s [new file with mode: 0644]
llvm/test/MC/ARM/modified-immediate-fixup.s [new file with mode: 0644]