diff options
| author | Peter Smith <peter.smith@linaro.org> | 2016-09-13 11:15:51 +0000 |
|---|---|---|
| committer | Peter Smith <peter.smith@linaro.org> | 2016-09-13 11:15:51 +0000 |
| commit | 85bbda191dd6205f31d2d42418953bb86d38c2da (patch) | |
| tree | 710c50044d4a3382b694e1fefb2169f3a2f1b55d /llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp | |
| parent | e2051efcbe51211ca954c2c7fda3725974ed4bdd (diff) | |
| download | llvm-85bbda191dd6205f31d2d42418953bb86d38c2da.zip llvm-85bbda191dd6205f31d2d42418953bb86d38c2da.tar.gz llvm-85bbda191dd6205f31d2d42418953bb86d38c2da.tar.bz2 | |
[ARM] Support ldr.w in pseudo instruction ldr rd,=immediate
The changes made in r269352, r269353 and r269354 to support the
transformation of the ldr rd,=immediate to mov introduced a regression
from 3.8 (ldr.w rd, =immediate) not supported.
This change puts support back in for ldr.w by means of a t2InstAlias for
the .w form. The .w is ignored in ARM state and propagated to the ldr in
Thumb2.
llvm-svn: 281319
Diffstat (limited to 'llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp')
| -rw-r--r-- | llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp b/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp index 78e033f..2b6fda0 100644 --- a/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp +++ b/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp @@ -7103,6 +7103,9 @@ bool ARMAsmParser::processInstruction(MCInst &Inst, else if (Inst.getOpcode() == ARM::t2LDRConstPool) TmpInst.setOpcode(ARM::t2LDRpci); const ARMOperand &PoolOperand = + (static_cast<ARMOperand &>(*Operands[2]).isToken() && + static_cast<ARMOperand &>(*Operands[2]).getToken() == ".w") ? + static_cast<ARMOperand &>(*Operands[4]) : static_cast<ARMOperand &>(*Operands[3]); const MCExpr *SubExprVal = PoolOperand.getConstantPoolImm(); // If SubExprVal is a constant we may be able to use a MOV |