Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lld/ELF/Arch/ARM.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ bool ARM::inBranchRange(RelType type, uint64_t src, uint64_t dst) const {
// Bit 0 == 1 denotes Thumb state, it is not part of the range.
dst &= ~0x1;

int64_t offset = dst - src;
int64_t offset = llvm::SignExtend64<32>(dst - src);
switch (type) {
case R_ARM_PC24:
case R_ARM_PLT32:
Expand Down
118 changes: 118 additions & 0 deletions lld/test/ELF/arm-wraparound-veneer.s
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
// REQUIRES: arm
// RUN: rm -rf %t && split-file %s %t && cd %t
// RUN: llvm-mc -filetype=obj -triple=armv7-none-eabi code.s -o code.o
// RUN: ld.lld -T unsigned1.ld code.o -o unsigned1.elf
// RUN: llvm-objdump --triple=armv7 -d unsigned1.elf | FileCheck %s --check-prefix=UNSIGNED1
// RUN: ld.lld -T unsigned2.ld code.o -o unsigned2.elf
// RUN: llvm-objdump --triple=armv7 -d unsigned2.elf | FileCheck %s --check-prefix=UNSIGNED2
// RUN: ld.lld -T signed1.ld code.o -o signed1.elf
// RUN: llvm-objdump --triple=armv7 -d signed1.elf | FileCheck %s --check-prefix=SIGNED1
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lld convention is to use --no-show-raw-insn in llvm-objdump unless it is a vital part of the test.

// RUN: ld.lld -T signed2.ld code.o -o signed2.elf
// RUN: llvm-objdump --triple=armv7 -d signed2.elf | FileCheck %s --check-prefix=SIGNED2

// The aim of this test is to ensure that a BL instruction near one end of the
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LLD convention is to use /// for non FileCheck comments.

// address space can reach a function at the extreme other end, directly, using
// a branch offset that makes the address wrap round. We check this at both the
// unsigned wraparound point (one address near 0 and the other near 0xFFFFFFFF)
// and the signed wraparound point (addresses either side of 0x80000000),
// crossing the boundary in both directions. In all four cases we expect a
// direct branch with no veneer.

// UNSIGNED1: Disassembly of section .text.lowaddr:
// UNSIGNED1: 00010000 <func>:
// UNSIGNED1: 10000: e12fff1e bx lr
//
// UNSIGNED1: Disassembly of section .text.highaddr:
// UNSIGNED1: ffff0000 <_start>:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LLD convention is to only put the first address in a sequence of instructions. For example:

// UNSIGNED1: ffff0000: eb007ffe      bl      0x10000
// UNSIGNED1-NEXT:      e12fff1e      bx      lr

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Specifically, omit address for the function label <func>, and use -CHECK: with address in the next line.
This improves FileCheck diagnostics when the address changes.

// UNSIGNED1: ffff0000: eb007ffe bl 0x10000
// UNSIGNED1: ffff0004: e12fff1e bx lr

// UNSIGNED2: Disassembly of section .text.lowaddr:
// UNSIGNED2: 00010000 <_start>:
// UNSIGNED2: 10000: ebff7ffe bl 0xffff0000
// UNSIGNED2: 10004: e12fff1e bx lr
//
// UNSIGNED2: Disassembly of section .text.highaddr:
// UNSIGNED2: ffff0000 <func>:
// UNSIGNED2: ffff0000: e12fff1e bx lr

// SIGNED1: Disassembly of section .text.posaddr:
// SIGNED1: 7fff0000 <_start>:
// SIGNED1: 7fff0000: eb007ffe bl 0x80010000
// SIGNED1: 7fff0004: e12fff1e bx lr
//
// SIGNED1: Disassembly of section .text.negaddr:
// SIGNED1: 80010000 <func>:
// SIGNED1: 80010000: e12fff1e bx lr

// SIGNED2: Disassembly of section .text.posaddr:
// SIGNED2: 7fff0000 <func>:
// SIGNED2: 7fff0000: e12fff1e bx lr
//
// SIGNED2: Disassembly of section .text.negaddr:
// SIGNED2: 80010000 <_start>:
// SIGNED2: 80010000: ebff7ffe bl 0x7fff0000
// SIGNED2: 80010004: e12fff1e bx lr

//--- code.s

.section .text.callee, "ax", %progbits
.global func
.type func, %function
func:
bx lr

.section .text.caller, "ax", %progbits
.global _start
.type _start, %function
_start:
bl func
bx lr

//--- unsigned1.ld

ENTRY(_start)
PHDRS {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think you need the PHDRS here. To get LLD to create a separate program header for each output section you can use AT.

.text.lowaddr 0x00010000 : AT(0x00010000) { *(.text.callee) }

lowaddr PT_LOAD FLAGS(0x1 | 0x4);
highaddr PT_LOAD FLAGS(0x1 | 0x4);
}
SECTIONS {
.text.lowaddr 0x00010000 : { *(.text.callee) } :lowaddr
.text.highaddr 0xffff0000 : { *(.text.caller) } :highaddr
}

//--- unsigned2.ld

ENTRY(_start)
PHDRS {
lowaddr PT_LOAD FLAGS(0x1 | 0x4);
highaddr PT_LOAD FLAGS(0x1 | 0x4);
}
SECTIONS {
.text.lowaddr 0x00010000 : { *(.text.caller) } :lowaddr
.text.highaddr 0xffff0000 : { *(.text.callee) } :highaddr
}

//--- signed1.ld

ENTRY(_start)
PHDRS {
posaddr PT_LOAD FLAGS(0x1 | 0x4);
negaddr PT_LOAD FLAGS(0x1 | 0x4);
}
SECTIONS {
.text.posaddr 0x7fff0000 : { *(.text.caller) } :posaddr
.text.negaddr 0x80010000 : { *(.text.callee) } :negaddr
}

//--- signed2.ld

ENTRY(_start)
PHDRS {
posaddr PT_LOAD FLAGS(0x1 | 0x4);
negaddr PT_LOAD FLAGS(0x1 | 0x4);
}
SECTIONS {
.text.posaddr 0x7fff0000 : { *(.text.callee) } :posaddr
.text.negaddr 0x80010000 : { *(.text.caller) } :negaddr
}