[lld] r326348 - Add "%" operator to the linker script.

[Rui Ueyama via llvm-commits]

Author: ruiu
Date: Wed Feb 28 10:38:13 2018
New Revision: 326348

URL: http://llvm.org/viewvc/llvm-project?rev=326348&view=rev
Log:
Add "%" operator to the linker script.

This patch improves compatibility with GNU linkers.

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

Modified:
    lld/trunk/ELF/ScriptParser.cpp
    lld/trunk/test/ELF/linkerscript/operators.s

Modified: lld/trunk/ELF/ScriptParser.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/ScriptParser.cpp?rev=326348&r1=326347&r2=326348&view=diff
==============================================================================
--- lld/trunk/ELF/ScriptParser.cpp (original)
+++ lld/trunk/ELF/ScriptParser.cpp Wed Feb 28 10:38:13 2018
@@ -164,6 +164,13 @@ static ExprValue div(ExprValue A, ExprVa
   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
     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 == ">>")

Modified: lld/trunk/test/ELF/linkerscript/operators.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/operators.s?rev=326348&r1=326347&r2=326348&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/operators.s (original)
+++ lld/trunk/test/ELF/linkerscript/operators.s Wed Feb 28 10:38:13 2018
@@ -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