Alex Crichton
6c24753d2c
This commit fixes a few issues that have surfaced in `wasm-ld`'s handling of `--cooperative-threading` with `-shared`. Two primary issues fixed are: * The `__wasm_init_memory` function was not valid as it referenced nonexistent locals. This was fixed by adjusting how locals are declared to make this a bit more flexible. * Combining data segments for PIC without extended-const is generalized to only operate on active data segments and is now orthogonal to threading. With coop threads there's a mixture of passive/active segments (TLS is passive, other data is active) and the active segments still need combining while TLS stays passive. The latter fix ended up touching a few more areas. The first is that `.tdata` sections are now sorted just before `.bss`, the end section, rather than first. This is done to ensure that active segments when combined can indeed start at a relative address of 0 (as required without extended-const). This change resulted in a number of adjustments for tests as the data is now sorted differently. Additionally relocations in TLS segments needed adjusting since the previous implementation implicitly only worked if `.tdata` is first.
61 lines
1.7 KiB
C++
61 lines
1.7 KiB
C++
//===- OutputSegment.h ------------------------------------------*- C++ -*-===//
|
|
//
|
|
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
|
|
// See https://llvm.org/LICENSE.txt for license information.
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#ifndef LLD_WASM_OUTPUT_SEGMENT_H
|
|
#define LLD_WASM_OUTPUT_SEGMENT_H
|
|
|
|
#include "InputChunks.h"
|
|
#include "lld/Common/ErrorHandler.h"
|
|
#include "llvm/BinaryFormat/Wasm.h"
|
|
#include "llvm/Object/Wasm.h"
|
|
|
|
namespace lld::wasm {
|
|
|
|
class InputSegment;
|
|
|
|
class OutputSegment {
|
|
public:
|
|
OutputSegment(StringRef n) : name(n) {}
|
|
|
|
void addInputSegment(InputChunk *inSeg);
|
|
void finalizeInputSegments();
|
|
// In most circumstances BSS segments don't need to be written
|
|
// to the output binary. However if the memory is imported, and
|
|
// we can't use memory.fill during startup (due to lack of bulk
|
|
// memory feature) then we include BSS segments verbatim.
|
|
bool requiredInBinary() const { return !isBss || ctx.emitBssSegments; }
|
|
|
|
bool isTLS() const { return name == ".tdata"; }
|
|
|
|
StringRef name;
|
|
bool isBss = false;
|
|
uint32_t index = 0;
|
|
uint32_t linkingFlags = 0;
|
|
uint32_t initFlags = 0;
|
|
uint32_t sectionOffset = 0;
|
|
uint32_t alignment = 0;
|
|
uint64_t startVA = 0;
|
|
std::vector<InputChunk *> inputSegments;
|
|
|
|
// Sum of the size of the all the input segments
|
|
uint32_t size = 0;
|
|
|
|
// Segment header
|
|
std::string header;
|
|
|
|
bool isPassive() const {
|
|
return (initFlags & llvm::wasm::WASM_DATA_SEGMENT_IS_PASSIVE) != 0;
|
|
}
|
|
|
|
bool isActive() const { return !isPassive(); }
|
|
};
|
|
|
|
} // namespace lld::wasm
|
|
|
|
#endif // LLD_WASM_OUTPUT_SEGMENT_H
|