6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-12 13:30:51 +00:00
Code Issues Projects Releases Wiki Activity

Recommitted fix for PR18931, with extended tests set.

Browse Source 
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.



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@205094 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Stepan Dyatkovskiy 2014-03-29 13:12:40 +00:00
parent 9f36b66324
commit 3fed2f133c
7 changed files with 52 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Target/ARM/AsmParser/ARMAsmParser.cpp
View File

@ -9359,7 +9359,7 @@ unsigned ARMAsmParser::validateTargetOperandClass(MCParsedAsmOperand *AsmOp,
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");
}

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

@ -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!");

7
test/MC/ARM/cmp-immediate-fixup-error.s Normal file
View File

@ -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:

7
test/MC/ARM/cmp-immediate-fixup-error2.s Normal file
View File

@ -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:

9
test/MC/ARM/cmp-immediate-fixup.s Normal file
View File

@ -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:

9
test/MC/ARM/cmp-immediate-fixup2.s Normal file
View File

@ -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:

8
test/MC/ARM/label_offset.s
View File

@ -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: