RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-22 10:42:39 +01:00
Code Issues Projects Releases Wiki Activity

[WebAssembly] Expose the offset of each data segment

Browse Source 
Summary:
This allows tools like lld that process relocations
to apply data relocation correctly. This information
is required because relocation are stored as section
offset.

Subscribers: jfb, dschuff, jgravelle-google, aheejin

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

llvm-svn: 307741
This commit is contained in:
Sam Clegg 2017-07-12 00:24:54 +00:00
parent d6b00f0630
commit 1e7ea802fe
10 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/llvm/BinaryFormat/Wasm.h
View File

@ -94,7 +94,7 @@ struct WasmFunction {
};
struct WasmDataSegment {
uint32_t Index;
uint32_t MemoryIndex;
WasmInitExpr Offset;
ArrayRef<uint8_t> Content;
};

12
include/llvm/Object/Wasm.h
View File

@ -69,8 +69,7 @@ public:
#endif
};
class WasmSection {
public:
struct WasmSection {
WasmSection() = default;
uint32_t Type = 0; // Section type (See below)
@ -80,6 +79,11 @@ public:
std::vector<wasm::WasmRelocation> Relocations; // Relocations for this section
};
struct WasmSegment {
uint32_t SectionOffset;
wasm::WasmDataSegment Data;
};
class WasmObjectFile : public ObjectFile {
public:
@ -110,7 +114,7 @@ public:
return ElemSegments;
}
const std::vector<wasm::WasmDataSegment>& dataSegments() const {
const std::vector<WasmSegment>& dataSegments() const {
return DataSegments;
}
@ -210,7 +214,7 @@ private:
std::vector<wasm::WasmImport> Imports;
std::vector<wasm::WasmExport> Exports;
std::vector<wasm::WasmElemSegment> ElemSegments;
std::vector<wasm::WasmDataSegment> DataSegments;
std::vector<WasmSegment> DataSegments;
std::vector<wasm::WasmFunction> Functions;
std::vector<WasmSymbol> Symbols;
ArrayRef<uint8_t> CodeSection;

3
include/llvm/ObjectYAML/WasmYAML.h
View File

@ -98,7 +98,8 @@ struct Relocation {
};
struct DataSegment {
uint32_t Index;
uint32_t MemoryIndex;
uint32_t SectionOffset;
wasm::WasmInitExpr Offset;
yaml::BinaryRef Content;
};

10
lib/Object/WasmObjectFile.cpp
View File

@ -675,15 +675,17 @@ Error WasmObjectFile::parseElemSection(const uint8_t *Ptr, const uint8_t *End) {
}
Error WasmObjectFile::parseDataSection(const uint8_t *Ptr, const uint8_t *End) {
const uint8_t *Start = Ptr;
uint32_t Count = readVaruint32(Ptr);
DataSegments.reserve(Count);
while (Count--) {
wasm::WasmDataSegment Segment;
Segment.Index = readVaruint32(Ptr);
if (Error Err = readInitExpr(Segment.Offset, Ptr))
WasmSegment Segment;
Segment.Data.MemoryIndex = readVaruint32(Ptr);
if (Error Err = readInitExpr(Segment.Data.Offset, Ptr))
return Err;
uint32_t Size = readVaruint32(Ptr);
Segment.Content = ArrayRef<uint8_t>(Ptr, Size);
Segment.Data.Content = ArrayRef<uint8_t>(Ptr, Size);
Segment.SectionOffset = Ptr - Start;
Ptr += Size;
DataSegments.push_back(Segment);
}

3
lib/ObjectYAML/WasmYAML.cpp
View File

@ -345,7 +345,8 @@ void MappingTraits<wasm::WasmInitExpr>::mapping(IO &IO,
void MappingTraits<WasmYAML::DataSegment>::mapping(
IO &IO, WasmYAML::DataSegment &Segment) {
IO.mapRequired("Index", Segment.Index);
IO.mapOptional("SectionOffset", Segment.SectionOffset);
IO.mapRequired("MemoryIndex", Segment.MemoryIndex);
IO.mapRequired("Offset", Segment.Offset);
IO.mapRequired("Content", Segment.Content);
}

3
test/MC/WebAssembly/external-data.ll
View File

@ -13,7 +13,8 @@
; CHECK: Index: 0
; CHECK: Offset: 0x0000000E
; CHECK: Segments:
; CHECK: - Index: 0
; CHECK: - SectionOffset: 6
; CHECK: MemoryIndex: 0
; CHECK: Offset:
; CHECK: Opcode: I32_CONST
; CHECK: Value: 0

3
test/MC/WebAssembly/unnamed-data.ll
View File

@ -46,7 +46,8 @@
; CHECK-NEXT: Index: 1
; CHECK-NEXT: Offset: 0x0000001E
; CHECK-NEXT: Segments:
; CHECK-NEXT: - Index: 0
; CHECK-NEXT: - SectionOffset: 6
; CHECK-NEXT: MemoryIndex: 0
; CHECK-NEXT: Offset:
; CHECK-NEXT: Opcode: I32_CONST
; CHECK-NEXT: Value: 0

5
test/ObjectYAML/wasm/data_section.yaml
View File

@ -8,7 +8,7 @@ Sections:
- Initial: 0x00000003
- Type: DATA
Segments:
- Index: 0
- MemoryIndex: 0
Offset:
Opcode: I32_CONST
Value: 4
@ -38,7 +38,8 @@ Sections:
# CHECK-NEXT: Offset: 0x00000006
# CHECK-NEXT: Addend: -6
# CHECK-NEXT: Segments:
# CHECK-NEXT: - Index: 0
# CHECK-NEXT: - SectionOffset: 6
# CHECK-NEXT: MemoryIndex: 0
# CHECK-NEXT: Offset:
# CHECK-NEXT: Opcode: I32_CONST
# CHECK-NEXT: Value: 4

7
tools/obj2yaml/wasm2yaml.cpp
View File

@ -236,9 +236,10 @@ ErrorOr<WasmYAML::Object *> WasmDumper::dump() {
auto DataSec = make_unique<WasmYAML::DataSection>();
for (auto &Segment : Obj.dataSegments()) {
WasmYAML::DataSegment Seg;
Seg.Index = Segment.Index;
Seg.Offset = Segment.Offset;
Seg.Content = yaml::BinaryRef(Segment.Content);
Seg.SectionOffset = Segment.SectionOffset;
Seg.MemoryIndex = Segment.Data.MemoryIndex;
Seg.Offset = Segment.Data.Offset;
Seg.Content = yaml::BinaryRef(Segment.Data.Content);
DataSec->Segments.push_back(Seg);
}
S = std::move(DataSec);

2
tools/yaml2obj/yaml2wasm.cpp
View File

@ -338,7 +338,7 @@ int WasmWriter::writeSectionContent(raw_ostream &OS,
WasmYAML::DataSection &Section) {
encodeULEB128(Section.Segments.size(), OS);
for (auto &Segment : Section.Segments) {
encodeULEB128(Segment.Index, OS);
encodeULEB128(Segment.MemoryIndex, OS);
writeInitExpr(Segment.Offset, OS);
encodeULEB128(Segment.Content.binary_size(), OS);
Segment.Content.writeAsBinary(OS);