summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/c-writer.cc90
-rw-r--r--test/wasm2c/check-imports.txt4
-rw-r--r--test/wasm2c/export-names.txt12
-rw-r--r--test/wasm2c/hello.txt6
4 files changed, 52 insertions, 60 deletions
diff --git a/src/c-writer.cc b/src/c-writer.cc
index b28b6919..cb908f04 100644
--- a/src/c-writer.cc
+++ b/src/c-writer.cc
@@ -94,8 +94,9 @@ struct GlobalName {
const std::string& name;
};
-struct ExternalPtr : GlobalName {
- using GlobalName::GlobalName;
+struct TagSymbol : GlobalName {
+ explicit TagSymbol(const std::string& name)
+ : GlobalName(ModuleFieldType::Tag, name) {}
};
struct ExternalRef : GlobalName {
@@ -142,11 +143,6 @@ struct SignedType {
Type type;
};
-struct ResultType {
- explicit ResultType(const TypeVector& types) : types(types) {}
- const TypeVector& types;
-};
-
struct TryCatchLabel {
TryCatchLabel(const std::string& name, size_t try_catch_stack_size)
: name(name), try_catch_stack_size(try_catch_stack_size), used(false) {}
@@ -267,9 +263,9 @@ class CWriter {
static std::string Mangle(std::string_view name, bool double_underscores);
static std::string MangleName(std::string_view);
static std::string MangleModuleName(std::string_view);
- std::string ExportName(std::string_view module_name,
- std::string_view export_name);
- std::string ExportName(std::string_view export_name);
+ static std::string ExportName(std::string_view module_name,
+ std::string_view export_name);
+ std::string ExportName(std::string_view export_name) const;
std::string ModuleInstanceTypeName() const;
static std::string ModuleInstanceTypeName(std::string_view module_name);
void ClaimName(SymbolSet& set,
@@ -277,7 +273,8 @@ class CWriter {
char type_suffix,
std::string_view wasm_name,
const std::string& c_name);
- std::string FindUniqueName(SymbolSet& set, std::string_view proposed_name);
+ std::string FindUniqueName(SymbolSet& set,
+ std::string_view proposed_name) const;
std::string ClaimUniqueName(SymbolSet& set,
SymbolMap& map,
char type_suffix,
@@ -334,7 +331,7 @@ class CWriter {
void Write(const ParamName&);
void Write(const LabelName&);
void Write(const GlobalName&);
- void Write(const ExternalPtr&);
+ void Write(const TagSymbol&);
void Write(const ExternalRef&);
void Write(const ExternalInstancePtr&);
void Write(const ExternalInstanceRef&);
@@ -345,7 +342,7 @@ class CWriter {
void Write(const LabelDecl&);
void Write(const GlobalInstanceVar&);
void Write(const StackVar&);
- void Write(const ResultType&);
+ void Write(const TypeVector&);
void Write(const Const&);
void WriteInitExpr(const ExprList&);
void WriteInitExprTerminal(const Expr*);
@@ -648,7 +645,7 @@ std::string CWriter::MangleTagTypes(const TypeVector& types) {
}
/* The C symbol for an export from this module. */
-std::string CWriter::ExportName(std::string_view export_name) {
+std::string CWriter::ExportName(std::string_view export_name) const {
return kGlobalSymbolPrefix + module_prefix_ + '_' + MangleName(export_name);
}
@@ -817,7 +814,7 @@ void CWriter::ClaimName(SymbolSet& set,
* an integer to the symbol if necessary.
*/
std::string CWriter::FindUniqueName(SymbolSet& set,
- std::string_view proposed_name) {
+ std::string_view proposed_name) const {
std::string unique{proposed_name};
if (set.find(unique) != set.end()) {
std::string base = unique + "_";
@@ -1052,7 +1049,7 @@ void CWriter::Write(const GlobalName& name) {
Write(GetGlobalName(name.type, name.name));
}
-void CWriter::Write(const ExternalPtr& name) {
+void CWriter::Write(const TagSymbol& name) {
if (!IsImport(name.name)) {
Write("&");
}
@@ -1067,10 +1064,10 @@ void CWriter::Write(const ExternalInstancePtr& name) {
}
void CWriter::Write(const ExternalRef& name) {
- if (IsImport(name.name)) {
- Write("(*", GlobalName(name), ")");
- } else {
+ if (name.type == ModuleFieldType::Func || !IsImport(name.name)) {
Write(GlobalName(name));
+ } else {
+ Write("(*", GlobalName(name), ")");
}
}
@@ -1193,13 +1190,13 @@ void CWriter::Write(SignedType type) {
// clang-format on
}
-void CWriter::Write(const ResultType& rt) {
- if (rt.types.empty()) {
+void CWriter::Write(const TypeVector& types) {
+ if (types.empty()) {
Write("void");
- } else if (rt.types.size() == 1) {
- Write(rt.types[0]);
+ } else if (types.size() == 1) {
+ Write(types[0]);
} else {
- Write("struct ", MangleMultivalueTypes(rt.types));
+ Write("struct ", MangleMultivalueTypes(types));
}
}
@@ -1380,7 +1377,7 @@ void CWriter::WriteInitExprTerminal(const Expr* expr) {
Write("(wasm_rt_funcref_t){", FuncTypeExpr(func_type), ", ",
"(wasm_rt_function_ptr_t)",
- ExternalPtr(ModuleFieldType::Func, func->name), ", ");
+ ExternalRef(ModuleFieldType::Func, func->name), ", ");
if (IsImport(func->name)) {
Write("instance->", GlobalName(ModuleFieldType::Import,
@@ -1388,8 +1385,7 @@ void CWriter::WriteInitExprTerminal(const Expr* expr) {
} else {
Write("instance");
}
-
- Write("};", Newline());
+ Write("}");
} break;
case ExprType::RefNull:
@@ -1785,7 +1781,7 @@ void CWriter::WriteFuncDeclarations() {
void CWriter::WriteFuncDeclaration(const FuncDeclaration& decl,
const std::string& name) {
- Write(ResultType(decl.sig.result_types), " ", name, "(");
+ Write(decl.sig.result_types, " ", name, "(");
Write(ModuleInstanceTypeName(), "*");
WriteParamTypes(decl);
Write(")");
@@ -1794,7 +1790,7 @@ void CWriter::WriteFuncDeclaration(const FuncDeclaration& decl,
void CWriter::WriteImportFuncDeclaration(const FuncDeclaration& decl,
const std::string& module_name,
const std::string& name) {
- Write(ResultType(decl.sig.result_types), " ", name, "(");
+ Write(decl.sig.result_types, " ", name, "(");
Write("struct ", ModuleInstanceTypeName(module_name), "*");
WriteParamTypes(decl);
Write(")");
@@ -1802,7 +1798,7 @@ void CWriter::WriteImportFuncDeclaration(const FuncDeclaration& decl,
void CWriter::WriteCallIndirectFuncDeclaration(const FuncDeclaration& decl,
const std::string& name) {
- Write(ResultType(decl.sig.result_types), " ", name, "(void*");
+ Write(decl.sig.result_types, " ", name, "(void*");
WriteParamTypes(decl);
Write(")");
}
@@ -2153,7 +2149,7 @@ void CWriter::WriteElemInitializers() {
const Func* func = module_->GetFunc(cast<RefFuncExpr>(&expr)->var);
const FuncType* func_type = module_->GetFuncType(func->decl.type_var);
Write("{", FuncTypeExpr(func_type), ", (wasm_rt_function_ptr_t)",
- ExternalPtr(ModuleFieldType::Func, func->name), ", ");
+ ExternalRef(ModuleFieldType::Func, func->name), ", ");
if (IsImport(func->name)) {
Write("offsetof(", ModuleInstanceTypeName(), ", ",
GlobalName(ModuleFieldType::Import,
@@ -2284,8 +2280,7 @@ void CWriter::WriteExports(CWriterPhase kind) {
local_syms_ = global_syms_;
local_sym_map_.clear();
stack_var_sym_map_.clear();
- Write(ResultType(func_->decl.sig.result_types), " ", mangled_name,
- "(");
+ Write(func_->decl.sig.result_types, " ", mangled_name, "(");
MakeTypeBindingReverseMapping(func_->GetNumParamsAndLocals(),
func_->bindings, &index_to_name);
WriteParams(index_to_name);
@@ -2337,8 +2332,10 @@ void CWriter::WriteExports(CWriterPhase kind) {
switch (export_->kind) {
case ExternalKind::Func: {
Write(OpenBrace());
- Write("return ", ExternalRef(ModuleFieldType::Func, internal_name),
- "(");
+ if (func_->GetNumResults() > 0) {
+ Write("return ");
+ }
+ Write(ExternalRef(ModuleFieldType::Func, internal_name), "(");
if (IsImport(internal_name)) {
Write("instance->",
@@ -2381,8 +2378,7 @@ void CWriter::WriteExports(CWriterPhase kind) {
break;
case ExternalKind::Tag:
- Write("= ", ExternalPtr(ModuleFieldType::Tag, internal_name), ";",
- Newline());
+ Write("= ", TagSymbol(internal_name), ";", Newline());
break;
default:
@@ -2485,7 +2481,7 @@ void CWriter::WriteInitInstanceImport() {
Write(", struct ", ModuleInstanceTypeName(import_module_name), "* ",
GlobalName(ModuleFieldType::Import, import_module_name));
}
- Write(")", OpenBrace());
+ Write(") ", OpenBrace());
for (const auto& import_module : import_func_module_set_) {
Write("instance->", GlobalName(ModuleFieldType::Import, import_module),
@@ -2638,7 +2634,7 @@ void CWriter::Write(const Func& func) {
Write(Newline());
PushFuncSection();
- Write(ResultType(func.decl.sig.result_types), " ",
+ Write(func.decl.sig.result_types, " ",
GlobalName(ModuleFieldType::Func, func.name), "(");
WriteParamsAndLocals();
Write("FUNC_PROLOGUE;", Newline());
@@ -2661,7 +2657,7 @@ void CWriter::Write(const Func& func) {
Write("return ", StackVar(0), ";", Newline());
} else if (num_results >= 2) {
Write(OpenBrace());
- Write(ResultType(func.decl.sig.result_types), " tmp;", Newline());
+ Write(func.decl.sig.result_types, " tmp;", Newline());
for (Index i = 0; i < num_results; ++i) {
Type type = func.GetResultType(i);
Writef("tmp.%c%d = ", MangleType(type), i);
@@ -2905,8 +2901,7 @@ void CWriter::Write(const Catch& c) {
}
Write("if (wasm_rt_exception_tag() == ",
- ExternalPtr(ModuleFieldType::Tag, module_->GetTag(c.var)->name), ") ",
- OpenBrace());
+ TagSymbol(module_->GetTag(c.var)->name), ") ", OpenBrace());
const Tag* tag = module_->GetTag(c.var);
const FuncDeclaration& tag_type = tag->decl;
@@ -3383,7 +3378,7 @@ void CWriter::Write(const ExprList& exprs) {
Write(StackVar(0), " = (wasm_rt_funcref_t){", FuncTypeExpr(func_type),
", (wasm_rt_function_ptr_t)",
- ExternalPtr(ModuleFieldType::Func, func->name), ", ");
+ ExternalRef(ModuleFieldType::Func, func->name), ", ");
if (IsImport(func->name)) {
Write("instance->", GlobalName(ModuleFieldType::Import,
@@ -3511,12 +3506,10 @@ void CWriter::Write(const ExprList& exprs) {
Index num_params = tag->decl.GetNumParams();
if (num_params == 0) {
- Write("wasm_rt_load_exception(",
- ExternalPtr(ModuleFieldType::Tag, tag->name), ", 0, NULL);",
+ Write("wasm_rt_load_exception(", TagSymbol(tag->name), ", 0, NULL);",
Newline());
} else if (num_params == 1) {
- Write("wasm_rt_load_exception(",
- ExternalPtr(ModuleFieldType::Tag, tag->name), ", sizeof(",
+ Write("wasm_rt_load_exception(", TagSymbol(tag->name), ", sizeof(",
tag->decl.GetParamType(0), "), &", StackVar(0), ");",
Newline());
} else {
@@ -3527,8 +3520,7 @@ void CWriter::Write(const ExprList& exprs) {
Write(StackVar(i), ", ");
}
Write("};", Newline());
- Write("wasm_rt_load_exception(",
- ExternalPtr(ModuleFieldType::Tag, tag->name),
+ Write("wasm_rt_load_exception(", TagSymbol(tag->name),
", sizeof(tmp), &tmp);", Newline());
Write(CloseBrace(), Newline());
}
diff --git a/test/wasm2c/check-imports.txt b/test/wasm2c/check-imports.txt
index e0780513..bae7f486 100644
--- a/test/wasm2c/check-imports.txt
+++ b/test/wasm2c/check-imports.txt
@@ -703,7 +703,7 @@ static void init_memories(w2c_test* instance) {
}
static const wasm_elem_segment_expr_t elem_segment_exprs_w2c_test_e0[] = {
- {w2c_test_t1, (wasm_rt_function_ptr_t)&w2c_test_f1, 0},
+ {w2c_test_t1, (wasm_rt_function_ptr_t)w2c_test_f1, 0},
};
static void init_tables(w2c_test* instance) {
@@ -713,7 +713,7 @@ static void init_tables(w2c_test* instance) {
static void init_elem_instances(w2c_test *instance) {
}
-static void init_instance_import(w2c_test* instance, struct w2c_env* w2c_env_instance){
+static void init_instance_import(w2c_test* instance, struct w2c_env* w2c_env_instance) {
instance->w2c_env_0x5F_indirect_function_table = w2c_env_0x5F_indirect_function_table(w2c_env_instance);
instance->w2c_env_0x5F_linear_memory = w2c_env_0x5F_linear_memory(w2c_env_instance);
}
diff --git a/test/wasm2c/export-names.txt b/test/wasm2c/export-names.txt
index 76053182..596db402 100644
--- a/test/wasm2c/export-names.txt
+++ b/test/wasm2c/export-names.txt
@@ -700,30 +700,30 @@ static void init_memories(w2c_test* instance) {
/* export: '' */
void w2c_test_(w2c_test* instance) {
- return w2c_test__0(instance);
+ w2c_test__0(instance);
}
/* export: '*\2F' */
void w2c_test_0x2A0x2F(w2c_test* instance) {
- return w2c_test__0(instance);
+ w2c_test__0(instance);
}
/* export: '\3F\3F\2F' */
void w2c_test_0x3F0x3F0x2F(w2c_test* instance) {
- return w2c_test__0(instance);
+ w2c_test__0(instance);
}
/* export: '\0A' */
void w2c_test_0x0A(w2c_test* instance) {
- return w2c_test__0(instance);
+ w2c_test__0(instance);
}
/* export: '\E2\9D\A4\EF\B8\8F' */
void w2c_test_0xE20x9D0xA40xEF0xB80x8F(w2c_test* instance) {
- return w2c_test__0(instance);
+ w2c_test__0(instance);
}
-static void init_instance_import(w2c_test* instance, struct w2c_0x5Cmodule* w2c_0x5Cmodule_instance){
+static void init_instance_import(w2c_test* instance, struct w2c_0x5Cmodule* w2c_0x5Cmodule_instance) {
instance->w2c_0x5Cmodule_import0x200x2A0x2F = w2c_0x5Cmodule_import0x200x2A0x2F(w2c_0x5Cmodule_instance);
}
diff --git a/test/wasm2c/hello.txt b/test/wasm2c/hello.txt
index 70060ecc..752725e8 100644
--- a/test/wasm2c/hello.txt
+++ b/test/wasm2c/hello.txt
@@ -737,10 +737,10 @@ wasm_rt_memory_t* w2c_test_memory(w2c_test* instance) {
/* export: '_start' */
void w2c_test_0x5Fstart(w2c_test* instance) {
- return w2c_test_0x5Fstart_0(instance);
+ w2c_test_0x5Fstart_0(instance);
}
-static void init_instance_import(w2c_test* instance, struct w2c_wasi__snapshot__preview1* w2c_wasi__snapshot__preview1_instance){
+static void init_instance_import(w2c_test* instance, struct w2c_wasi__snapshot__preview1* w2c_wasi__snapshot__preview1_instance) {
instance->w2c_wasi__snapshot__preview1_instance = w2c_wasi__snapshot__preview1_instance;
}
@@ -806,7 +806,7 @@ void w2c_test_0x5Fstart_0(w2c_test* instance) {
var_i3 = 0u;
var_i4 = 0u;
var_i0 = CALL_INDIRECT(instance->w2c_T0, u32 (*)(void*, u32, u32, u32, u32), w2c_test_t0, var_i4, instance->w2c_T0.data[var_i4].module_instance, var_i0, var_i1, var_i2, var_i3);
- (*w2c_wasi__snapshot__preview1_proc_exit)(instance->w2c_wasi__snapshot__preview1_instance, var_i0);
+ w2c_wasi__snapshot__preview1_proc_exit(instance->w2c_wasi__snapshot__preview1_instance, var_i0);
FUNC_EPILOGUE;
}
;;; STDOUT ;;)
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-26 11:01:27 +0000