[llvm] r205094 - Recommitted fix for PR18931, with extended tests set.
Stepan Dyatkovskiy
stpworld at narod.ru
Sat Mar 29 06:12:41 PDT 2014
Author: dyatkovskiy
Date: Sat Mar 29 08:12:40 2014
New Revision: 205094
URL: http://llvm.org/viewvc/llvm-project?rev=205094&view=rev
Log:
Recommitted fix for PR18931, with extended tests set.
Issue subject: Crash using integrated assembler with immediate arithmetic
Fix description:
Expressions like 'cmp r0, #(l1 - l2) >> 3' could not be evaluated on asm parsing stage,
since it is impossible to resolve labels on this stage. In the end of stage we still have
expression (MCExpr).
Then, when we want to encode it, we expect it to be an immediate, but it still an expression.
Patch introduces a Fixup (MCFixup instance), that is processed after main encoding stage.
Added:
llvm/trunk/test/MC/ARM/cmp-immediate-fixup-error.s
llvm/trunk/test/MC/ARM/cmp-immediate-fixup-error2.s
llvm/trunk/test/MC/ARM/cmp-immediate-fixup.s
llvm/trunk/test/MC/ARM/cmp-immediate-fixup2.s
Removed:
llvm/trunk/test/MC/ARM/label_offset.s
Modified:
llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMMCCodeEmitter.cpp
Modified: llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp?rev=205094&r1=205093&r2=205094&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp (original)
+++ llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp Sat Mar 29 08:12:40 2014
@@ -9359,7 +9359,7 @@ unsigned ARMAsmParser::validateTargetOpe
const MCExpr *SOExpr = Op->getImm();
int64_t Value;
if (!SOExpr->EvaluateAsAbsolute(Value))
- return Match_InvalidOperand;
+ return Match_Success;
assert((Value >= INT32_MIN && Value <= INT32_MAX) &&
"expression value must be representiable in 32 bits");
}
Modified: llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMMCCodeEmitter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMMCCodeEmitter.cpp?rev=205094&r1=205093&r2=205094&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMMCCodeEmitter.cpp (original)
+++ llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMMCCodeEmitter.cpp Sat Mar 29 08:12:40 2014
@@ -272,7 +272,25 @@ public:
unsigned getSOImmOpValue(const MCInst &MI, unsigned Op,
SmallVectorImpl<MCFixup> &Fixups,
const MCSubtargetInfo &STI) const {
- unsigned SoImm = MI.getOperand(Op).getImm();
+
+ const MCOperand &MO = MI.getOperand(Op);
+
+ // We expect MO to be an immediate or an expression,
+ // if it is an immediate - that's fine, just encode the value.
+ // Otherwise - create a Fixup.
+ if (MO.isExpr()) {
+ const MCExpr *Expr = MO.getExpr();
+ // In instruction code this value always encoded as lowest 12 bits,
+ // so we don't have to perform any specific adjustments.
+ // Due to requirements of relocatable records we have to use FK_Data_4.
+ // See ARMELFObjectWriter::ExplicitRelSym and
+ // ARMELFObjectWriter::GetRelocTypeInner for more details.
+ MCFixupKind Kind = MCFixupKind(FK_Data_4);
+ Fixups.push_back(MCFixup::Create(0, Expr, Kind, MI.getLoc()));
+ return 0;
+ }
+
+ unsigned SoImm = MO.getImm();
int SoImmVal = ARM_AM::getSOImmVal(SoImm);
assert(SoImmVal != -1 && "Not a valid so_imm value!");
Added: llvm/trunk/test/MC/ARM/cmp-immediate-fixup-error.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ARM/cmp-immediate-fixup-error.s?rev=205094&view=auto
==============================================================================
--- llvm/trunk/test/MC/ARM/cmp-immediate-fixup-error.s (added)
+++ llvm/trunk/test/MC/ARM/cmp-immediate-fixup-error.s Sat Mar 29 08:12:40 2014
@@ -0,0 +1,7 @@
+@ RUN: not llvm-mc -triple=arm-linux-gnueabi -filetype=obj < %s 2>&1 | FileCheck %s
+
+.text
+ cmp r0, #(l1 - unknownLabel + 4) >> 2
+@ CHECK: error: expected relocatable expression
+
+l1:
Added: llvm/trunk/test/MC/ARM/cmp-immediate-fixup-error2.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ARM/cmp-immediate-fixup-error2.s?rev=205094&view=auto
==============================================================================
--- llvm/trunk/test/MC/ARM/cmp-immediate-fixup-error2.s (added)
+++ llvm/trunk/test/MC/ARM/cmp-immediate-fixup-error2.s Sat Mar 29 08:12:40 2014
@@ -0,0 +1,7 @@
+@ RUN: not llvm-mc -triple=arm-linux-gnueabi -filetype=obj < %s 2>&1 | FileCheck %s
+
+.text
+ cmp r0, #(l1 - unknownLabel)
+@ CHECK: error: symbol 'unknownLabel' can not be undefined in a subtraction expression
+
+l1:
Added: llvm/trunk/test/MC/ARM/cmp-immediate-fixup.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ARM/cmp-immediate-fixup.s?rev=205094&view=auto
==============================================================================
--- llvm/trunk/test/MC/ARM/cmp-immediate-fixup.s (added)
+++ llvm/trunk/test/MC/ARM/cmp-immediate-fixup.s Sat Mar 29 08:12:40 2014
@@ -0,0 +1,9 @@
+@ PR18931
+@ RUN: llvm-mc < %s -triple=arm-linux-gnueabi -filetype=obj -o - \
+@ RUN: | llvm-objdump --disassemble -arch=arm - | FileCheck %s
+
+ .text
+@ CHECK: cmp r2, #1
+ cmp r2, #(l2 - l1 + 4) >> 2
+l1:
+l2:
Added: llvm/trunk/test/MC/ARM/cmp-immediate-fixup2.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ARM/cmp-immediate-fixup2.s?rev=205094&view=auto
==============================================================================
--- llvm/trunk/test/MC/ARM/cmp-immediate-fixup2.s (added)
+++ llvm/trunk/test/MC/ARM/cmp-immediate-fixup2.s Sat Mar 29 08:12:40 2014
@@ -0,0 +1,9 @@
+@ PR18931
+@ RUN: llvm-mc < %s -triple=arm-linux-gnueabi -filetype=obj -o - \
+@ RUN: | llvm-objdump --disassemble -arch=arm - | FileCheck %s
+
+ .text
+@ CHECK: cmp r2, #0
+ cmp r2, #(l2 - l1)
+l1:
+l2:
Removed: llvm/trunk/test/MC/ARM/label_offset.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ARM/label_offset.s?rev=205093&view=auto
==============================================================================
--- llvm/trunk/test/MC/ARM/label_offset.s (original)
+++ llvm/trunk/test/MC/ARM/label_offset.s (removed)
@@ -1,8 +0,0 @@
-@ RUN: not llvm-mc -triple=armv7-linux-gnuabi -filetype=obj < %s 2>&1 | FileCheck %s
-
-.text
- cmp r2, #(l2 - l1) >> 6
-@ CHECK: error: invalid operand for instruction
-
-l1:
-l2:
More information about the llvm-commits
mailing list