diff options
author | Ashley Nelson <nashley@google.com> | 2022-06-21 20:57:43 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-21 20:57:43 -0700 |
commit | 3b9c2e85fa5d97ba08a95c0c7cce7d041e699cde (patch) | |
tree | c01eb86869401931006b6503e47d60b9a44511b0 /src/tools/fuzzing/fuzzing.cpp | |
parent | 7fa4c0841c31930759fbad2efb8ada3ef0e6f3ef (diff) | |
download | binaryen-3b9c2e85fa5d97ba08a95c0c7cce7d041e699cde.tar.gz binaryen-3b9c2e85fa5d97ba08a95c0c7cce7d041e699cde.tar.bz2 binaryen-3b9c2e85fa5d97ba08a95c0c7cce7d041e699cde.zip |
First class Data Segments (#4733)
* Updating wasm.h/cpp for DataSegments
* Updating wasm-binary.h/cpp for DataSegments
* Removed link from Memory to DataSegments and updated module-utils, Metrics and wasm-traversal
* checking isPassive when copying data segments to know whether to construct the data segment with an offset or not
* Removing memory member var from DataSegment class as there is only one memory rn. Updated wasm-validator.cpp
* Updated wasm-interpreter
* First look at updating Passes
* Updated wasm-s-parser
* Updated files in src/ir
* Updating tools files
* Last pass on src files before building
* added visitDataSegment
* Fixing build errors
* Data segments need a name
* fixing var name
* ran clang-format
* Ensuring a name on DataSegment
* Ensuring more datasegments have names
* Adding explicit name support
* Fix fuzzing name
* Outputting data name in wasm binary only if explicit
* Checking temp dataSegments vector to validateBinary because it's the one with the segments before we processNames
* Pass on when data segment names are explicitly set
* Ran auto_update_tests.py and check.py, success all around
* Removed an errant semi-colon and corrected a counter. Everything still passes
* Linting
* Fixing processing memory names after parsed from binary
* Updating the test from the last fix
* Correcting error comment
* Impl kripken@ comments
* Impl tlively@ comments
* Updated tests that remove data print when == 0
* Ran clang format
* Impl tlively@ comments
* Ran clang-format
Diffstat (limited to 'src/tools/fuzzing/fuzzing.cpp')
-rw-r--r-- | src/tools/fuzzing/fuzzing.cpp | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/src/tools/fuzzing/fuzzing.cpp b/src/tools/fuzzing/fuzzing.cpp index e5afbf559..c828c84d0 100644 --- a/src/tools/fuzzing/fuzzing.cpp +++ b/src/tools/fuzzing/fuzzing.cpp @@ -191,26 +191,30 @@ void TranslateToFuzzReader::setupMemory() { // need at least one segment for memory.inits size_t numSegments = upTo(8) + 1; for (size_t i = 0; i < numSegments; i++) { - Memory::Segment segment; - segment.isPassive = bool(upTo(2)); + auto segment = builder.makeDataSegment(); + segment->setName(Name::fromInt(i), false); + segment->isPassive = bool(upTo(2)); size_t segSize = upTo(USABLE_MEMORY * 2); - segment.data.resize(segSize); + segment->data.resize(segSize); for (size_t j = 0; j < segSize; j++) { - segment.data[j] = upTo(512); + segment->data[j] = upTo(512); } - if (!segment.isPassive) { - segment.offset = builder.makeConst(int32_t(memCovered)); + if (!segment->isPassive) { + segment->offset = builder.makeConst(int32_t(memCovered)); memCovered += segSize; } - wasm.memory.segments.push_back(segment); + wasm.dataSegments.push_back(std::move(segment)); } } else { // init some data - wasm.memory.segments.emplace_back(builder.makeConst(int32_t(0))); + auto segment = builder.makeDataSegment(); + segment->offset = builder.makeConst(int32_t(0)); + segment->setName(Name::fromInt(0), false); + wasm.dataSegments.push_back(std::move(segment)); auto num = upTo(USABLE_MEMORY * 2); for (size_t i = 0; i < num; i++) { auto value = upTo(512); - wasm.memory.segments[0].data.push_back(value >= 256 ? 0 : (value & 0xff)); + wasm.dataSegments[0]->data.push_back(value >= 256 ? 0 : (value & 0xff)); } } // Add memory hasher helper (for the hash, see hash.h). The function looks @@ -326,10 +330,10 @@ void TranslateToFuzzReader::setupTags() { } void TranslateToFuzzReader::finalizeMemory() { - for (auto& segment : wasm.memory.segments) { - Address maxOffset = segment.data.size(); - if (!segment.isPassive) { - if (auto* offset = segment.offset->dynCast<GlobalGet>()) { + for (auto& segment : wasm.dataSegments) { + Address maxOffset = segment->data.size(); + if (!segment->isPassive) { + if (auto* offset = segment->offset->dynCast<GlobalGet>()) { // Using a non-imported global in a segment offset is not valid in // wasm. This can occur due to us making what used to be an imported // global, in initial contents, be not imported any more. To fix that, @@ -342,11 +346,11 @@ void TranslateToFuzzReader::finalizeMemory() { if (!wasm.getGlobal(offset->name)->imported()) { // TODO: It would be better to avoid segment overlap so that // MemoryPacking can run. - segment.offset = + segment->offset = builder.makeConst(Literal::makeFromInt32(0, Type::i32)); } } - if (auto* offset = segment.offset->dynCast<Const>()) { + if (auto* offset = segment->offset->dynCast<Const>()) { maxOffset = maxOffset + offset->value.getInteger(); } } @@ -2905,8 +2909,8 @@ Expression* TranslateToFuzzReader::makeMemoryInit() { if (!allowMemory) { return makeTrivial(Type::none); } - uint32_t segment = upTo(wasm.memory.segments.size()); - size_t totalSize = wasm.memory.segments[segment].data.size(); + uint32_t segment = upTo(wasm.dataSegments.size()); + size_t totalSize = wasm.dataSegments[segment]->data.size(); size_t offsetVal = upTo(totalSize); size_t sizeVal = upTo(totalSize - offsetVal); Expression* dest = makePointer(); @@ -2919,7 +2923,7 @@ Expression* TranslateToFuzzReader::makeDataDrop() { if (!allowMemory) { return makeTrivial(Type::none); } - return builder.makeDataDrop(upTo(wasm.memory.segments.size())); + return builder.makeDataDrop(upTo(wasm.dataSegments.size())); } Expression* TranslateToFuzzReader::makeMemoryCopy() { |