This is an archive of the discontinued LLVM Phabricator instance.

Differential D43723

[WebAssembly] Minor cleanup -- do not use Config->Relocatable twice.
AbandonedPublic

Authored by ruiu on Feb 23 2018, 9:37 PM.

Details

Reviewers
sbc100
Summary

[WebAssembly] Minor cleanup -- do not use Config->Relocatable twice.

Diff Detail

Event Timeline

ruiu created this revision.Feb 23 2018, 9:37 PM
Herald added subscribers: sunfish, aheejin, jgravelle-google and 2 others. · View Herald TranscriptFeb 23 2018, 9:37 PM
Harbormaster completed remote builds in B15401: Diff 135780.Feb 23 2018, 9:37 PM
sbc100 added a comment.Feb 27 2018, 3:52 PM

I think this doesn't apply anymore once D42869 lands.

ruiu abandoned this revision.Feb 27 2018, 4:23 PM

Revision Contents

PathSize
lld/
wasm/
5 lines

Diff 135780

lld/wasm/Writer.cpp

Show First 20 Lines • Show All 572 Lines • ▼ Show 20 Lines
// - heap start / unallocated // - heap start / unallocated
void Writer::layoutMemory() { void Writer::layoutMemory() {
uint32_t MemoryPtr = 0; uint32_t MemoryPtr = 0;
if (!Config->Relocatable) { if (!Config->Relocatable) {
MemoryPtr = Config->GlobalBase; MemoryPtr = Config->GlobalBase;
debugPrint("mem: global base = %d\n", Config->GlobalBase); debugPrint("mem: global base = %d\n", Config->GlobalBase);
} }
uint32_t DataStart = MemoryPtr;
createOutputSegments(); createOutputSegments();
// Arbitrarily set __dso_handle handle to point to the start of the data // Arbitrarily set __dso_handle handle to point to the start of the data
// segments. // segments.
if (WasmSym::DsoHandle) if (WasmSym::DsoHandle)
WasmSym::DsoHandle->setVirtualAddress(MemoryPtr); WasmSym::DsoHandle->setVirtualAddress(MemoryPtr);
for (OutputSegment *Seg : Segments) { for (OutputSegment *Seg : Segments) {
MemoryPtr = alignTo(MemoryPtr, Seg->Alignment); MemoryPtr = alignTo(MemoryPtr, Seg->Alignment);
Seg->StartVA = MemoryPtr; Seg->StartVA = MemoryPtr;
debugPrint("mem: %-15s offset=%-8d size=%-8d align=%d\n", debugPrint("mem: %-15s offset=%-8d size=%-8d align=%d\n",
Seg->Name.str().c_str(), MemoryPtr, Seg->Size, Seg->Alignment); Seg->Name.str().c_str(), MemoryPtr, Seg->Size, Seg->Alignment);
MemoryPtr += Seg->Size; MemoryPtr += Seg->Size;
} }
// TODO: Add .bss space here. // TODO: Add .bss space here.
if (WasmSym::DataEnd) if (WasmSym::DataEnd)
WasmSym::DataEnd->setVirtualAddress(MemoryPtr); WasmSym::DataEnd->setVirtualAddress(MemoryPtr);
DataSize = MemoryPtr; DataSize = MemoryPtr - DataStart;
if (!Config->Relocatable)
DataSize -= Config->GlobalBase;
debugPrint("mem: static data = %d\n", DataSize); debugPrint("mem: static data = %d\n", DataSize);
// Stack comes after static data and bss // Stack comes after static data and bss
if (!Config->Relocatable) { if (!Config->Relocatable) {
MemoryPtr = alignTo(MemoryPtr, kStackAlignment); MemoryPtr = alignTo(MemoryPtr, kStackAlignment);
if (Config->ZStackSize != alignTo(Config->ZStackSize, kStackAlignment)) if (Config->ZStackSize != alignTo(Config->ZStackSize, kStackAlignment))
error("stack size must be " + Twine(kStackAlignment) + "-byte aligned"); error("stack size must be " + Twine(kStackAlignment) + "-byte aligned");
debugPrint("mem: stack size = %d\n", Config->ZStackSize); debugPrint("mem: stack size = %d\n", Config->ZStackSize);
▲ Show 20 Lines • Show All 401 Lines • Show Last 20 Lines