RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-24 11:42:57 +01:00
Code Issues Projects Releases Wiki Activity

Fix encoding of PC-relative Thumb1 LDR's when using immediate offsets instead of labels.

Browse Source 
llvm-svn: 138835
This commit is contained in:
Owen Anderson 2011-08-30 22:10:03 +00:00
parent 309c4b7ef6
commit 9465c7fee0
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Target/ARM/MCTargetDesc/ARMMCCodeEmitter.cpp
View File

@ -930,7 +930,10 @@ getAddrModeISOpValue(const MCInst &MI, unsigned OpIdx,
uint32_t ARMMCCodeEmitter:: uint32_t ARMMCCodeEmitter::
getAddrModePCOpValue(const MCInst &MI, unsigned OpIdx, getAddrModePCOpValue(const MCInst &MI, unsigned OpIdx,
SmallVectorImpl<MCFixup> &Fixups) const { SmallVectorImpl<MCFixup> &Fixups) const {
return ::getBranchTargetOpValue(MI, OpIdx, ARM::fixup_arm_thumb_cp, Fixups); const MCOperand MO = MI.getOperand(OpIdx);
if (MO.isExpr())
return ::getBranchTargetOpValue(MI, OpIdx, ARM::fixup_arm_thumb_cp, Fixups);
return (MO.getImm() >> 2);
} }
/// getAddrMode5OpValue - Return encoding info for 'reg +/- imm10' operand. /// getAddrMode5OpValue - Return encoding info for 'reg +/- imm10' operand.

5
test/MC/ARM/basic-thumb-instructions.s
View File

@ -224,10 +224,13 @@ _func:
@ LDR (literal) @ LDR (literal)
@------------------------------------------------------------------------------ @------------------------------------------------------------------------------
ldr r1, _foo ldr r1, _foo
ldr r3, #604
ldr r3, #368
@ CHECK: ldr r1, _foo @ encoding: [A,0x49] @ CHECK: ldr r1, _foo @ encoding: [A,0x49]
@ fixup A - offset: 0, value: _foo, kind: fixup_arm_thumb_cp @ 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]
@------------------------------------------------------------------------------ @------------------------------------------------------------------------------
@ LDR (register) @ LDR (register)