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

Add "%" operator to the linker script. 

This patch improves compatibility with GNU linkers.

Differential Revision: https://reviews.llvm.org/D43883

llvm-svn: 326348
This commit is contained in:
Rui Ueyama 2018-02-28 18:38:13 +00:00
parent 1d20222a48
commit 39ba31ff50
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lld/ELF/ScriptParser.cpp
View File

@ -164,6 +164,13 @@ static ExprValue div(ExprValue A, ExprValue B) {
return 0;
}
static ExprValue mod(ExprValue A, ExprValue B) {
if (uint64_t BV = B.getValue())
return A.getValue() % BV;
error("modulo by zero");
return 0;
}
static ExprValue bitAnd(ExprValue A, ExprValue B) {
moveAbsRight(A, B);
return {A.Sec, A.ForceAbsolute,
@ -457,7 +464,7 @@ void ScriptParser::readSections() {
static int precedence(StringRef Op) {
return StringSwitch<int>(Op)
.Cases("*", "/", 5)
.Cases("*", "/", "%", 5)
.Cases("+", "-", 4)
.Cases("<<", ">>", 3)
.Cases("<", "<=", ">", ">=", "==", "!=", 2)
@ -807,6 +814,8 @@ static Expr combine(StringRef Op, Expr L, Expr R) {
return [=] { return L().getValue() * R().getValue(); };
if (Op == "/")
return [=] { return div(L(), R()); };
if (Op == "%")
return [=] { return mod(L(), R()); };
if (Op == "<<")
return [=] { return L().getValue() << R().getValue(); };
if (Op == ">>")

2
lld/test/ELF/linkerscript/operators.s
View File

@ -5,6 +5,7 @@
# RUN: plus = 1 + 2 + 3; \
# RUN: minus = 5 - 1; \
# RUN: div = 6 / 2; \
# RUN: mod = 20 % 7; \
# RUN: mul = 1 + 2 * 3; \
# RUN: nospace = 1+2*6/3; \
# RUN: braces = 1 + (2 + 3) * 4; \
@ -37,6 +38,7 @@
# CHECK: 00000000000006 *ABS* 00000000 plus
# CHECK: 00000000000004 *ABS* 00000000 minus
# CHECK: 00000000000003 *ABS* 00000000 div
# CHECK: 00000000000006 *ABS* 00000000 mod
# CHECK: 00000000000007 *ABS* 00000000 mul
# CHECK: 00000000000005 *ABS* 00000000 nospace
# CHECK: 00000000000015 *ABS* 00000000 braces