wangtao
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add fixups for Thumb LDR/STR instructions. 

llvm-svn: 121858
This commit is contained in:
Bill Wendling 2010-12-15 08:51:02 +00:00
parent 844f6b6cfb
commit 03e7576dee
3 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
llvm/lib/Target/ARM/ARMAsmBackend.cpp
View File

@ -237,6 +237,9 @@ static unsigned adjustFixupValue(unsigned Kind, uint64_t Value) {
// 'off by 4' is implicitly handled by the half-word ordering of the // 'off by 4' is implicitly handled by the half-word ordering of the
// Thumb encoding, so we only need to adjust by 2 here. // Thumb encoding, so we only need to adjust by 2 here.
return ((Value - 2) >> 2) & 0xff; return ((Value - 2) >> 2) & 0xff;
case ARM::fixup_arm_thumb_ldst:
// Offset by 4.
return ((Value - 4) & 0x1f) << 6;
case ARM::fixup_arm_thumb_cb: { case ARM::fixup_arm_thumb_cb: {
// Offset by 4 and don't encode the lower bit, which is always 0. // Offset by 4 and don't encode the lower bit, which is always 0.
uint32_t Binary = (Value - 4) >> 1; uint32_t Binary = (Value - 4) >> 1;
@ -365,6 +368,7 @@ static unsigned getFixupKindNumBytes(unsigned Kind) {
case ARM::fixup_arm_thumb_br: case ARM::fixup_arm_thumb_br:
case ARM::fixup_arm_thumb_cb: case ARM::fixup_arm_thumb_cb:
case ARM::fixup_arm_thumb_ldst:
return 2; return 2;
case ARM::fixup_arm_ldst_pcrel_12: case ARM::fixup_arm_ldst_pcrel_12:

3
llvm/lib/Target/ARM/ARMFixupKinds.h
View File

@ -65,6 +65,9 @@ enum Fixups {
// fixup_arm_thumb_cp - Fixup for Thumb load/store from constant pool instrs. // fixup_arm_thumb_cp - Fixup for Thumb load/store from constant pool instrs.
fixup_arm_thumb_cp, fixup_arm_thumb_cp,
// fixup_arm_thumb_ldst - Fixup for Thumb load/store instrs.
fixup_arm_thumb_ldst,
// fixup_arm_thumb_bcc - Fixup for Thumb conditional branching instructions. // fixup_arm_thumb_bcc - Fixup for Thumb conditional branching instructions.
fixup_arm_thumb_bcc, fixup_arm_thumb_bcc,

16
llvm/lib/Target/ARM/ARMMCCodeEmitter.cpp
View File

@ -68,6 +68,7 @@ public:
{ "fixup_arm_thumb_blx", 7, 21, MCFixupKindInfo::FKF_IsPCRel }, { "fixup_arm_thumb_blx", 7, 21, MCFixupKindInfo::FKF_IsPCRel },
{ "fixup_arm_thumb_cb", 0, 16, 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", 1, 8, MCFixupKindInfo::FKF_IsPCRel },
{ "fixup_arm_thumb_ldst", 1, 8, MCFixupKindInfo::FKF_IsPCRel },
{ "fixup_arm_thumb_bcc", 1, 8, MCFixupKindInfo::FKF_IsPCRel }, { "fixup_arm_thumb_bcc", 1, 8, MCFixupKindInfo::FKF_IsPCRel },
{ "fixup_arm_movt_hi16", 0, 16, 0 }, { "fixup_arm_movt_hi16", 0, 16, 0 },
{ "fixup_arm_movw_lo16", 0, 16, 0 }, { "fixup_arm_movw_lo16", 0, 16, 0 },
@ -213,7 +214,7 @@ public:
/// getAddrModeISOpValue - Encode the t_addrmode_is# operands. /// getAddrModeISOpValue - Encode the t_addrmode_is# operands.
uint32_t getAddrModeISOpValue(const MCInst &MI, unsigned OpIdx, uint32_t getAddrModeISOpValue(const MCInst &MI, unsigned OpIdx,
SmallVectorImpl<MCFixup> &) const; SmallVectorImpl<MCFixup> &Fixups) const;
/// getAddrModePCOpValue - Return encoding for t_addrmode_pc operands. /// getAddrModePCOpValue - Return encoding for t_addrmode_pc operands.
uint32_t getAddrModePCOpValue(const MCInst &MI, unsigned OpIdx, uint32_t getAddrModePCOpValue(const MCInst &MI, unsigned OpIdx,
@ -817,14 +818,23 @@ getAddrModeThumbSPOpValue(const MCInst &MI, unsigned OpIdx,
/// getAddrModeISOpValue - Encode the t_addrmode_is# operands. /// getAddrModeISOpValue - Encode the t_addrmode_is# operands.
uint32_t ARMMCCodeEmitter:: uint32_t ARMMCCodeEmitter::
getAddrModeISOpValue(const MCInst &MI, unsigned OpIdx, getAddrModeISOpValue(const MCInst &MI, unsigned OpIdx,
SmallVectorImpl<MCFixup> &) const { SmallVectorImpl<MCFixup> &Fixups) const {
// [Rn, #imm] // [Rn, #imm]
// {7-3} = imm5 // {7-3} = imm5
// {2-0} = Rn // {2-0} = Rn
const MCOperand &MO = MI.getOperand(OpIdx); const MCOperand &MO = MI.getOperand(OpIdx);
const MCOperand &MO1 = MI.getOperand(OpIdx + 1); const MCOperand &MO1 = MI.getOperand(OpIdx + 1);
unsigned Rn = getARMRegisterNumbering(MO.getReg()); unsigned Rn = getARMRegisterNumbering(MO.getReg());
unsigned Imm5 = MO1.getImm(); unsigned Imm5 = 0;
if (MO1.isExpr()) {
const MCExpr *Expr = MO.getExpr();
MCFixupKind Kind = MCFixupKind(ARM::fixup_arm_thumb_ldst);
Fixups.push_back(MCFixup::Create(0, Expr, Kind));
} else {
Imm5 = MO1.getImm();
}
return ((Imm5 & 0x1f) << 3) | Rn; return ((Imm5 & 0x1f) << 3) | Rn;
} }