This is an archive of the discontinued LLVM Phabricator instance.

Differential D43715

[WebAssembly] Simplify createLikingSection.
ClosedPublic

Authored by ruiu on Feb 23 2018, 8:31 PM.

Details

Reviewers
sbc100
Commits
rG8bfa2a629dd4: [WebAssembly] Simplify createLikingSection.
rLLD326279: [WebAssembly] Simplify createLikingSection.
rL326279: [WebAssembly] Simplify createLikingSection.
Summary

[WebAssembly] Simplify createLikingSection.

Diff Detail

Event Timeline

ruiu created this revision.Feb 23 2018, 8:31 PM
Herald added subscribers: sunfish, aheejin, jgravelle-google and 2 others. · View Herald TranscriptFeb 23 2018, 8:31 PM
sbc100 accepted this revision.Feb 27 2018, 1:20 PM
This revision is now accepted and ready to land.Feb 27 2018, 1:20 PM
Closed by commit rL326279: [WebAssembly] Simplify createLikingSection. (authored by ruiu). · Explain WhyFeb 27 2018, 4:31 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lld/
wasm/
24 lines

Diff 135773

lld/wasm/Writer.cpp

Show First 20 Lines • Show All 366 Lines • ▼ Show 20 Lines for (size_t i = 0; i < OrigSize; i++) {
SyntheticSection *Section = createSyntheticSection(WASM_SEC_CUSTOM, name); SyntheticSection *Section = createSyntheticSection(WASM_SEC_CUSTOM, name);
raw_ostream &OS = Section->getStream(); raw_ostream &OS = Section->getStream();
writeUleb128(OS, S->Type, "reloc section"); writeUleb128(OS, S->Type, "reloc section");
writeUleb128(OS, Count, "reloc count"); writeUleb128(OS, Count, "reloc count");
S->writeRelocations(OS); S->writeRelocations(OS);
} }
} }
static uint32_t getWasmFlags(const Symbol *Sym) {
uint32_t Flags = 0;
if (Sym->isLocal())
Flags |= WASM_SYMBOL_BINDING_LOCAL;
if (Sym->isWeak())
Flags |= WASM_SYMBOL_BINDING_WEAK;
if (Sym->isHidden())
Flags |= WASM_SYMBOL_VISIBILITY_HIDDEN;
if (Sym->isUndefined())
Flags |= WASM_SYMBOL_UNDEFINED;
return Flags;
}
// Create the custom "linking" section containing linker metadata. // Create the custom "linking" section containing linker metadata.
// This is only created when relocatable output is requested. // This is only created when relocatable output is requested.
void Writer::createLinkingSection() { void Writer::createLinkingSection() {
SyntheticSection *Section = SyntheticSection *Section =
createSyntheticSection(WASM_SEC_CUSTOM, "linking"); createSyntheticSection(WASM_SEC_CUSTOM, "linking");
raw_ostream &OS = Section->getStream(); raw_ostream &OS = Section->getStream();
SubSection DataSizeSubSection(WASM_DATA_SIZE); SubSection DataSizeSubSection(WASM_DATA_SIZE);
writeUleb128(DataSizeSubSection.getStream(), DataSize, "data size"); writeUleb128(DataSizeSubSection.getStream(), DataSize, "data size");
DataSizeSubSection.finalizeContents(); DataSizeSubSection.finalizeContents();
DataSizeSubSection.writeToStream(OS); DataSizeSubSection.writeToStream(OS);
if (!Config->Relocatable) if (!Config->Relocatable)
return; return;
if (!SymtabEntries.empty()) { if (!SymtabEntries.empty()) {
SubSection SubSection(WASM_SYMBOL_TABLE); SubSection SubSection(WASM_SYMBOL_TABLE);
writeUleb128(SubSection.getStream(), SymtabEntries.size(), "num symbols"); writeUleb128(SubSection.getStream(), SymtabEntries.size(), "num symbols");
for (const Symbol *Sym : SymtabEntries) { for (const Symbol *Sym : SymtabEntries) {
assert(Sym->isDefined() || Sym->isUndefined()); assert(Sym->isDefined() || Sym->isUndefined());
WasmSymbolType Kind = Sym->getWasmType(); WasmSymbolType Kind = Sym->getWasmType();
uint32_t Flags = Sym->isLocal() ? WASM_SYMBOL_BINDING_LOCAL : 0; uint32_t Flags = getWasmFlags(Sym);
if (Sym->isWeak())
Flags |= WASM_SYMBOL_BINDING_WEAK;
if (Sym->isHidden())
Flags |= WASM_SYMBOL_VISIBILITY_HIDDEN;
if (Sym->isUndefined())
Flags |= WASM_SYMBOL_UNDEFINED;
writeUleb128(SubSection.getStream(), Kind, "sym kind"); writeUleb128(SubSection.getStream(), Kind, "sym kind");
writeUleb128(SubSection.getStream(), Flags, "sym flags"); writeUleb128(SubSection.getStream(), Flags, "sym flags");
switch (Kind) { switch (Kind) {
case llvm::wasm::WASM_SYMBOL_TYPE_FUNCTION: case llvm::wasm::WASM_SYMBOL_TYPE_FUNCTION:
case llvm::wasm::WASM_SYMBOL_TYPE_GLOBAL: case llvm::wasm::WASM_SYMBOL_TYPE_GLOBAL:
writeUleb128(SubSection.getStream(), Sym->getOutputIndex(), "index"); writeUleb128(SubSection.getStream(), Sym->getOutputIndex(), "index");
if (Sym->isDefined()) if (Sym->isDefined())
writeStr(SubSection.getStream(), Sym->getName(), "sym name"); writeStr(SubSection.getStream(), Sym->getName(), "sym name");
break; break;
case llvm::wasm::WASM_SYMBOL_TYPE_DATA: case llvm::wasm::WASM_SYMBOL_TYPE_DATA:
writeStr(SubSection.getStream(), Sym->getName(), "sym name"); writeStr(SubSection.getStream(), Sym->getName(), "sym name");
if (auto *DataSym = dyn_cast<DefinedData>(Sym)) { if (auto *DataSym = dyn_cast<DefinedData>(Sym)) {
writeUleb128(SubSection.getStream(), DataSym->getOutputSegmentIndex(), writeUleb128(SubSection.getStream(), DataSym->getOutputSegmentIndex(),
"index"); "index");
writeUleb128(SubSection.getStream(), writeUleb128(SubSection.getStream(),
DataSym->getOutputSegmentOffset(), "data offset"); DataSym->getOutputSegmentOffset(), "data offset");
writeUleb128(SubSection.getStream(), DataSym->getSize(), "data size"); writeUleb128(SubSection.getStream(), DataSym->getSize(), "data size");
} }
break; break;
} }
} }
SubSection.finalizeContents(); SubSection.finalizeContents();
SubSection.writeToStream(OS); SubSection.writeToStream(OS);
} }
if (Segments.size()) { if (Segments.size()) {
SubSection SubSection(WASM_SEGMENT_INFO); SubSection SubSection(WASM_SEGMENT_INFO);
writeUleb128(SubSection.getStream(), Segments.size(), "num data segments"); writeUleb128(SubSection.getStream(), Segments.size(), "num data segments");
for (const OutputSegment *S : Segments) { for (const OutputSegment *S : Segments) {
▲ Show 20 Lines • Show All 550 Lines • Show Last 20 Lines