[llvm-branch-commits] [lld] r362043 - Merging r353865, r353866, and r353874:
Tom Stellard via llvm-branch-commits
llvm-branch-commits at lists.llvm.org
Wed May 29 17:31:30 PDT 2019
Author: tstellar
Date: Wed May 29 17:31:30 2019
New Revision: 362043
URL: http://llvm.org/viewvc/llvm-project?rev=362043&view=rev
Log:
Merging r353865, r353866, and r353874:
------------------------------------------------------------------------
r353865 | sfertile | 2019-02-12 09:48:22 -0800 (Tue, 12 Feb 2019) | 1 line
[PowerPC] Fix printing of negative offsets in call instruction dissasembly.
------------------------------------------------------------------------
------------------------------------------------------------------------
r353866 | sfertile | 2019-02-12 09:49:04 -0800 (Tue, 12 Feb 2019) | 4 lines
[PPC64] Update tests to reflect change in printing of call operand. [NFC]
The printing of branch operands for call instructions was changed to properly
handle negative offsets. Updating the tests to reflect that.
------------------------------------------------------------------------
------------------------------------------------------------------------
r353874 | sfertile | 2019-02-12 12:03:04 -0800 (Tue, 12 Feb 2019) | 5 lines
Fix undefined behaviour in PPCInstPrinter::printBranchOperand.
Fix the undefined behaviour introduced by my previous patch r353865 (left
shifting a potentially negative value), which was caught by the bots that run
UBSan.
------------------------------------------------------------------------
Modified:
lld/branches/release_80/test/ELF/ppc64-bsymbolic-toc-restore.s
lld/branches/release_80/test/ELF/ppc64-call-reach.s
lld/branches/release_80/test/ELF/ppc64-ifunc.s
lld/branches/release_80/test/ELF/ppc64-local-dynamic.s
lld/branches/release_80/test/ELF/ppc64-plt-stub.s
lld/branches/release_80/test/ELF/ppc64-rel-calls.s
lld/branches/release_80/test/ELF/ppc64-toc-restore-recursive-call.s
lld/branches/release_80/test/ELF/ppc64-toc-restore.s
Modified: lld/branches/release_80/test/ELF/ppc64-bsymbolic-toc-restore.s
URL: http://llvm.org/viewvc/llvm-project/lld/branches/release_80/test/ELF/ppc64-bsymbolic-toc-restore.s?rev=362043&r1=362042&r2=362043&view=diff
==============================================================================
--- lld/branches/release_80/test/ELF/ppc64-bsymbolic-toc-restore.s (original)
+++ lld/branches/release_80/test/ELF/ppc64-bsymbolic-toc-restore.s Wed May 29 17:31:30 2019
@@ -53,7 +53,7 @@ caller:
# CHECK-LABEL: caller
# CHECK: bl .+44
# CHECK-NEXT: mr 31, 3
-# CHECK-NEXT: bl .+67108816
+# CHECK-NEXT: bl .-48
# CHECK-NEXT: ld 2, 24(1)
# CHECK-NEXT: add 3, 3, 31
# CHECK-NEXT: addi 1, 1, 32
Modified: lld/branches/release_80/test/ELF/ppc64-call-reach.s
URL: http://llvm.org/viewvc/llvm-project/lld/branches/release_80/test/ELF/ppc64-call-reach.s?rev=362043&r1=362042&r2=362043&view=diff
==============================================================================
--- lld/branches/release_80/test/ELF/ppc64-call-reach.s (original)
+++ lld/branches/release_80/test/ELF/ppc64-call-reach.s Wed May 29 17:31:30 2019
@@ -62,7 +62,7 @@ test:
# CHECK: 10010024: {{.*}} b .+33554428
# NEGOFFSET-LABEL: test
-# NEGOFFSET: 10010014: {{.*}} bl .+33554432
+# NEGOFFSET: 10010014: {{.*}} bl .-33554432
# NEGOFFSET: 10010024: {{.*}} b .+33554432
# .branch_lt[0]
@@ -83,7 +83,7 @@ test:
# the offset is interpreted as a signed 26 bit value so 67108812 is actually
# -52.
# THUNK-LABEL: test:
-# THUNK: 10010034: {{.*}} bl .+67108812
+# THUNK: 10010034: {{.*}} bl .-52
# THUNK: 10010044: {{.*}} b .+67108812
# The offset from the TOC to the .branch_lt section is (-1 << 16) - 32768.
Modified: lld/branches/release_80/test/ELF/ppc64-ifunc.s
URL: http://llvm.org/viewvc/llvm-project/lld/branches/release_80/test/ELF/ppc64-ifunc.s?rev=362043&r1=362042&r2=362043&view=diff
==============================================================================
--- lld/branches/release_80/test/ELF/ppc64-ifunc.s (original)
+++ lld/branches/release_80/test/ELF/ppc64-ifunc.s Wed May 29 17:31:30 2019
@@ -42,9 +42,9 @@
# CHECK: _start:
# CHECK-NEXT: addis 2, 12, 2
# CHECK-NEXT: addi 2, 2, -32588
-# CHECK-NEXT: bl .+67108812
+# CHECK-NEXT: bl .-52
# CHECK-NEXT: ld 2, 24(1)
-# CHECK-NEXT: bl .+67108824
+# CHECK-NEXT: bl .-40
# CHECK-NEXT: ld 2, 24(1)
# Check tocbase
Modified: lld/branches/release_80/test/ELF/ppc64-local-dynamic.s
URL: http://llvm.org/viewvc/llvm-project/lld/branches/release_80/test/ELF/ppc64-local-dynamic.s?rev=362043&r1=362042&r2=362043&view=diff
==============================================================================
--- lld/branches/release_80/test/ELF/ppc64-local-dynamic.s (original)
+++ lld/branches/release_80/test/ELF/ppc64-local-dynamic.s Wed May 29 17:31:30 2019
@@ -113,7 +113,7 @@ k:
// Dis: test:
// Dis: addis 3, 2, 0
// Dis-NEXT: addi 3, 3, -32760
-// Dis-NEXT: bl .+67108804
+// Dis-NEXT: bl .-60
// Dis-NEXT: ld 2, 24(1)
// Dis-NEXT: addis 3, 3, 0
// Dis-NEXT: lwa 3, -32768(3)
Modified: lld/branches/release_80/test/ELF/ppc64-plt-stub.s
URL: http://llvm.org/viewvc/llvm-project/lld/branches/release_80/test/ELF/ppc64-plt-stub.s?rev=362043&r1=362042&r2=362043&view=diff
==============================================================================
--- lld/branches/release_80/test/ELF/ppc64-plt-stub.s (original)
+++ lld/branches/release_80/test/ELF/ppc64-plt-stub.s Wed May 29 17:31:30 2019
@@ -22,7 +22,7 @@
// CHECK: _start:
-// CHECK: bl .+67108824
+// CHECK: bl .-40
.text
.abiversion 2
.globl _start
Modified: lld/branches/release_80/test/ELF/ppc64-rel-calls.s
URL: http://llvm.org/viewvc/llvm-project/lld/branches/release_80/test/ELF/ppc64-rel-calls.s?rev=362043&r1=362042&r2=362043&view=diff
==============================================================================
--- lld/branches/release_80/test/ELF/ppc64-rel-calls.s (original)
+++ lld/branches/release_80/test/ELF/ppc64-rel-calls.s Wed May 29 17:31:30 2019
@@ -30,9 +30,8 @@ bar:
nop
blr
-# FIXME: The printing here is misleading, the branch offset here is negative.
-# CHECK: 1001000c: {{.*}} bl .+67108852
+# CHECK: 1001000c: {{.*}} bl .-12
# CHECK: 10010010: {{.*}} nop
-# CHECK: 10010014: {{.*}} bl .+67108844
+# CHECK: 10010014: {{.*}} bl .-20
# CHECK: 10010018: {{.*}} nop
# CHECK: 1001001c: {{.*}} blr
Modified: lld/branches/release_80/test/ELF/ppc64-toc-restore-recursive-call.s
URL: http://llvm.org/viewvc/llvm-project/lld/branches/release_80/test/ELF/ppc64-toc-restore-recursive-call.s?rev=362043&r1=362042&r2=362043&view=diff
==============================================================================
--- lld/branches/release_80/test/ELF/ppc64-toc-restore-recursive-call.s (original)
+++ lld/branches/release_80/test/ELF/ppc64-toc-restore-recursive-call.s Wed May 29 17:31:30 2019
@@ -18,7 +18,7 @@
# CHECK-NEXT: 10000:
# CHECK-LABEL: recursive_func
# CHECK-NEXT: 10014:
-# CHECK: 1003c: {{[0-9a-fA-F ]+}} bl .+67108804
+# CHECK: 1003c: {{.*}} bl .-60
# CHECK-NEXT: ld 2, 24(1)
.abiversion 2
Modified: lld/branches/release_80/test/ELF/ppc64-toc-restore.s
URL: http://llvm.org/viewvc/llvm-project/lld/branches/release_80/test/ELF/ppc64-toc-restore.s?rev=362043&r1=362042&r2=362043&view=diff
==============================================================================
--- lld/branches/release_80/test/ELF/ppc64-toc-restore.s (original)
+++ lld/branches/release_80/test/ELF/ppc64-toc-restore.s Wed May 29 17:31:30 2019
@@ -32,10 +32,10 @@ _start:
// CHECK: Disassembly of section .text:
// CHECK: _start:
-// CHECK: 1001001c: {{.*}} bl .+67108836
+// CHECK: 1001001c: {{.*}} bl .-28
// CHECK-NOT: 10010020: {{.*}} nop
// CHECK: 10010020: {{.*}} ld 2, 24(1)
-// CHECK: 10010024: {{.*}} bl .+67108848
+// CHECK: 10010024: {{.*}} bl .-16
// CHECK-NOT: 10010028: {{.*}} nop
// CHECK-NOT: 10010028: {{.*}} ld 2, 24(1)
@@ -68,5 +68,5 @@ last:
bl foo
nop
// CHECK: last:
-// CHECK: 10010038: {{.*}} bl .+67108808
+// CHECK: 10010038: {{.*}} bl .-56
// CHECK-NEXT: 1001003c: {{.*}} ld 2, 24(1)
More information about the llvm-branch-commits
mailing list