Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2024-12-04 20:20:54 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[lld] Add more complete support for the INCLUDE command.

Browse Source 
Patch by Ian Tessier.

This change adds INCLUDE support to the MEMORY and SECTION commands, and
to output sections, as per:

https://sourceware.org/binutils/docs/ld/File-Commands.html#File-Commands

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

llvm-svn: 344368
This commit is contained in:
Rui Ueyama 2018-10-12 17:07:32 +00:00
parent d0fbef9c75
commit 2e9d40d5f4
4 changed files with 98 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lld/ELF/ScriptParser.cpp
View File

@ -501,6 +501,9 @@ void ScriptParser::readSections() {
for (BaseCommand *Cmd : readOverlay())
V.push_back(Cmd);
continue;
} else if (Tok == "INCLUDE") {
readInclude();
continue;
}
if (BaseCommand *Cmd = readAssignment(Tok))
@ -803,6 +806,8 @@ OutputSection *ScriptParser::readOutputSectionDescription(StringRef OutSec) {
Cmd->Filler = readFill();
} else if (Tok == "SORT") {
readSort();
} else if (Tok == "INCLUDE") {
readInclude();
} else if (peek() == "(") {
Cmd->SectionCommands.push_back(readInputSectionDescription(Tok));
} else {
@ -1429,7 +1434,11 @@ uint64_t ScriptParser::readMemoryAssignment(StringRef S1, StringRef S2,
void ScriptParser::readMemory() {
expect("{");
while (!errorCount() && !consume("}")) {
StringRef Name = next();
StringRef Tok = next();
if (Tok == "INCLUDE") {
readInclude();
continue;
}
uint32_t Flags = 0;
uint32_t NegFlags = 0;
@ -1444,10 +1453,9 @@ void ScriptParser::readMemory() {
uint64_t Length = readMemoryAssignment("LENGTH", "len", "l");
// Add the memory region to the region map.
MemoryRegion *MR =
make<MemoryRegion>(Name, Origin, Length, Flags, NegFlags);
if (!Script->MemoryRegions.insert({Name, MR}).second)
setError("region '" + Name + "' already defined");
MemoryRegion *MR = make<MemoryRegion>(Tok, Origin, Length, Flags, NegFlags);
if (!Script->MemoryRegions.insert({Tok, MR}).second)
setError("region '" + Tok + "' already defined");
}
}

23
lld/test/ELF/linkerscript/memory-include.test Normal file
View File

@ -0,0 +1,23 @@
# REQUIRES: x86
# RUN: echo '.section .text,"ax"; .global _start; nop' > %t.s
# RUN: echo '.section .data,"aw"; .quad 0' >> %t.s
# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %t.s -o %t.o
# RUN: echo "RAM2 (rwx): ORIGIN = 0x3000, LENGTH = 0x100" > %t.inc
# RUN: ld.lld -o %t.elf --script %s %t.o -L %T
# RUN: llvm-objdump -section-headers %t.elf | FileCheck %s
# CHECK: .data 00000008 0000000000002000 DATA
# CHECK: .data2 00000008 0000000000003000 DATA
MEMORY {
ROM (rwx): ORIGIN = 0x1000, LENGTH = 0x100
RAM (rwx): ORIGIN = 0x2000, LENGTH = 0x100
INCLUDE "memory-include.test.tmp.inc"
}
SECTIONS {
.text : { *(.text*) } > ROM
.data : { *(.data*) } > RAM
.data2 : { QUAD(0) } > RAM2
}

30
lld/test/ELF/linkerscript/output-section-include.test Normal file
View File

@ -0,0 +1,30 @@
# REQUIRES: x86
# RUN: echo '.section .text,"ax"; .global _start; nop' > %t.s
# RUN: echo '.section .data,"aw"; .quad 0' >> %t.s
# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %t.s -o %t.o
## Empty include file.
# RUN: echo "" > %t.inc
# RUN: ld.lld -o %t.elf --script %s %t.o -L %T
# RUN: llvm-objdump -section-headers %t.elf | FileCheck %s --check-prefix=CHECK1
# CHECK1: .data 00000008 0000000000002000 DATA
## Non-empty include file.
# RUN: echo "QUAD(0)" > %t.inc
# RUN: ld.lld -o %t.elf --script %s %t.o -L %T
# RUN: llvm-objdump -section-headers %t.elf | FileCheck %s --check-prefix=CHECK2
# CHECK2: .data 00000010 0000000000002000 DATA
MEMORY {
ROM (rwx): ORIGIN = 0x1000, LENGTH = 0x100
RAM (rwx): ORIGIN = 0x2000, LENGTH = 0x100
}
SECTIONS {
.text : { *(.text*) } > ROM
.data : {
*(.data*)
INCLUDE "output-section-include.test.tmp.inc"
} > RAM
}

32
lld/test/ELF/linkerscript/section-include.test Normal file
View File

@ -0,0 +1,32 @@
# REQUIRES: x86
# RUN: echo '.section .text,"ax"; .global _start; nop' > %t.s
# RUN: echo '.section .data,"aw"; .quad 0' >> %t.s
# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %t.s -o %t.o
## Empty include file.
# RUN: echo "" > %t.inc
# RUN: ld.lld -o %t.elf --script %s %t.o -L %T
# RUN: llvm-objdump -section-headers %t.elf | FileCheck %s --check-prefix=CHECK1
# CHECK1: .data 00000008 0000000000002000 DATA
# CHECK1-NEXT: .data3 00000008 0000000000002008 DATA
## Non-empty include file.
# RUN: echo ".data2 : { QUAD(0) } > RAM" > %t.inc
# RUN: ld.lld -o %t.elf --script %s %t.o -L %T
# RUN: llvm-objdump -section-headers %t.elf | FileCheck %s --check-prefix=CHECK2
# CHECK2: .data 00000008 0000000000002000 DATA
# CHECK2-NEXT: .data2 00000008 0000000000002008 DATA
# CHECK2-NEXT: .data3 00000008 0000000000002010 DATA
MEMORY {
ROM (rwx): ORIGIN = 0x1000, LENGTH = 0x100
RAM (rwx): ORIGIN = 0x2000, LENGTH = 0x100
}
SECTIONS {
.text : { *(.text*) } > ROM
.data : { *(.data*) } > RAM
INCLUDE "section-include.test.tmp.inc"
.data3 : { QUAD(0) } > RAM
}