[lld] r295222 - Simplify operator tests.

Rui Ueyama via llvm-commits llvm-commits at lists.llvm.org
Wed Feb 15 11:36:01 PST 2017


Author: ruiu
Date: Wed Feb 15 13:36:01 2017
New Revision: 295222

URL: http://llvm.org/viewvc/llvm-project?rev=295222&view=rev
Log:
Simplify operator tests.

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

Modified: lld/trunk/test/ELF/linkerscript/operators.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/operators.s?rev=295222&r1=295221&r2=295222&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/operators.s (original)
+++ lld/trunk/test/ELF/linkerscript/operators.s Wed Feb 15 13:36:01 2017
@@ -1,122 +1,87 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 # RUN: echo "SECTIONS { \
-# RUN:  . = 0xFFF0; \
-# RUN:  . = . + 0x10; \
-# RUN:  .plus : { *(.plus) } \
-# RUN:  . = 0x11010 - 0x10; \
-# RUN:  .minus : { *(.minus) } \
-# RUN:  . = 0x24000 / 0x2; \
-# RUN:  .div : { *(.div) } \
-# RUN:  . = 0x11000 + 0x1000 * 0x2; \
-# RUN:  .mul : { *(.mul) } \
-# RUN:  . = 0x10000 + (0x1000 + 0x1000) * 0x2; \
-# RUN:  .bracket : { *(.bracket) } \
-# RUN:  . = 0x17000 & 0x15000; \
-# RUN:  .and : { *(.and) } \
-# RUN:  . = 0x1 ? 0x16000 : 0x999999; \
-# RUN:  .ternary1 : { *(.ternary1) } \
-# RUN:  . = 0x0 ? 0x999999 : 0x17000; \
-# RUN:  .ternary2 : { *(.ternary2) } \
-# RUN:  . = 0x0 < 0x1 ? 0x18000 : 0x999999; \
-# RUN:  .less : { *(.less) } \
-# RUN:  . = 0x1 <= 0x1 ? 0x19000 : 0x999999; \
-# RUN:  .lesseq : { *(.lesseq) } \
-# RUN:  . = 0x1 > 0x0 ? 0x20000 : 0x999999; \
-# RUN:  .great : { *(.great) } \
-# RUN:  . = 0x1 >= 0x1 ? 0x21000 : 0x999999; \
-# RUN:  .greateq : { *(.greateq) } \
-# RUN:  . = 0x1 == 0x1 ? 0x22000 : 0x999999; \
-# RUN:  .eq : { *(.eq) } \
-# RUN:  . = 0x2 != 0x1 ? 0x23000 : 0x999999; \
-# RUN:  .neq : { *(.neq) } \
-# RUN:  . = CONSTANT (MAXPAGESIZE) * 0x24; \
-# RUN:  .maxpagesize : { *(.maxpagesize) } \
-# RUN:  . = CONSTANT (COMMONPAGESIZE) * 0x25; \
-# RUN:  .commonpagesize : { *(.commonpagesize) } \
-# RUN:  . = DATA_SEGMENT_ALIGN (CONSTANT (MAXPAGESIZE), CONSTANT (COMMONPAGESIZE)); \
-# RUN:  .datasegmentalign : { *(.datasegmentalign) } \
-# RUN:  . = DATA_SEGMENT_END (.); \
-# RUN:  . = 0x27000; \
-# RUN:  . += 0x1000; \
-# RUN:  .plusassign : { *(.plusassign) } \
-# RUN:  . = ((. + 0x1fff) & ~(0x1000 + -1)); \
-# RUN:  .unary : { *(.unary) } \
-# RUN:  . = 0x30000 + (1 + 1 << 5); \
-# RUN:  .shiftl : { *(.shiftl) } \
-# RUN:  . = 0x30000 + (1 + 1023 >> 2); \
-# RUN:  .shiftr : { *(.shiftr) } \
-
+# RUN:  plus = 1 + 2 + 3; \
+# RUN:  minus = 5 - 1; \
+# RUN:  div = 6 / 2; \
+# RUN:  mul = 1 + 2 * 3; \
+# RUN:  braces = 1 + (2 + 3) * 4; \
+# RUN:  and = 0xbb & 0xee; \
+# RUN:  ternary1 = 1 ? 1 : 2; \
+# RUN:  ternary2 = 0 ? 1 : 2; \
+# RUN:  less = 1 < 0 ? 1 : 2; \
+# RUN:  lesseq = 1 <= 1 ? 1 : 2; \
+# RUN:  greater = 0 > 1 ? 1 : 2; \
+# RUN:  greatereq = 1 >= 1 ? 1 : 2; \
+# RUN:  eq = 1 == 1 ? 1 : 2; \
+# RUN:  neq = 1 != 1 ? 1 : 2; \
+# RUN:  plusassign = 1; \
+# RUN:  plusassign += 2; \
+# RUN:  unary = -1 + 3; \
+# RUN:  lshift = 1 << 5; \
+# RUN:  rshift = 0xff >> 3; \
+# RUN:  maxpagesize = CONSTANT (MAXPAGESIZE); \
+# RUN:  commonpagesize = CONSTANT (COMMONPAGESIZE); \
+# RUN:  . = 0xfff0; \
+# RUN:  datasegmentalign = DATA_SEGMENT_ALIGN (0xffff, 0); \
 # RUN: }" > %t.script
 # RUN: ld.lld %t --script %t.script -o %t2
-# RUN: llvm-objdump -section-headers %t2 | FileCheck %s
+# RUN: llvm-objdump -t %t2 | FileCheck %s
 
-# CHECK: .plus             {{.*}} 0000000000010000
-# CHECK: .minus            {{.*}} 0000000000011000
-# CHECK: .div              {{.*}} 0000000000012000
-# CHECK: .mul              {{.*}} 0000000000013000
-# CHECK: .bracket          {{.*}} 0000000000014000
-# CHECK: .and              {{.*}} 0000000000015000
-# CHECK: .ternary1         {{.*}} 0000000000016000
-# CHECK: .ternary2         {{.*}} 0000000000017000
-# CHECK: .less             {{.*}} 0000000000018000
-# CHECK: .lesseq           {{.*}} 0000000000019000
-# CHECK: .great            {{.*}} 0000000000020000
-# CHECK: .greateq          {{.*}} 0000000000021000
-# CHECK: .eq               {{.*}} 0000000000022000
-# CHECK: .neq              {{.*}} 0000000000023000
-# CHECK: .maxpagesize      {{.*}} 0000000000024000
-# CHECK: .commonpagesize   {{.*}} 0000000000025000
-# CHECK: .datasegmentalign {{.*}} 0000000000026000
-# CHECK: .plusassign       {{.*}} 0000000000028000
-# CHECK: .unary            {{.*}} 000000000002a000
-# CHECK: .shiftl           {{.*}} 0000000000030040
-# CHECK: .shiftr           {{.*}} 0000000000030100
+# CHECK: 00000000000006 *ABS* 00000000 plus
+# CHECK: 00000000000004 *ABS* 00000000 minus
+# CHECK: 00000000000003 *ABS* 00000000 div
+# CHECK: 00000000000007 *ABS* 00000000 mul
+# CHECK: 00000000000015 *ABS* 00000000 braces
+# CHECK: 000000000000aa *ABS* 00000000 and
+# CHECK: 00000000000001 *ABS* 00000000 ternary1
+# CHECK: 00000000000002 *ABS* 00000000 ternary2
+# CHECK: 00000000000002 *ABS* 00000000 less
+# CHECK: 00000000000001 *ABS* 00000000 lesseq
+# CHECK: 00000000000002 *ABS* 00000000 greater
+# CHECK: 00000000000001 *ABS* 00000000 greatereq
+# CHECK: 00000000000001 *ABS* 00000000 eq
+# CHECK: 00000000000002 *ABS* 00000000 neq
+# CHECK: 00000000000003 *ABS* 00000000 plusassign
+# CHECK: 00000000000002 *ABS* 00000000 unary
+# CHECK: 00000000000020 *ABS* 00000000 lshift
+# CHECK: 0000000000001f *ABS* 00000000 rshift
+# CHECK: 00000000001000 *ABS* 00000000 maxpagesize
+# CHECK: 00000000001000 *ABS* 00000000 commonpagesize
+# CHECK: 0000000000ffff *ABS* 00000000 datasegmentalign
 
 ## Mailformed number error.
-# RUN: echo "SECTIONS { \
-# RUN:  . = 0x12Q41; \
-# RUN: }" > %t.script
+# RUN: echo "SECTIONS { . = 0x12Q41; }" > %t.script
 # RUN: not ld.lld %t --script %t.script -o %t2 2>&1 | \
 # RUN:  FileCheck --check-prefix=NUMERR %s
 # NUMERR: malformed number: 0x12Q41
 
 ## Missing closing bracket.
-# RUN: echo "SECTIONS { \
-# RUN:  . = 0x10000 + (0x1000 + 0x1000 * 0x2; \
-# RUN: }" > %t.script
+# RUN: echo "SECTIONS { . = (1; }" > %t.script
 # RUN: not ld.lld %t --script %t.script -o %t2 2>&1 | \
 # RUN:  FileCheck --check-prefix=BRACKETERR %s
 # BRACKETERR: ) expected, but got ;
 
 ## Missing opening bracket.
-# RUN: echo "SECTIONS { \
-# RUN:  . = 0x10000 + 0x1000 + 0x1000) * 0x2; \
-# RUN: }" > %t.script
+# RUN: echo "SECTIONS { . = 1); }" > %t.script
 # RUN: not ld.lld %t --script %t.script -o %t2 2>&1 | \
 # RUN:  FileCheck --check-prefix=BRACKETERR2 %s
 # BRACKETERR2: ; expected, but got )
 
 ## Empty expression.
-# RUN: echo "SECTIONS { \
-# RUN:  . = ; \
-# RUN: }" > %t.script
+# RUN: echo "SECTIONS { . = ; }" > %t.script
 # RUN: not ld.lld %t --script %t.script -o %t2 2>&1 | \
 # RUN:  FileCheck --check-prefix=ERREXPR %s
 # ERREXPR: malformed number: ;
 
 ## Div by zero error.
-# RUN: echo "SECTIONS { \
-# RUN:  . = 0x10000 / 0x0; \
-# RUN: }" > %t.script
+# RUN: echo "SECTIONS { . = 1 / 0; }" > %t.script
 # RUN: not ld.lld %t --script %t.script -o %t2 2>&1 | \
 # RUN:  FileCheck --check-prefix=DIVZERO %s
 # DIVZERO: division by zero
 
 ## Broken ternary operator expression.
-# RUN: echo "SECTIONS { \
-# RUN:  . = 0x1 ? 0x2; \
-# RUN: }" > %t.script
+# RUN: echo "SECTIONS { . = 1 ? 2; }" > %t.script
 # RUN: not ld.lld %t --script %t.script -o %t2 2>&1 | \
 # RUN:  FileCheck --check-prefix=TERNERR %s
 # TERNERR: : expected, but got ;
@@ -124,66 +89,3 @@
 .globl _start
 _start:
 nop
-
-.section .plus, "a"
-.quad 0
-
-.section .minus, "a"
-.quad 0
-
-.section .div, "a"
-.quad 0
-
-.section .mul, "a"
-.quad 0
-
-.section .bracket, "a"
-.quad 0
-
-.section .and, "a"
-.quad 0
-
-.section .ternary1, "a"
-.quad 0
-
-.section .ternary2, "a"
-.quad 0
-
-.section .less, "a"
-.quad 0
-
-.section .lesseq, "a"
-.quad 0
-
-.section .great, "a"
-.quad 0
-
-.section .greateq, "a"
-.quad 0
-
-.section .eq, "a"
-.quad 0
-
-.section .neq, "a"
-.quad 0
-
-.section .maxpagesize, "a"
-.quad 0
-
-.section .commonpagesize, "a"
-.quad 0
-
-.section .datasegmentalign, "a"
-.quad 0
-
-.section .plusassign, "a"
-.quad 0
-
-.section .unary, "a"
-.quad 0
-
-.section .shiftl, "a"
-.quad 0
-
-.section .shiftr, "a"
-.quad 0




More information about the llvm-commits mailing list