summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/c-writer.cc116
-rw-r--r--src/template/wasm2c.declarations.c6
-rw-r--r--test/wasm2c/add.txt6
-rw-r--r--test/wasm2c/hello.txt6
-rw-r--r--test/wasm2c/minimal.txt6
5 files changed, 62 insertions, 78 deletions
diff --git a/src/c-writer.cc b/src/c-writer.cc
index dffaad70..ee40ddb8 100644
--- a/src/c-writer.cc
+++ b/src/c-writer.cc
@@ -272,6 +272,7 @@ class CWriter {
void WriteGlobalInitializers();
void WriteDataInitializers();
void WriteElemInitializers();
+ void WriteElemTableInit(bool, const ElemSegment*, const Table*);
void WriteExports(WriteExportsKind);
void WriteInitDecl();
void WriteFreeDecl();
@@ -1510,19 +1511,15 @@ void CWriter::WriteElemInitializers() {
continue;
}
- switch (elem_segment->elem_type) {
- case Type::FuncRef:
- Write("static const wasm_elem_segment_expr_t elem_segment_exprs_",
- GlobalName(elem_segment->name), "[] = ", OpenBrace());
- break;
- case Type::ExternRef:
- Write("static const wasm_rt_externref_t elem_segment_exprs_",
- GlobalName(elem_segment->name), "[] = ", OpenBrace());
- break;
- default:
- WABT_UNREACHABLE;
+ if (elem_segment->elem_type == Type::ExternRef) {
+ // no need to store externref elem initializers because only
+ // ref.null is possible
+ continue;
}
+ Write("static const wasm_elem_segment_expr_t elem_segment_exprs_",
+ GlobalName(elem_segment->name), "[] = ", OpenBrace());
+
for (const ExprList& elem_expr : elem_segment->elem_exprs) {
assert(elem_expr.size() == 1);
const Expr& expr = elem_expr.front();
@@ -1544,11 +1541,7 @@ void CWriter::WriteElemInitializers() {
Write("},", Newline());
} break;
case ExprType::RefNull:
- if (elem_segment->elem_type == Type::FuncRef) {
- Write("{0, NULL, 0},", Newline());
- } else {
- Write("NULL,", Newline());
- }
+ Write("{0, NULL, 0},", Newline());
break;
default:
WABT_UNREACHABLE;
@@ -1579,33 +1572,7 @@ void CWriter::WriteElemInitializers() {
const Table* table = module_->GetTable(elem_segment->table_var);
- if (table->elem_type != Type::FuncRef &&
- table->elem_type != Type::ExternRef) {
- WABT_UNREACHABLE;
- }
-
- Write(GetReferenceTypeName(table->elem_type), "_table_init(",
- ExternalInstancePtr(table->name), ", ");
- if (elem_segment->elem_exprs.empty()) {
- Write("NULL, 0, ");
- } else {
- Write("elem_segment_exprs_", GlobalName(elem_segment->name), ", ",
- elem_segment->elem_exprs.size(), ", ");
- }
- WriteInitExpr(elem_segment->offset);
- if (table->elem_type == Type::ExternRef) {
- Write(", 0, ", elem_segment->elem_exprs.size(), ");", Newline());
- } else {
- if (elem_segment->elem_exprs.empty()) {
- // It's mandatory to handle the case of a zero-length elem segment
- // (even in a module with no types). This must trap if the offset
- // is out of bounds.
- Write(", 0, 0, instance, NULL);", Newline());
- } else {
- Write(", 0, ", elem_segment->elem_exprs.size(),
- ", instance, func_types);", Newline());
- }
- }
+ WriteElemTableInit(true, elem_segment, table);
}
Write(CloseBrace(), Newline());
@@ -1625,6 +1592,49 @@ void CWriter::WriteElemInitializers() {
}
}
+void CWriter::WriteElemTableInit(bool active_initialization,
+ const ElemSegment* src_segment,
+ const Table* dst_table) {
+ assert(dst_table->elem_type == Type::FuncRef ||
+ dst_table->elem_type == Type::ExternRef);
+ assert(dst_table->elem_type == src_segment->elem_type);
+
+ Write(GetReferenceTypeName(dst_table->elem_type), "_table_init(",
+ ExternalInstancePtr(dst_table->name), ", ");
+
+ // elem segment exprs needed only for funcref tables
+ // because externref tables can only be initialized with ref.null
+ if (dst_table->elem_type == Type::FuncRef) {
+ if (src_segment->elem_exprs.empty()) {
+ Write("NULL, ");
+ } else {
+ Write("elem_segment_exprs_", GlobalName(src_segment->name), ", ");
+ }
+ }
+
+ // src_size, dest_addr, src_addr, N
+ if (active_initialization) {
+ Write(src_segment->elem_exprs.size(), ", ");
+ WriteInitExpr(src_segment->offset);
+ Write(", 0, ", src_segment->elem_exprs.size());
+ } else {
+ if (is_droppable(src_segment)) {
+ Write("(instance->elem_segment_dropped_", GlobalName(src_segment->name),
+ " ? 0 : ", src_segment->elem_exprs.size(), "), ");
+ } else {
+ Write("0, ");
+ }
+ Write(StackVar(2), ", ", StackVar(1), ", ", StackVar(0));
+ }
+
+ if (dst_table->elem_type == Type::FuncRef) {
+ Write(", instance, ",
+ src_segment->elem_exprs.empty() ? "NULL" : "func_types");
+ }
+
+ Write(");", Newline());
+}
+
void CWriter::WriteExports(WriteExportsKind kind) {
if (module_->exports.empty())
return;
@@ -2536,25 +2546,7 @@ void CWriter::Write(const ExprList& exprs) {
const ElemSegment* src_segment =
module_->GetElemSegment(inst->segment_index);
- assert(dest_table->elem_type == src_segment->elem_type);
-
- Write(GetReferenceTypeName(dest_table->elem_type), "_table_init(",
- ExternalInstancePtr(dest_table->name), ", ");
- if (src_segment->elem_exprs.empty()) {
- Write("NULL, 0");
- } else {
- Write("elem_segment_exprs_", GlobalName(src_segment->name), ", ");
- if (is_droppable(src_segment)) {
- Write("(instance->elem_segment_dropped_",
- GlobalName(src_segment->name),
- " ? 0 : ", src_segment->elem_exprs.size(), ")");
- } else {
- Write("0");
- }
- }
-
- Write(", ", StackVar(2), ", ", StackVar(1), ", ", StackVar(0));
- Write(", instance, func_types);", Newline());
+ WriteElemTableInit(false, src_segment, dest_table);
DropTypes(3);
} break;
diff --git a/src/template/wasm2c.declarations.c b/src/template/wasm2c.declarations.c
index c262b277..64ad213e 100644
--- a/src/template/wasm2c.declarations.c
+++ b/src/template/wasm2c.declarations.c
@@ -494,9 +494,8 @@ static inline void funcref_table_init(wasm_rt_funcref_table_t* dest,
}
}
-// Currently we only support initializing externref tables with ref.null.
+// Currently Wasm only supports initializing externref tables with ref.null.
static inline void externref_table_init(wasm_rt_externref_table_t* dest,
- const wasm_rt_externref_t* src,
u32 src_size,
u32 dest_addr,
u32 src_addr,
@@ -506,8 +505,7 @@ static inline void externref_table_init(wasm_rt_externref_table_t* dest,
if (UNLIKELY(dest_addr + (uint64_t)n > dest->size))
TRAP(OOB);
for (u32 i = 0; i < n; i++) {
- const wasm_rt_externref_t* src_expr = &src[src_addr + i];
- dest->data[dest_addr + i] = *src_expr;
+ dest->data[dest_addr + i] = wasm_rt_externref_null_value;
}
}
diff --git a/test/wasm2c/add.txt b/test/wasm2c/add.txt
index 88044bb7..ec0d2b49 100644
--- a/test/wasm2c/add.txt
+++ b/test/wasm2c/add.txt
@@ -557,9 +557,8 @@ static inline void funcref_table_init(wasm_rt_funcref_table_t* dest,
}
}
-// Currently we only support initializing externref tables with ref.null.
+// Currently Wasm only supports initializing externref tables with ref.null.
static inline void externref_table_init(wasm_rt_externref_table_t* dest,
- const wasm_rt_externref_t* src,
u32 src_size,
u32 dest_addr,
u32 src_addr,
@@ -569,8 +568,7 @@ static inline void externref_table_init(wasm_rt_externref_table_t* dest,
if (UNLIKELY(dest_addr + (uint64_t)n > dest->size))
TRAP(OOB);
for (u32 i = 0; i < n; i++) {
- const wasm_rt_externref_t* src_expr = &src[src_addr + i];
- dest->data[dest_addr + i] = *src_expr;
+ dest->data[dest_addr + i] = wasm_rt_externref_null_value;
}
}
diff --git a/test/wasm2c/hello.txt b/test/wasm2c/hello.txt
index 368b7631..667d0d74 100644
--- a/test/wasm2c/hello.txt
+++ b/test/wasm2c/hello.txt
@@ -587,9 +587,8 @@ static inline void funcref_table_init(wasm_rt_funcref_table_t* dest,
}
}
-// Currently we only support initializing externref tables with ref.null.
+// Currently Wasm only supports initializing externref tables with ref.null.
static inline void externref_table_init(wasm_rt_externref_table_t* dest,
- const wasm_rt_externref_t* src,
u32 src_size,
u32 dest_addr,
u32 src_addr,
@@ -599,8 +598,7 @@ static inline void externref_table_init(wasm_rt_externref_table_t* dest,
if (UNLIKELY(dest_addr + (uint64_t)n > dest->size))
TRAP(OOB);
for (u32 i = 0; i < n; i++) {
- const wasm_rt_externref_t* src_expr = &src[src_addr + i];
- dest->data[dest_addr + i] = *src_expr;
+ dest->data[dest_addr + i] = wasm_rt_externref_null_value;
}
}
diff --git a/test/wasm2c/minimal.txt b/test/wasm2c/minimal.txt
index ecd78c08..de6af442 100644
--- a/test/wasm2c/minimal.txt
+++ b/test/wasm2c/minimal.txt
@@ -551,9 +551,8 @@ static inline void funcref_table_init(wasm_rt_funcref_table_t* dest,
}
}
-// Currently we only support initializing externref tables with ref.null.
+// Currently Wasm only supports initializing externref tables with ref.null.
static inline void externref_table_init(wasm_rt_externref_table_t* dest,
- const wasm_rt_externref_t* src,
u32 src_size,
u32 dest_addr,
u32 src_addr,
@@ -563,8 +562,7 @@ static inline void externref_table_init(wasm_rt_externref_table_t* dest,
if (UNLIKELY(dest_addr + (uint64_t)n > dest->size))
TRAP(OOB);
for (u32 i = 0; i < n; i++) {
- const wasm_rt_externref_t* src_expr = &src[src_addr + i];
- dest->data[dest_addr + i] = *src_expr;
+ dest->data[dest_addr + i] = wasm_rt_externref_null_value;
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-27 02:11:24 +0000