Skip to content

Commit 2c2fd5a

Browse files
formatting
1 parent 9e88bbf commit 2c2fd5a

File tree

4 files changed

+42
-28
lines changed

4 files changed

+42
-28
lines changed

src/ir/runtime-memory.cpp

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020

2121
namespace wasm {
2222

23-
RuntimeMemory::RuntimeMemory(Memory memory, ExternalInterface* externalInterface)
23+
RuntimeMemory::RuntimeMemory(Memory memory,
24+
ExternalInterface* externalInterface)
2425
: externalInterface(externalInterface), memoryDefinition(std::move(memory)) {}
2526

2627
namespace {
@@ -212,9 +213,9 @@ void RealRuntimeMemory::store(Address addr,
212213
case Type::f32: {
213214
switch (byteCount) {
214215
case 2:
215-
set<uint16_t>(final,
216-
fp16_ieee_from_fp32_value(
217-
bit_cast<float>(value.reinterpreti32())));
216+
set<uint16_t>(
217+
final,
218+
fp16_ieee_from_fp32_value(bit_cast<float>(value.reinterpreti32())));
218219
break;
219220
case 4:
220221
set<int32_t>(final, value.reinterpreti32());
@@ -271,8 +272,8 @@ void RealRuntimeMemory::copy(Address dest,
271272
Address byteCount,
272273
const RuntimeMemory* srcMemory) {
273274
Address finalDest = getFinalAddress(*this, dest, 0, byteCount, size());
274-
Address finalSrc = getFinalAddress(
275-
*srcMemory, src, 0, byteCount, srcMemory->size());
275+
Address finalSrc =
276+
getFinalAddress(*srcMemory, src, 0, byteCount, srcMemory->size());
276277
const std::vector<uint8_t>* srcBuffer = srcMemory->getBuffer();
277278
if (!srcBuffer) {
278279
// If it's not a memory with a direct buffer, we might need another way to
@@ -299,7 +300,8 @@ void RealRuntimeMemory::resize(size_t newSize) {
299300
size_t newAllocatedSize = std::max(minSize, newSize);
300301
if (newAllocatedSize > oldAllocatedSize) {
301302
memory.resize(newAllocatedSize);
302-
std::memset(&memory[oldAllocatedSize], 0, newAllocatedSize - oldAllocatedSize);
303+
std::memset(
304+
&memory[oldAllocatedSize], 0, newAllocatedSize - oldAllocatedSize);
303305
}
304306
if (newSize < oldAllocatedSize && newSize < minSize) {
305307
std::memset(&memory[newSize], 0, minSize - newSize);
@@ -345,6 +347,7 @@ template void RealRuntimeMemory::set<uint32_t>(size_t, uint32_t);
345347
template void RealRuntimeMemory::set<int64_t>(size_t, int64_t);
346348
template void RealRuntimeMemory::set<uint64_t>(size_t, uint64_t);
347349
template void
348-
RealRuntimeMemory::set<std::array<uint8_t, 16>>(size_t, std::array<uint8_t, 16>);
350+
RealRuntimeMemory::set<std::array<uint8_t, 16>>(size_t,
351+
std::array<uint8_t, 16>);
349352

350353
} // namespace wasm

src/ir/runtime-memory.h

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,15 @@ class RuntimeMemory {
5050

5151
virtual Address size() const = 0;
5252

53-
virtual void
54-
init(Address dest, Address src, Address byteCount, const DataSegment* data) = 0;
53+
virtual void init(Address dest,
54+
Address src,
55+
Address byteCount,
56+
const DataSegment* data) = 0;
5557

56-
virtual void
57-
copy(Address dest, Address src, Address byteCount, const RuntimeMemory* srcMemory) = 0;
58+
virtual void copy(Address dest,
59+
Address src,
60+
Address byteCount,
61+
const RuntimeMemory* srcMemory) = 0;
5862

5963
virtual void fill(Address dest, uint8_t value, Address byteCount) = 0;
6064

@@ -92,11 +96,15 @@ class RealRuntimeMemory : public RuntimeMemory {
9296

9397
Address size() const override;
9498

95-
void
96-
init(Address dest, Address src, Address byteCount, const DataSegment* data) override;
99+
void init(Address dest,
100+
Address src,
101+
Address byteCount,
102+
const DataSegment* data) override;
97103

98-
void
99-
copy(Address dest, Address src, Address byteCount, const RuntimeMemory* srcMemory) override;
104+
void copy(Address dest,
105+
Address src,
106+
Address byteCount,
107+
const RuntimeMemory* srcMemory) override;
100108

101109
void fill(Address dest, uint8_t value, Address byteCount) override;
102110

src/tools/wasm-ctor-eval.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,8 @@ class CtorEvalRuntimeMemory : public RealRuntimeMemory {
197197
bool signed_) const override {
198198
const_cast<CtorEvalRuntimeMemory*>(this)->ensureCapacity(addr + offset +
199199
byteCount);
200-
return RealRuntimeMemory::load(addr, offset, byteCount, order, type, signed_);
200+
return RealRuntimeMemory::load(
201+
addr, offset, byteCount, order, type, signed_);
201202
}
202203

203204
void store(Address addr,
@@ -242,7 +243,8 @@ class EvallingModuleRunner : public ModuleRunnerBase<EvallingModuleRunner> {
242243
[this](Name name, Type type) { return makeFuncData(name, type); });
243244
},
244245
[](Memory memory, ExternalInterface* externalInterface) {
245-
return std::make_unique<CtorEvalRuntimeMemory>(memory, externalInterface);
246+
return std::make_unique<CtorEvalRuntimeMemory>(memory,
247+
externalInterface);
246248
}) {}
247249

248250
Flow visitGlobalGet(GlobalGet* curr) {

src/wasm-interpreter.h

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3035,7 +3035,8 @@ class ModuleRunnerBase : public ExpressionRunner<SubType> {
30353035
std::unordered_map<Name, RuntimeMemory*> allMemories;
30363036

30373037
using CreateTableFunc = std::unique_ptr<RuntimeTable>(Literal, Table);
3038-
using CreateMemoryFunc = std::unique_ptr<RuntimeMemory>(Memory, ExternalInterface*);
3038+
using CreateMemoryFunc = std::unique_ptr<RuntimeMemory>(Memory,
3039+
ExternalInterface*);
30393040

30403041
ModuleRunnerBase(
30413042
Module& wasm,
@@ -3055,13 +3056,13 @@ class ModuleRunnerBase : public ExpressionRunner<SubType> {
30553056
[](Literal initial, Table t) -> std::unique_ptr<RuntimeTable> {
30563057
return std::make_unique<RealRuntimeTable>(initial, t);
30573058
})),
3058-
createMemory(
3059-
createMemory != nullptr
3060-
? std::move(createMemory)
3061-
: static_cast<std::function<CreateMemoryFunc>>(
3062-
[externalInterface](Memory m, ExternalInterface* ei) -> std::unique_ptr<RuntimeMemory> {
3063-
return std::make_unique<RealRuntimeMemory>(m, ei);
3064-
})) {
3059+
createMemory(createMemory != nullptr
3060+
? std::move(createMemory)
3061+
: static_cast<std::function<CreateMemoryFunc>>(
3062+
[externalInterface](Memory m, ExternalInterface* ei)
3063+
-> std::unique_ptr<RuntimeMemory> {
3064+
return std::make_unique<RealRuntimeMemory>(m, ei);
3065+
})) {
30653066
// Set up a single shared CurrContinuations for all these linked instances,
30663067
// reusing one if it exists.
30673068
std::shared_ptr<ContinuationStore> shared;
@@ -3467,8 +3468,8 @@ class ModuleRunnerBase : public ExpressionRunner<SubType> {
34673468
// parsing/validation checked this already.
34683469
assert(inserted && "Unexpected repeated memory name");
34693470
} else {
3470-
auto& runtimeMemory =
3471-
definedMemories.emplace_back(createMemory(*memory, externalInterface));
3471+
auto& runtimeMemory = definedMemories.emplace_back(
3472+
createMemory(*memory, externalInterface));
34723473
[[maybe_unused]] auto [_, inserted] =
34733474
allMemories.try_emplace(memory->name, runtimeMemory.get());
34743475
assert(inserted && "Unexpected repeated memory name");

0 commit comments

Comments
 (0)