summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/binaryen-c.cpp56
-rw-r--r--src/binaryen-c.h29
-rw-r--r--src/js/binaryen.js-post.js53
-rw-r--r--test/binaryen.js/kitchen-sink.js12
-rw-r--r--test/binaryen.js/kitchen-sink.js.txt22
-rw-r--r--test/binaryen.js/reloc.js1
-rw-r--r--test/binaryen.js/reloc.js.txt2
-rw-r--r--test/example/c-api-kitchen-sink.c29
-rw-r--r--test/example/c-api-relooper-unreachable-if.cpp20
-rw-r--r--test/example/c-api-unused-mem.cpp20
-rw-r--r--test/example/relooper-fuzz.c3
-rw-r--r--test/example/relooper-fuzz1.c3
-rw-r--r--test/example/relooper-fuzz2.c3
-rw-r--r--test/example/relooper-merge1.c3
-rw-r--r--test/example/relooper-merge2.c3
-rw-r--r--test/example/relooper-merge3.c3
-rw-r--r--test/example/relooper-merge4.c3
-rw-r--r--test/example/relooper-merge5.c3
-rw-r--r--test/example/relooper-merge6.c3
19 files changed, 155 insertions, 116 deletions
diff --git a/src/binaryen-c.cpp b/src/binaryen-c.cpp
index 76a97e9da..8cbb969d6 100644
--- a/src/binaryen-c.cpp
+++ b/src/binaryen-c.cpp
@@ -5329,8 +5329,9 @@ void BinaryenSetMemory(BinaryenModuleRef module,
BinaryenIndex initial,
BinaryenIndex maximum,
const char* exportName,
- const char** segments,
- bool* segmentPassive,
+ const char** segmentNames,
+ const char** segmentDatas,
+ bool* segmentPassives,
BinaryenExpressionRef* segmentOffsets,
BinaryenIndex* segmentSizes,
BinaryenIndex numSegments,
@@ -5354,13 +5355,15 @@ void BinaryenSetMemory(BinaryenModuleRef module,
return true;
});
for (BinaryenIndex i = 0; i < numSegments; i++) {
- auto curr = Builder::makeDataSegment(Name::fromInt(i),
+ auto explicitName = segmentNames && segmentNames[i];
+ auto name = explicitName ? Name(segmentNames[i]) : Name::fromInt(i);
+ auto curr = Builder::makeDataSegment(name,
memory->name,
- segmentPassive[i],
+ segmentPassives[i],
(Expression*)segmentOffsets[i],
- segments[i],
+ segmentDatas[i],
segmentSizes[i]);
- curr->hasExplicitName = false;
+ curr->hasExplicitName = explicitName;
((Module*)module)->addDataSegment(std::move(curr));
}
((Module*)module)->removeMemories([&](Memory* curr) { return true; });
@@ -5373,10 +5376,11 @@ uint32_t BinaryenGetNumMemorySegments(BinaryenModuleRef module) {
return ((Module*)module)->dataSegments.size();
}
uint32_t BinaryenGetMemorySegmentByteOffset(BinaryenModuleRef module,
- BinaryenIndex id) {
+ const char* segmentName) {
auto* wasm = (Module*)module;
- if (wasm->dataSegments.size() <= id) {
- Fatal() << "invalid segment id.";
+ const auto* segment = wasm->getDataSegmentOrNull(Name(segmentName));
+ if (segment == NULL) {
+ Fatal() << "invalid segment name.";
}
auto globalOffset = [&](const Expression* const& expr,
@@ -5388,8 +5392,6 @@ uint32_t BinaryenGetMemorySegmentByteOffset(BinaryenModuleRef module,
return false;
};
- const auto& segment = wasm->dataSegments[id];
-
int64_t ret;
if (globalOffset(segment->offset, ret)) {
return ret;
@@ -5496,29 +5498,31 @@ bool BinaryenMemoryIs64(BinaryenModuleRef module, const char* name) {
return memory->is64();
}
size_t BinaryenGetMemorySegmentByteLength(BinaryenModuleRef module,
- BinaryenIndex id) {
- const auto& segments = ((Module*)module)->dataSegments;
- if (segments.size() <= id) {
- Fatal() << "invalid segment id.";
+ const char* segmentName) {
+ auto* wasm = (Module*)module;
+ const auto* segment = wasm->getDataSegmentOrNull(Name(segmentName));
+ if (segment == NULL) {
+ Fatal() << "invalid segment name.";
}
- return segments[id]->data.size();
+ return segment->data.size();
}
bool BinaryenGetMemorySegmentPassive(BinaryenModuleRef module,
- BinaryenIndex id) {
- const auto& segments = ((Module*)module)->dataSegments;
- if (segments.size() <= id) {
- Fatal() << "invalid segment id.";
+ const char* segmentName) {
+ auto* wasm = (Module*)module;
+ const auto* segment = wasm->getDataSegmentOrNull(Name(segmentName));
+ if (segment == NULL) {
+ Fatal() << "invalid segment name.";
}
- return segments[id]->isPassive;
+ return segment->isPassive;
}
void BinaryenCopyMemorySegmentData(BinaryenModuleRef module,
- BinaryenIndex id,
+ const char* segmentName,
char* buffer) {
- const auto& segments = ((Module*)module)->dataSegments;
- if (segments.size() <= id) {
- Fatal() << "invalid segment id.";
+ auto* wasm = (Module*)module;
+ const auto* segment = wasm->getDataSegmentOrNull(Name(segmentName));
+ if (segment == NULL) {
+ Fatal() << "invalid segment name.";
}
- const auto& segment = segments[id];
std::copy(segment->data.cbegin(), segment->data.cend(), buffer);
}
diff --git a/src/binaryen-c.h b/src/binaryen-c.h
index b2c59cfbd..07a81a4c8 100644
--- a/src/binaryen-c.h
+++ b/src/binaryen-c.h
@@ -2028,11 +2028,11 @@ BINARYEN_API bool BinaryenSIMDLoadStoreLaneIsStore(BinaryenExpressionRef expr);
// MemoryInit
-// Gets the index of the segment being initialized by a `memory.init`
+// Gets the name of the segment being initialized by a `memory.init`
// expression.
BINARYEN_API const char*
BinaryenMemoryInitGetSegment(BinaryenExpressionRef expr);
-// Sets the index of the segment being initialized by a `memory.init`
+// Sets the name of the segment being initialized by a `memory.init`
// expression.
BINARYEN_API void BinaryenMemoryInitSetSegment(BinaryenExpressionRef expr,
const char* segment);
@@ -2057,9 +2057,9 @@ BINARYEN_API void BinaryenMemoryInitSetSize(BinaryenExpressionRef expr,
// DataDrop
-// Gets the index of the segment being dropped by a `data.drop` expression.
+// Gets the name of the segment being dropped by a `data.drop` expression.
BINARYEN_API const char* BinaryenDataDropGetSegment(BinaryenExpressionRef expr);
-// Sets the index of the segment being dropped by a `data.drop` expression.
+// Sets the name of the segment being dropped by a `data.drop` expression.
BINARYEN_API void BinaryenDataDropSetSegment(BinaryenExpressionRef expr,
const char* segment);
@@ -2906,14 +2906,17 @@ BINARYEN_API BinaryenElementSegmentRef
BinaryenGetElementSegmentByIndex(BinaryenModuleRef module, BinaryenIndex index);
// This will create a memory, overwriting any existing memory
-// Each memory has data in segments, a start offset in segmentOffsets, and a
-// size in segmentSizes. exportName can be NULL
+// Each memory segment has a name in segmentNames, data in segmentDatas,
+// a start offset in segmentOffsets, a passive flag in segmentPassives
+// and a size in segmentSizes. segmentNames and exportName can be NULL
+// If segmentNames is null, BinaryenSetMemory creates names from indices
BINARYEN_API void BinaryenSetMemory(BinaryenModuleRef module,
BinaryenIndex initial,
BinaryenIndex maximum,
const char* exportName,
- const char** segments,
- bool* segmentPassive,
+ const char** segmentNames,
+ const char** segmentDatas,
+ bool* segmentPassives,
BinaryenExpressionRef* segmentOffsets,
BinaryenIndex* segmentSizes,
BinaryenIndex numSegments,
@@ -2940,14 +2943,14 @@ BINARYEN_API bool BinaryenMemoryIs64(BinaryenModuleRef module,
// Memory segments. Query utilities.
BINARYEN_API uint32_t BinaryenGetNumMemorySegments(BinaryenModuleRef module);
-BINARYEN_API uint32_t
-BinaryenGetMemorySegmentByteOffset(BinaryenModuleRef module, BinaryenIndex id);
+BINARYEN_API uint32_t BinaryenGetMemorySegmentByteOffset(
+ BinaryenModuleRef module, const char* segmentName);
BINARYEN_API size_t BinaryenGetMemorySegmentByteLength(BinaryenModuleRef module,
- BinaryenIndex id);
+ const char* segmentName);
BINARYEN_API bool BinaryenGetMemorySegmentPassive(BinaryenModuleRef module,
- BinaryenIndex id);
+ const char* segmentName);
BINARYEN_API void BinaryenCopyMemorySegmentData(BinaryenModuleRef module,
- BinaryenIndex id,
+ const char* segmentName,
char* buffer);
// Start function. One per module
diff --git a/src/js/binaryen.js-post.js b/src/js/binaryen.js-post.js
index 4ff719b30..111c020b3 100644
--- a/src/js/binaryen.js-post.js
+++ b/src/js/binaryen.js-post.js
@@ -2565,31 +2565,34 @@ function wrapModule(module, self = {}) {
// segments are assumed to be { passive: bool, offset: expression ref, data: array of 8-bit data }
return preserveStack(() => {
const segmentsLen = segments.length;
- const segmentData = new Array(segmentsLen);
- const segmentDataLen = new Array(segmentsLen);
- const segmentPassive = new Array(segmentsLen);
- const segmentOffset = new Array(segmentsLen);
+ const names = new Array(segmentsLen);
+ const datas = new Array(segmentsLen);
+ const lengths = new Array(segmentsLen);
+ const passives = new Array(segmentsLen);
+ const offsets = new Array(segmentsLen);
for (let i = 0; i < segmentsLen; i++) {
- const { data, offset, passive } = segments[i];
- segmentData[i] = _malloc(data.length);
- HEAP8.set(data, segmentData[i]);
- segmentDataLen[i] = data.length;
- segmentPassive[i] = passive;
- segmentOffset[i] = offset;
+ const { name, data, offset, passive } = segments[i];
+ names[i] = name ? strToStack(name) : null;
+ datas[i] = _malloc(data.length);
+ HEAP8.set(data, datas[i]);
+ lengths[i] = data.length;
+ passives[i] = passive;
+ offsets[i] = offset;
}
const ret = Module['_BinaryenSetMemory'](
module, initial, maximum, strToStack(exportName),
- i32sToStack(segmentData),
- i8sToStack(segmentPassive),
- i32sToStack(segmentOffset),
- i32sToStack(segmentDataLen),
- segmentsLen,
- shared,
- memory64,
- strToStack(internalName)
- );
+ i32sToStack(names),
+ i32sToStack(datas),
+ i8sToStack(passives),
+ i32sToStack(offsets),
+ i32sToStack(lengths),
+ segmentsLen,
+ shared,
+ memory64,
+ strToStack(internalName)
+ );
for (let i = 0; i < segmentsLen; i++) {
- _free(segmentData[i]);
+ _free(datas[i]);
}
return ret;
});
@@ -2613,18 +2616,18 @@ function wrapModule(module, self = {}) {
self['getNumMemorySegments'] = function() {
return Module['_BinaryenGetNumMemorySegments'](module);
};
- self['getMemorySegmentInfoByIndex'] = function(id) {
- const passive = Boolean(Module['_BinaryenGetMemorySegmentPassive'](module, id));
+ self['getMemorySegmentInfo'] = function(name) {
+ const passive = Boolean(Module['_BinaryenGetMemorySegmentPassive'](module, strToStack(name)));
let offset = null;
if (!passive) {
- offset = Module['_BinaryenGetMemorySegmentByteOffset'](module, id);
+ offset = Module['_BinaryenGetMemorySegmentByteOffset'](module, strToStack(name));
}
return {
'offset': offset,
'data': (function(){
- const size = Module['_BinaryenGetMemorySegmentByteLength'](module, id);
+ const size = Module['_BinaryenGetMemorySegmentByteLength'](module, strToStack(name));
const ptr = _malloc(size);
- Module['_BinaryenCopyMemorySegmentData'](module, id, ptr);
+ Module['_BinaryenCopyMemorySegmentData'](module, strToStack(name), ptr);
const res = new Uint8Array(size);
res.set(HEAP8.subarray(ptr, ptr + size));
_free(ptr);
diff --git a/test/binaryen.js/kitchen-sink.js b/test/binaryen.js/kitchen-sink.js
index 235d09f3e..52975f8bc 100644
--- a/test/binaryen.js/kitchen-sink.js
+++ b/test/binaryen.js/kitchen-sink.js
@@ -196,11 +196,13 @@ function test_core() {
// Memory
module.setMemory(1, 256, "mem", [
{
+ name: "x0",
passive: false,
offset: module.i32.const(10),
data: "hello, world".split('').map(function(x) { return x.charCodeAt(0) })
},
{
+ name: "y1",
passive: true,
offset: null,
data: "I am passive".split('').map(function(x) { return x.charCodeAt(0) })
@@ -555,8 +557,8 @@ function test_core() {
module.i8x16.shuffle(module.v128.const(v128_bytes), module.v128.const(v128_bytes), v128_bytes),
module.v128.bitselect(module.v128.const(v128_bytes), module.v128.const(v128_bytes), module.v128.const(v128_bytes)),
// Bulk memory
- module.memory.init("0", makeInt32(1024), makeInt32(0), makeInt32(12)),
- module.data.drop("0"),
+ module.memory.init("x0", makeInt32(1024), makeInt32(0), makeInt32(12)),
+ module.data.drop("x0"),
module.memory.copy(makeInt32(2048), makeInt32(1024), makeInt32(12)),
module.memory.fill(makeInt32(0), makeInt32(42), makeInt32(1024)),
// All the rest
@@ -1090,6 +1092,7 @@ function test_for_each() {
}
var expected_offsets = [10, 125, null];
+ var expected_names = ["x0", "y1", "z2"];
var expected_data = ["hello, world", "segment data 2", "hello, passive"];
var expected_passive = [false, false, true];
@@ -1105,23 +1108,26 @@ function test_for_each() {
module.setMemory(1, 256, "mem", [
{
+ name: expected_names[0],
passive: expected_passive[0],
offset: module.i32.const(expected_offsets[0]),
data: expected_data[0].split('').map(function(x) { return x.charCodeAt(0) })
},
{
+ name: expected_names[1],
passive: expected_passive[1],
offset: module.global.get("a-global"),
data: expected_data[1].split('').map(function(x) { return x.charCodeAt(0) })
},
{
+ name: expected_names[2],
passive: expected_passive[2],
offset: expected_offsets[2],
data: expected_data[2].split('').map(function(x) { return x.charCodeAt(0) })
}
], false);
for (i = 0; i < module.getNumMemorySegments(); i++) {
- var segment = module.getMemorySegmentInfoByIndex(i);
+ var segment = module.getMemorySegmentInfo(expected_names[i]);
assert(expected_offsets[i] === segment.offset);
var data8 = new Uint8Array(segment.data);
var str = String.fromCharCode.apply(null, data8);
diff --git a/test/binaryen.js/kitchen-sink.js.txt b/test/binaryen.js/kitchen-sink.js.txt
index b5a9b713e..2c54f1142 100644
--- a/test/binaryen.js/kitchen-sink.js.txt
+++ b/test/binaryen.js/kitchen-sink.js.txt
@@ -140,8 +140,8 @@ getExpressionInfo(tuple[3])={"id":14,"type":5,"value":3.7}
(import "module" "base" (tag $a-tag-imp (param i32)))
(global $a-global i32 (i32.const 1))
(memory $0 1 256 shared)
- (data $0 (i32.const 10) "hello, world")
- (data $1 "I am passive")
+ (data $x0 (i32.const 10) "hello, world")
+ (data $y1 "I am passive")
(table $t0 1 funcref)
(elem $e0 (i32.const 0) $"kitchen()sinker")
(tag $a-tag (param i32))
@@ -1914,12 +1914,12 @@ getExpressionInfo(tuple[3])={"id":14,"type":5,"value":3.7}
(v128.const i32x4 0x04030201 0x08070605 0x0c0b0a09 0x100f0e0d)
)
)
- (memory.init $0
+ (memory.init $x0
(i32.const 1024)
(i32.const 0)
(i32.const 12)
)
- (data.drop $0)
+ (data.drop $x0)
(memory.copy
(i32.const 2048)
(i32.const 1024)
@@ -2250,8 +2250,8 @@ getExpressionInfo(tuple[3])={"id":14,"type":5,"value":3.7}
(import "module" "base" (tag $a-tag-imp (param i32)))
(global $a-global i32 (i32.const 1))
(memory $0 1 256 shared)
- (data $0 (i32.const 10) "hello, world")
- (data $1 "I am passive")
+ (data $x0 (i32.const 10) "hello, world")
+ (data $y1 "I am passive")
(table $t0 1 funcref)
(elem $e0 (i32.const 0) $"kitchen()sinker")
(tag $a-tag (param i32))
@@ -4024,12 +4024,12 @@ getExpressionInfo(tuple[3])={"id":14,"type":5,"value":3.7}
(v128.const i32x4 0x04030201 0x08070605 0x0c0b0a09 0x100f0e0d)
)
)
- (memory.init $0
+ (memory.init $x0
(i32.const 1024)
(i32.const 0)
(i32.const 12)
)
- (data.drop $0)
+ (data.drop $x0)
(memory.copy
(i32.const 2048)
(i32.const 1024)
@@ -4922,9 +4922,9 @@ sizeof Literal: 24
(global $a-global2 i32 (i32.const 2))
(global $a-global3 i32 (i32.const 3))
(memory $0 1 256)
- (data $0 (i32.const 10) "hello, world")
- (data $1 (global.get $a-global) "segment data 2")
- (data $2 "hello, passive")
+ (data $x0 (i32.const 10) "hello, world")
+ (data $y1 (global.get $a-global) "segment data 2")
+ (data $z2 "hello, passive")
(table $t0 1 funcref)
(elem $e0 (i32.const 0) $fn0 $fn1 $fn2)
(export "export0" (func $fn0))
diff --git a/test/binaryen.js/reloc.js b/test/binaryen.js/reloc.js
index 0235ea413..cd63fb5a4 100644
--- a/test/binaryen.js/reloc.js
+++ b/test/binaryen.js/reloc.js
@@ -5,6 +5,7 @@ var module = new binaryen.Module();
module.addGlobalImport("memory_base", "env", "memory_base", binaryen.i32, false);
module.setMemory(1, -1, null, [
{
+ name: "x0",
offset: module.global.get("memory_base", binaryen.i32),
data: "data data".split('').map(function(x) { return x.charCodeAt(0) })
}
diff --git a/test/binaryen.js/reloc.js.txt b/test/binaryen.js/reloc.js.txt
index 0aa075841..b98bc4bef 100644
--- a/test/binaryen.js/reloc.js.txt
+++ b/test/binaryen.js/reloc.js.txt
@@ -3,7 +3,7 @@
(import "env" "memory_base" (global $memory_base i32))
(import "env" "table_base" (global $table_base i32))
(memory $0 1)
- (data $0 (global.get $memory_base) "data data")
+ (data $x0 (global.get $memory_base) "data data")
(table $0 1 funcref)
(elem $0 (global.get $table_base) $func $func)
(func $func
diff --git a/test/example/c-api-kitchen-sink.c b/test/example/c-api-kitchen-sink.c
index edf8d61f7..d5681097c 100644
--- a/test/example/c-api-kitchen-sink.c
+++ b/test/example/c-api-kitchen-sink.c
@@ -530,8 +530,9 @@ void test_core() {
// Memory. Add it before creating any memory-using instructions.
- const char* segments[] = {"hello, world", "I am passive"};
- bool segmentPassive[] = {false, true};
+ const char* segmentNames[] = {"0", "1"};
+ const char* segmentDatas[] = {"hello, world", "I am passive"};
+ bool segmentPassives[] = {false, true};
BinaryenExpressionRef segmentOffsets[] = {
BinaryenConst(module, BinaryenLiteralInt32(10)), NULL};
BinaryenIndex segmentSizes[] = {12, 12};
@@ -539,8 +540,9 @@ void test_core() {
1,
256,
"mem",
- segments,
- segmentPassive,
+ segmentNames,
+ segmentDatas,
+ segmentPassives,
segmentOffsets,
segmentSizes,
2,
@@ -2085,9 +2087,10 @@ void test_for_each() {
assert(BinaryenGetExportByIndex(module, i) == exps[i]);
}
- const char* segments[] = {"hello, world", "segment data 2"};
+ const char* segmentNames[] = {"0", "1"};
+ const char* segmentDatas[] = {"hello, world", "segment data 2"};
const uint32_t expected_offsets[] = {10, 125};
- bool segmentPassive[] = {false, false};
+ bool segmentPassives[] = {false, false};
BinaryenIndex segmentSizes[] = {12, 14};
BinaryenExpressionRef segmentOffsets[] = {
@@ -2097,8 +2100,9 @@ void test_for_each() {
1,
256,
"mem",
- segments,
- segmentPassive,
+ segmentNames,
+ segmentDatas,
+ segmentPassives,
segmentOffsets,
segmentSizes,
2,
@@ -2113,11 +2117,12 @@ void test_for_each() {
for (i = 0; i < BinaryenGetNumMemorySegments(module); i++) {
char out[15] = {};
- assert(BinaryenGetMemorySegmentByteOffset(module, i) ==
+ assert(BinaryenGetMemorySegmentByteOffset(module, segmentNames[i]) ==
expected_offsets[i]);
- assert(BinaryenGetMemorySegmentByteLength(module, i) == segmentSizes[i]);
- BinaryenCopyMemorySegmentData(module, i, out);
- assert(0 == strcmp(segments[i], out));
+ assert(BinaryenGetMemorySegmentByteLength(module, segmentNames[i]) ==
+ segmentSizes[i]);
+ BinaryenCopyMemorySegmentData(module, segmentNames[i], out);
+ assert(0 == strcmp(segmentDatas[i], out));
}
}
{
diff --git a/test/example/c-api-relooper-unreachable-if.cpp b/test/example/c-api-relooper-unreachable-if.cpp
index 1c5708835..96c6c1149 100644
--- a/test/example/c-api-relooper-unreachable-if.cpp
+++ b/test/example/c-api-relooper-unreachable-if.cpp
@@ -15,16 +15,18 @@ int main() {
expressions[size_t(NULL)] = BinaryenExpressionRef(NULL);
BinaryenModuleAutoDrop(the_module);
{
- const char* segments[] = {0};
- bool segmentPassive[] = {false};
+ const char* segmentNames[] = {"0"};
+ const char* segmentDatas[] = {0};
+ bool segmentPassives[] = {false};
BinaryenExpressionRef segmentOffsets[] = {0};
BinaryenIndex segmentSizes[] = {0};
BinaryenSetMemory(the_module,
256,
256,
"memory",
- segments,
- segmentPassive,
+ segmentNames,
+ segmentDatas,
+ segmentPassives,
segmentOffsets,
segmentSizes,
0,
@@ -585,16 +587,18 @@ int main() {
}
BinaryenAddFunctionExport(the_module, "main", "main");
{
- const char* segments[] = {0};
+ const char* segmentNames[] = {"0"};
+ const char* segmentDatas[] = {0};
BinaryenExpressionRef segmentOffsets[] = {0};
- bool segmentPassive[] = {false};
+ bool segmentPassives[] = {false};
BinaryenIndex segmentSizes[] = {0};
BinaryenSetMemory(the_module,
1,
1,
NULL,
- segments,
- segmentPassive,
+ segmentNames,
+ segmentDatas,
+ segmentPassives,
segmentOffsets,
segmentSizes,
0,
diff --git a/test/example/c-api-unused-mem.cpp b/test/example/c-api-unused-mem.cpp
index a0970a8ca..750f3b703 100644
--- a/test/example/c-api-unused-mem.cpp
+++ b/test/example/c-api-unused-mem.cpp
@@ -16,16 +16,18 @@ int main() {
expressions[size_t(NULL)] = BinaryenExpressionRef(NULL);
BinaryenModuleAutoDrop(the_module);
{
- const char* segments[] = {0};
- bool segmentPassive[] = {false};
+ const char* segmentNames[] = {"0"};
+ const char* segmentDatas[] = {0};
+ bool segmentPassives[] = {false};
BinaryenExpressionRef segmentOffsets[] = {0};
BinaryenIndex segmentSizes[] = {0};
BinaryenSetMemory(the_module,
256,
256,
"memory",
- segments,
- segmentPassive,
+ segmentNames,
+ segmentDatas,
+ segmentPassives,
segmentOffsets,
segmentSizes,
0,
@@ -81,16 +83,18 @@ int main() {
}
BinaryenAddFunctionExport(the_module, "main", "main");
{
- const char* segments[] = {0};
- bool segmentPassive[] = {false};
+ const char* segmentNames[] = {"0"};
+ const char* segmentDatas[] = {0};
+ bool segmentPassives[] = {false};
BinaryenExpressionRef segmentOffsets[] = {0};
BinaryenIndex segmentSizes[] = {0};
BinaryenSetMemory(the_module,
1024,
1024,
NULL,
- segments,
- segmentPassive,
+ segmentNames,
+ segmentDatas,
+ segmentPassives,
segmentOffsets,
segmentSizes,
0,
diff --git a/test/example/relooper-fuzz.c b/test/example/relooper-fuzz.c
index a648e61b4..afa8e7ec1 100644
--- a/test/example/relooper-fuzz.c
+++ b/test/example/relooper-fuzz.c
@@ -369,7 +369,8 @@ int main() {
BinaryenTypeNone());
// memory
- BinaryenSetMemory(module, 1, 1, "mem", NULL, NULL, NULL, NULL, 0, 0, 0, "0");
+ BinaryenSetMemory(
+ module, 1, 1, "mem", NULL, NULL, NULL, NULL, NULL, 0, 0, 0, "0");
assert(BinaryenModuleValidate(module));
diff --git a/test/example/relooper-fuzz1.c b/test/example/relooper-fuzz1.c
index a524922d7..a2594407a 100644
--- a/test/example/relooper-fuzz1.c
+++ b/test/example/relooper-fuzz1.c
@@ -366,7 +366,8 @@ int main() {
BinaryenTypeNone());
// memory
- BinaryenSetMemory(module, 1, 1, "mem", NULL, NULL, NULL, NULL, 0, 0, 0, "0");
+ BinaryenSetMemory(
+ module, 1, 1, "mem", NULL, NULL, NULL, NULL, NULL, 0, 0, 0, "0");
assert(BinaryenModuleValidate(module));
diff --git a/test/example/relooper-fuzz2.c b/test/example/relooper-fuzz2.c
index 8d129b77b..9ccba34d7 100644
--- a/test/example/relooper-fuzz2.c
+++ b/test/example/relooper-fuzz2.c
@@ -690,7 +690,8 @@ int main() {
BinaryenTypeNone());
// memory
- BinaryenSetMemory(module, 1, 1, "mem", NULL, NULL, NULL, NULL, 0, 0, 0, "0");
+ BinaryenSetMemory(
+ module, 1, 1, "mem", NULL, NULL, NULL, NULL, NULL, 0, 0, 0, "0");
// optionally, optimize
if (0)
diff --git a/test/example/relooper-merge1.c b/test/example/relooper-merge1.c
index 4086de438..d571696f8 100644
--- a/test/example/relooper-merge1.c
+++ b/test/example/relooper-merge1.c
@@ -232,7 +232,8 @@ int main() {
BinaryenTypeNone());
// memory
- BinaryenSetMemory(module, 1, 1, "mem", NULL, NULL, NULL, NULL, 0, 0, 0, "0");
+ BinaryenSetMemory(
+ module, 1, 1, "mem", NULL, NULL, NULL, NULL, NULL, 0, 0, 0, "0");
// optionally, optimize
if (0)
diff --git a/test/example/relooper-merge2.c b/test/example/relooper-merge2.c
index d85f9d71c..c70ef5601 100644
--- a/test/example/relooper-merge2.c
+++ b/test/example/relooper-merge2.c
@@ -247,7 +247,8 @@ int main() {
BinaryenTypeNone());
// memory
- BinaryenSetMemory(module, 1, 1, "mem", NULL, NULL, NULL, NULL, 0, 0, 0, "0");
+ BinaryenSetMemory(
+ module, 1, 1, "mem", NULL, NULL, NULL, NULL, NULL, 0, 0, 0, "0");
// optionally, optimize
if (0)
diff --git a/test/example/relooper-merge3.c b/test/example/relooper-merge3.c
index 9347e0fde..933739254 100644
--- a/test/example/relooper-merge3.c
+++ b/test/example/relooper-merge3.c
@@ -231,7 +231,8 @@ int main() {
BinaryenTypeNone());
// memory
- BinaryenSetMemory(module, 1, 1, "mem", NULL, NULL, NULL, NULL, 0, 0, 0, "0");
+ BinaryenSetMemory(
+ module, 1, 1, "mem", NULL, NULL, NULL, NULL, NULL, 0, 0, 0, "0");
// optionally, optimize
if (0)
diff --git a/test/example/relooper-merge4.c b/test/example/relooper-merge4.c
index b4373454d..6fc36be36 100644
--- a/test/example/relooper-merge4.c
+++ b/test/example/relooper-merge4.c
@@ -231,7 +231,8 @@ int main() {
BinaryenTypeNone());
// memory
- BinaryenSetMemory(module, 1, 1, "mem", NULL, NULL, NULL, NULL, 0, 0, 0, "0");
+ BinaryenSetMemory(
+ module, 1, 1, "mem", NULL, NULL, NULL, NULL, NULL, 0, 0, 0, "0");
// optionally, optimize
if (0)
diff --git a/test/example/relooper-merge5.c b/test/example/relooper-merge5.c
index 79ee6abc8..7e4fbee0f 100644
--- a/test/example/relooper-merge5.c
+++ b/test/example/relooper-merge5.c
@@ -231,7 +231,8 @@ int main() {
BinaryenTypeNone());
// memory
- BinaryenSetMemory(module, 1, 1, "mem", NULL, NULL, NULL, NULL, 0, 0, 0, "0");
+ BinaryenSetMemory(
+ module, 1, 1, "mem", NULL, NULL, NULL, NULL, NULL, 0, 0, 0, "0");
// optionally, optimize
if (0)
diff --git a/test/example/relooper-merge6.c b/test/example/relooper-merge6.c
index 774dd934c..93043ef32 100644
--- a/test/example/relooper-merge6.c
+++ b/test/example/relooper-merge6.c
@@ -234,7 +234,8 @@ int main() {
BinaryenTypeNone());
// memory
- BinaryenSetMemory(module, 1, 1, "mem", NULL, NULL, NULL, NULL, 0, 0, 0, "0");
+ BinaryenSetMemory(
+ module, 1, 1, "mem", NULL, NULL, NULL, NULL, NULL, 0, 0, 0, "0");
// optionally, optimize
if (0)
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-08 01:41:06 +0000