This is an archive of the discontinued LLVM Phabricator instance.

Differential D44207

[ELF] - Adjust rangeToString to report ranges in a different format.
ClosedPublic

Authored by grimar on Mar 7 2018, 6:54 AM.

Details

Reviewers
ruiu
• espindola
jhenderson
Commits
rGbf3c3846733c: [ELF] - Adjust rangeToString to report ranges in a different format.
rL326918: [ELF] - Adjust rangeToString to report ranges in a different format.
rLLD326918: [ELF] - Adjust rangeToString to report ranges in a different format.
Summary

It was raised during the review of D43819.
I think LLD usually use [X, Y] for reporting ranges, like below:
relocation R_386_16 out of range: 65536 is not in [0, 65535]

Patch changes rangeToString() to do the same.

Diff Detail

Event Timeline

grimar created this revision.Mar 7 2018, 6:54 AM
Herald added subscribers: arichardson, emaste. · View Herald TranscriptMar 7 2018, 6:54 AM
jhenderson accepted this revision.Mar 7 2018, 6:58 AM

LGTM.

This revision is now accepted and ready to land.Mar 7 2018, 6:58 AM
ruiu accepted this revision.Mar 7 2018, 9:40 AM

LGTM

Closed by commit rLLD326918: [ELF] - Adjust rangeToString to report ranges in a different format. (authored by grimar). · Explain WhyMar 7 2018, 9:56 AM
This revision was automatically updated to reflect the committed changes.
• rafael added a subscriber: • rafael.Mar 8 2018, 4:43 AM

LGTM

George Rimar via Phabricator via llvm-commits
<llvm-commits@lists.llvm.org> writes:

grimar created this revision.
grimar added reviewers: ruiu, espindola, jhenderson.
Herald added subscribers: arichardson, emaste.

It was raised during the review of https://reviews.llvm.org/D43819.
I think LLD usually use [X, Y] for reporting ranges, like below:
relocation R_386_16 out of range: 65536 is not in [0, 65535]

Patch changes rangeToString() to do the same.

https://reviews.llvm.org/D44207

Files:

ELF/Writer.cpp
test/ELF/linkerscript/overlapping-sections.s

Index: test/ELF/linkerscript/overlapping-sections.s

  • test/ELF/linkerscript/overlapping-sections.s

+++ test/ELF/linkerscript/overlapping-sections.s
@@ -63,8 +63,8 @@

  1. RUN: }" > %t-lma.script
  2. RUN: not ld.lld -o %t.so --script %t-lma.script %t.o -shared 2>&1 | FileCheck %s -check-prefix LMA-OVERLAP-ERR
  3. LMA-OVERLAP-ERR: error: section .sec1 load address range overlaps with .sec2
  4. LMA-OVERLAP-ERR-NEXT: >>> .sec1 range is [0x8000 -> 0x80FF]
  5. LMA-OVERLAP-ERR-NEXT: >>> .sec2 range is [0x8080 -> 0x817F]

+# LMA-OVERLAP-ERR-NEXT: >>> .sec1 range is [0x8000, 0x80FF]
+# LMA-OVERLAP-ERR-NEXT: >>> .sec2 range is [0x8080, 0x817F]

  1. Check that we create the expected binary with --noinhibit-exec or --no-check-sections:
  2. RUN: ld.lld -o %t.so --script %t-lma.script %t.o -shared --noinhibit-exec

@@ -95,8 +95,8 @@

  1. RUN: }" > %t-vaddr.script
  2. RUN: not ld.lld -o %t.so --script %t-vaddr.script %t.o -shared 2>&1 | FileCheck %s -check-prefix VADDR-OVERLAP-ERR
  3. VADDR-OVERLAP-ERR: error: section .sec1 virtual address range overlaps with .sec2
  4. VADDR-OVERLAP-ERR-NEXT: >>> .sec1 range is [0x8000 -> 0x80FF]
  5. VADDR-OVERLAP-ERR-NEXT: >>> .sec2 range is [0x8020 -> 0x811F]

+# VADDR-OVERLAP-ERR-NEXT: >>> .sec1 range is [0x8000, 0x80FF]
+# VADDR-OVERLAP-ERR-NEXT: >>> .sec2 range is [0x8020, 0x811F]

  1. Check that the expected binary was created with --noinhibit-exec:
  2. RUN: ld.lld -o %t.so --script %t-vaddr.script %t.o -shared --noinhibit-exec

@@ -123,14 +123,14 @@

  1. RUN: not ld.lld -o %t.so --script %t-both-overlap.script %t.o -shared 2>&1 | FileCheck %s -check-prefix BOTH-OVERLAP-ERR
  2. BOTH-OVERLAP-ERR: error: section .sec1 file range overlaps with .sec2
  3. BOTH-OVERLAP-ERR-NEXT: >>> .sec1 range is [0x18000 -> 0x180FF]
  4. BOTH-OVERLAP-ERR-NEXT: >>> .sec2 range is [0x18040 -> 0x1813F]

+# BOTH-OVERLAP-ERR-NEXT: >>> .sec1 range is [0x18000, 0x180FF]
+# BOTH-OVERLAP-ERR-NEXT: >>> .sec2 range is [0x18040, 0x1813F]

  1. BOTH-OVERLAP-ERR: error: section .sec1 virtual address range overlaps with .sec2
  2. BOTH-OVERLAP-ERR-NEXT: >>> .sec1 range is [0x8000 -> 0x80FF]
  3. BOTH-OVERLAP-ERR-NEXT: >>> .sec2 range is [0x8040 -> 0x813F]

+# BOTH-OVERLAP-ERR-NEXT: >>> .sec1 range is [0x8000, 0x80FF]
+# BOTH-OVERLAP-ERR-NEXT: >>> .sec2 range is [0x8040, 0x813F]

  1. BOTH-OVERLAP-ERR: error: section .sec1 load address range overlaps with .sec2
  2. BOTH-OVERLAP-ERR-NEXT: >>> .sec1 range is [0x8000 -> 0x80FF]
  3. BOTH-OVERLAP-ERR-NEXT: >>> .sec2 range is [0x8040 -> 0x813F]

+# BOTH-OVERLAP-ERR-NEXT: >>> .sec1 range is [0x8000, 0x80FF]
+# BOTH-OVERLAP-ERR-NEXT: >>> .sec2 range is [0x8040, 0x813F]

  1. RUN: ld.lld -o %t.so --script %t-both-overlap.script %t.o -shared --noinhibit-exec
  2. Note: I case everything overlaps we create a binary with overlapping file

Index: ELF/Writer.cpp

  • ELF/Writer.cpp

+++ ELF/Writer.cpp
@@ -1937,7 +1937,7 @@
static std::string rangeToString(uint64_t Addr, uint64_t Len) {

if (Len == 0)
  return "<empty range at 0x" + utohexstr(Addr) + ">";
  • return "[0x" + utohexstr(Addr) + " -> 0x" + utohexstr(Addr + Len - 1) + "]";

+ return "[0x" + utohexstr(Addr) + ", 0x" + utohexstr(Addr + Len - 1) + "]";
}

// Check whether sections overlap for a specific address range (file offsets,

Index: test/ELF/linkerscript/overlapping-sections.s

  • test/ELF/linkerscript/overlapping-sections.s

+++ test/ELF/linkerscript/overlapping-sections.s
@@ -63,8 +63,8 @@

  1. RUN: }" > %t-lma.script
  2. RUN: not ld.lld -o %t.so --script %t-lma.script %t.o -shared 2>&1 | FileCheck %s -check-prefix LMA-OVERLAP-ERR
  3. LMA-OVERLAP-ERR: error: section .sec1 load address range overlaps with .sec2
  4. LMA-OVERLAP-ERR-NEXT: >>> .sec1 range is [0x8000 -> 0x80FF]
  5. LMA-OVERLAP-ERR-NEXT: >>> .sec2 range is [0x8080 -> 0x817F]

+# LMA-OVERLAP-ERR-NEXT: >>> .sec1 range is [0x8000, 0x80FF]
+# LMA-OVERLAP-ERR-NEXT: >>> .sec2 range is [0x8080, 0x817F]

  1. Check that we create the expected binary with --noinhibit-exec or --no-check-sections:
  2. RUN: ld.lld -o %t.so --script %t-lma.script %t.o -shared --noinhibit-exec

@@ -95,8 +95,8 @@

  1. RUN: }" > %t-vaddr.script
  2. RUN: not ld.lld -o %t.so --script %t-vaddr.script %t.o -shared 2>&1 | FileCheck %s -check-prefix VADDR-OVERLAP-ERR
  3. VADDR-OVERLAP-ERR: error: section .sec1 virtual address range overlaps with .sec2
  4. VADDR-OVERLAP-ERR-NEXT: >>> .sec1 range is [0x8000 -> 0x80FF]
  5. VADDR-OVERLAP-ERR-NEXT: >>> .sec2 range is [0x8020 -> 0x811F]

+# VADDR-OVERLAP-ERR-NEXT: >>> .sec1 range is [0x8000, 0x80FF]
+# VADDR-OVERLAP-ERR-NEXT: >>> .sec2 range is [0x8020, 0x811F]

  1. Check that the expected binary was created with --noinhibit-exec:
  2. RUN: ld.lld -o %t.so --script %t-vaddr.script %t.o -shared --noinhibit-exec

@@ -123,14 +123,14 @@

  1. RUN: not ld.lld -o %t.so --script %t-both-overlap.script %t.o -shared 2>&1 | FileCheck %s -check-prefix BOTH-OVERLAP-ERR
  2. BOTH-OVERLAP-ERR: error: section .sec1 file range overlaps with .sec2
  3. BOTH-OVERLAP-ERR-NEXT: >>> .sec1 range is [0x18000 -> 0x180FF]
  4. BOTH-OVERLAP-ERR-NEXT: >>> .sec2 range is [0x18040 -> 0x1813F]

+# BOTH-OVERLAP-ERR-NEXT: >>> .sec1 range is [0x18000, 0x180FF]
+# BOTH-OVERLAP-ERR-NEXT: >>> .sec2 range is [0x18040, 0x1813F]

  1. BOTH-OVERLAP-ERR: error: section .sec1 virtual address range overlaps with .sec2
  2. BOTH-OVERLAP-ERR-NEXT: >>> .sec1 range is [0x8000 -> 0x80FF]
  3. BOTH-OVERLAP-ERR-NEXT: >>> .sec2 range is [0x8040 -> 0x813F]

+# BOTH-OVERLAP-ERR-NEXT: >>> .sec1 range is [0x8000, 0x80FF]
+# BOTH-OVERLAP-ERR-NEXT: >>> .sec2 range is [0x8040, 0x813F]

  1. BOTH-OVERLAP-ERR: error: section .sec1 load address range overlaps with .sec2
  2. BOTH-OVERLAP-ERR-NEXT: >>> .sec1 range is [0x8000 -> 0x80FF]
  3. BOTH-OVERLAP-ERR-NEXT: >>> .sec2 range is [0x8040 -> 0x813F]

+# BOTH-OVERLAP-ERR-NEXT: >>> .sec1 range is [0x8000, 0x80FF]
+# BOTH-OVERLAP-ERR-NEXT: >>> .sec2 range is [0x8040, 0x813F]

  1. RUN: ld.lld -o %t.so --script %t-both-overlap.script %t.o -shared --noinhibit-exec
  2. Note: I case everything overlaps we create a binary with overlapping file

Index: ELF/Writer.cpp

  • ELF/Writer.cpp

+++ ELF/Writer.cpp
@@ -1937,7 +1937,7 @@
static std::string rangeToString(uint64_t Addr, uint64_t Len) {

if (Len == 0)
  return "<empty range at 0x" + utohexstr(Addr) + ">";
  • return "[0x" + utohexstr(Addr) + " -> 0x" + utohexstr(Addr + Len - 1) + "]";

+ return "[0x" + utohexstr(Addr) + ", 0x" + utohexstr(Addr + Len - 1) + "]";
}

// Check whether sections overlap for a specific address range (file offsets,

llvm-commits mailing list
llvm-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits

Revision Contents

PathSize
ELF/
2 lines
test/
ELF/
linkerscript/
20 lines

Diff 137383

ELF/Writer.cpp

Show First 20 Lines • Show All 1,931 Lines • ▼ Show 20 Lines if (P->p_type == PT_TLS) {
P->p_memsz = alignTo(P->p_memsz, P->p_align); P->p_memsz = alignTo(P->p_memsz, P->p_align);
} }
} }
} }
static std::string rangeToString(uint64_t Addr, uint64_t Len) { static std::string rangeToString(uint64_t Addr, uint64_t Len) {
if (Len == 0) if (Len == 0)
return "<empty range at 0x" + utohexstr(Addr) + ">"; return "<empty range at 0x" + utohexstr(Addr) + ">";
return "[0x" + utohexstr(Addr) + " -> 0x" + utohexstr(Addr + Len - 1) + "]"; return "[0x" + utohexstr(Addr) + ", 0x" + utohexstr(Addr + Len - 1) + "]";
} }
// Check whether sections overlap for a specific address range (file offsets, // Check whether sections overlap for a specific address range (file offsets,
// load and virtual adresses). // load and virtual adresses).
// //
// This is a helper function called by Writer::checkNoOverlappingSections(). // This is a helper function called by Writer::checkNoOverlappingSections().
template <typename Getter, typename Predicate> template <typename Getter, typename Predicate>
static void checkForSectionOverlap(ArrayRef<OutputSection *> AllSections, static void checkForSectionOverlap(ArrayRef<OutputSection *> AllSections,
▲ Show 20 Lines • Show All 293 Lines • Show Last 20 Lines

test/ELF/linkerscript/overlapping-sections.s

Show First 20 Lines • Show All 57 Lines • ▼ Show 20 Lines
# GOOD-NEXT: } # GOOD-NEXT: }
# RUN: echo "SECTIONS { \ # RUN: echo "SECTIONS { \
# RUN: .sec1 0x8000 : AT(0x8000) { sec1_start = .; *(.first_sec) sec1_end = .;} \ # RUN: .sec1 0x8000 : AT(0x8000) { sec1_start = .; *(.first_sec) sec1_end = .;} \
# RUN: .sec2 0x8800 : AT(0x8080) { sec2_start = .; *(.second_sec) sec2_end = .;} \ # RUN: .sec2 0x8800 : AT(0x8080) { sec2_start = .; *(.second_sec) sec2_end = .;} \
# RUN: }" > %t-lma.script # RUN: }" > %t-lma.script
# RUN: not ld.lld -o %t.so --script %t-lma.script %t.o -shared 2>&1 | FileCheck %s -check-prefix LMA-OVERLAP-ERR # RUN: not ld.lld -o %t.so --script %t-lma.script %t.o -shared 2>&1 | FileCheck %s -check-prefix LMA-OVERLAP-ERR
# LMA-OVERLAP-ERR: error: section .sec1 load address range overlaps with .sec2 # LMA-OVERLAP-ERR: error: section .sec1 load address range overlaps with .sec2
# LMA-OVERLAP-ERR-NEXT: >>> .sec1 range is [0x8000 -> 0x80FF] # LMA-OVERLAP-ERR-NEXT: >>> .sec1 range is [0x8000, 0x80FF]
# LMA-OVERLAP-ERR-NEXT: >>> .sec2 range is [0x8080 -> 0x817F] # LMA-OVERLAP-ERR-NEXT: >>> .sec2 range is [0x8080, 0x817F]
# Check that we create the expected binary with --noinhibit-exec or --no-check-sections: # Check that we create the expected binary with --noinhibit-exec or --no-check-sections:
# RUN: ld.lld -o %t.so --script %t-lma.script %t.o -shared --noinhibit-exec # RUN: ld.lld -o %t.so --script %t-lma.script %t.o -shared --noinhibit-exec
# RUN: ld.lld -o %t.so --script %t-lma.script %t.o -shared --no-check-sections -fatal-warnings # RUN: ld.lld -o %t.so --script %t-lma.script %t.o -shared --no-check-sections -fatal-warnings
# RUN: ld.lld -o %t.so --script %t-lma.script %t.o -shared --check-sections --no-check-sections -fatal-warnings # RUN: ld.lld -o %t.so --script %t-lma.script %t.o -shared --check-sections --no-check-sections -fatal-warnings
# Verify that the .sec2 was indeed placed in a PT_LOAD where the PhysAddr # Verify that the .sec2 was indeed placed in a PT_LOAD where the PhysAddr
# overlaps with where .sec1 is loaded: # overlaps with where .sec1 is loaded:
Show All 14 Lines
# Now try a script where the virtual memory addresses overlap but ensure that the # Now try a script where the virtual memory addresses overlap but ensure that the
# load addresses don't: # load addresses don't:
# RUN: echo "SECTIONS { \ # RUN: echo "SECTIONS { \
# RUN: .sec1 0x8000 : AT(0x8000) { sec1_start = .; *(.first_sec) sec1_end = .;} \ # RUN: .sec1 0x8000 : AT(0x8000) { sec1_start = .; *(.first_sec) sec1_end = .;} \
# RUN: .sec2 0x8020 : AT(0x8800) { sec2_start = .; *(.second_sec) sec2_end = .;} \ # RUN: .sec2 0x8020 : AT(0x8800) { sec2_start = .; *(.second_sec) sec2_end = .;} \
# RUN: }" > %t-vaddr.script # RUN: }" > %t-vaddr.script
# RUN: not ld.lld -o %t.so --script %t-vaddr.script %t.o -shared 2>&1 | FileCheck %s -check-prefix VADDR-OVERLAP-ERR # RUN: not ld.lld -o %t.so --script %t-vaddr.script %t.o -shared 2>&1 | FileCheck %s -check-prefix VADDR-OVERLAP-ERR
# VADDR-OVERLAP-ERR: error: section .sec1 virtual address range overlaps with .sec2 # VADDR-OVERLAP-ERR: error: section .sec1 virtual address range overlaps with .sec2
# VADDR-OVERLAP-ERR-NEXT: >>> .sec1 range is [0x8000 -> 0x80FF] # VADDR-OVERLAP-ERR-NEXT: >>> .sec1 range is [0x8000, 0x80FF]
# VADDR-OVERLAP-ERR-NEXT: >>> .sec2 range is [0x8020 -> 0x811F] # VADDR-OVERLAP-ERR-NEXT: >>> .sec2 range is [0x8020, 0x811F]
# Check that the expected binary was created with --noinhibit-exec: # Check that the expected binary was created with --noinhibit-exec:
# RUN: ld.lld -o %t.so --script %t-vaddr.script %t.o -shared --noinhibit-exec # RUN: ld.lld -o %t.so --script %t-vaddr.script %t.o -shared --noinhibit-exec
# RUN: llvm-readobj -sections -program-headers -elf-output-style=GNU %t.so | FileCheck %s -check-prefix BAD-VADDR # RUN: llvm-readobj -sections -program-headers -elf-output-style=GNU %t.so | FileCheck %s -check-prefix BAD-VADDR
# BAD-VADDR-LABEL: Section Headers: # BAD-VADDR-LABEL: Section Headers:
# BAD-VADDR: .sec1 PROGBITS 0000000000008000 018000 000100 00 WA 0 0 1 # BAD-VADDR: .sec1 PROGBITS 0000000000008000 018000 000100 00 WA 0 0 1
# BAD-VADDR: .sec2 PROGBITS 0000000000008020 028020 000100 00 WA 0 0 1 # BAD-VADDR: .sec2 PROGBITS 0000000000008020 028020 000100 00 WA 0 0 1
# BAD-VADDR-LABEL: Program Headers: # BAD-VADDR-LABEL: Program Headers:
Show All 10 Lines
# RUN: echo "SECTIONS { \ # RUN: echo "SECTIONS { \
# RUN: .sec1 0x8000 : { sec1_start = .; *(.first_sec) sec1_end = .;} \ # RUN: .sec1 0x8000 : { sec1_start = .; *(.first_sec) sec1_end = .;} \
# RUN: .sec2 0x8040 : { sec2_start = .; *(.second_sec) sec2_end = .;} \ # RUN: .sec2 0x8040 : { sec2_start = .; *(.second_sec) sec2_end = .;} \
# RUN: }" > %t-both-overlap.script # RUN: }" > %t-both-overlap.script
# RUN: not ld.lld -o %t.so --script %t-both-overlap.script %t.o -shared 2>&1 | FileCheck %s -check-prefix BOTH-OVERLAP-ERR # RUN: not ld.lld -o %t.so --script %t-both-overlap.script %t.o -shared 2>&1 | FileCheck %s -check-prefix BOTH-OVERLAP-ERR
# BOTH-OVERLAP-ERR: error: section .sec1 file range overlaps with .sec2 # BOTH-OVERLAP-ERR: error: section .sec1 file range overlaps with .sec2
# BOTH-OVERLAP-ERR-NEXT: >>> .sec1 range is [0x18000 -> 0x180FF] # BOTH-OVERLAP-ERR-NEXT: >>> .sec1 range is [0x18000, 0x180FF]
# BOTH-OVERLAP-ERR-NEXT: >>> .sec2 range is [0x18040 -> 0x1813F] # BOTH-OVERLAP-ERR-NEXT: >>> .sec2 range is [0x18040, 0x1813F]
# BOTH-OVERLAP-ERR: error: section .sec1 virtual address range overlaps with .sec2 # BOTH-OVERLAP-ERR: error: section .sec1 virtual address range overlaps with .sec2
# BOTH-OVERLAP-ERR-NEXT: >>> .sec1 range is [0x8000 -> 0x80FF] # BOTH-OVERLAP-ERR-NEXT: >>> .sec1 range is [0x8000, 0x80FF]
# BOTH-OVERLAP-ERR-NEXT: >>> .sec2 range is [0x8040 -> 0x813F] # BOTH-OVERLAP-ERR-NEXT: >>> .sec2 range is [0x8040, 0x813F]
# BOTH-OVERLAP-ERR: error: section .sec1 load address range overlaps with .sec2 # BOTH-OVERLAP-ERR: error: section .sec1 load address range overlaps with .sec2
# BOTH-OVERLAP-ERR-NEXT: >>> .sec1 range is [0x8000 -> 0x80FF] # BOTH-OVERLAP-ERR-NEXT: >>> .sec1 range is [0x8000, 0x80FF]
# BOTH-OVERLAP-ERR-NEXT: >>> .sec2 range is [0x8040 -> 0x813F] # BOTH-OVERLAP-ERR-NEXT: >>> .sec2 range is [0x8040, 0x813F]
# RUN: ld.lld -o %t.so --script %t-both-overlap.script %t.o -shared --noinhibit-exec # RUN: ld.lld -o %t.so --script %t-both-overlap.script %t.o -shared --noinhibit-exec
# Note: I case everything overlaps we create a binary with overlapping file # Note: I case everything overlaps we create a binary with overlapping file
# offsets. ld.bfd seems to place .sec1 to file offset 18000 and .sec2 # offsets. ld.bfd seems to place .sec1 to file offset 18000 and .sec2
# at 18100 so that only virtual addr and LMA overlap # at 18100 so that only virtual addr and LMA overlap
# However, in order to create such a broken binary the user has to ignore a # However, in order to create such a broken binary the user has to ignore a
# fatal error by passing --noinhibit-exec, so this behaviour is fine. # fatal error by passing --noinhibit-exec, so this behaviour is fine.
Show All 30 Lines