Skip to content

Support all garbage collector tests #2622

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Support all garbage collector tests #2622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cacacc7
Add support for function references proposal
Mar 7, 2025
073a9d8
Implement return_call_ref, ref.as_non_null, br_on_[non_]null instruct…
Mar 17, 2025
a7701de
Support table initializers
Apr 8, 2025
ee17d2b
Implement GC basics
May 13, 2025
1a8e2ac
Implement GC opcodes
Jun 5, 2025
1917fb3
Support all gc tests
Jun 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 47 additions & 7 deletions include/wabt/binary-reader-logging.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,20 @@ class BinaryReaderLogging : public BinaryReaderDelegate {

Result BeginTypeSection(Offset size) override;
Result OnTypeCount(Index count) override;
Result OnRecursiveType(Index first_type_index, Index type_count) override;
Result OnFuncType(Index index,
Index param_count,
Type* param_types,
Index result_count,
Type* result_types) override;
Result OnStructType(Index index, Index field_count, TypeMut* fields) override;
Result OnArrayType(Index index, TypeMut field) override;
Type* result_types,
GCTypeExtension* gc_ext) override;
Result OnStructType(Index index,
Index field_count,
TypeMut* fields,
GCTypeExtension* gc_ext) override;
Result OnArrayType(Index index,
TypeMut field,
GCTypeExtension* gc_ext) override;
Result EndTypeSection() override;

Result BeginImportSection(Offset size) override;
Expand Down Expand Up @@ -96,9 +103,13 @@ class BinaryReaderLogging : public BinaryReaderDelegate {

Result BeginTableSection(Offset size) override;
Result OnTableCount(Index count) override;
Result OnTable(Index index,
Type elem_type,
const Limits* elem_limits) override;
Result BeginTable(Index index,
Type elem_type,
const Limits* elem_limits,
bool has_init_expr) override;
Result BeginTableInitExpr(Index index) override;
Result EndTableInitExpr(Index index) override;
Result EndTable(Index index) override;
Result EndTableSection() override;

Result BeginMemorySection(Offset size) override;
Expand Down Expand Up @@ -154,6 +165,17 @@ class BinaryReaderLogging : public BinaryReaderDelegate {
Result OnOpcodeV128(v128 value) override;
Result OnOpcodeBlockSig(Type sig_type) override;
Result OnOpcodeType(Type type) override;
Result OnArrayCopyExpr(Index dst_type_index, Index src_type_index) override;
Result OnArrayFillExpr(Index type_index) override;
Result OnArrayGetExpr(Opcode opcode, Index type_index) override;
Result OnArrayInitDataExpr(Index type_index, Index data_index) override;
Result OnArrayInitElemExpr(Index type_index, Index elem_index) override;
Result OnArrayNewExpr(Index type_index) override;
Result OnArrayNewDataExpr(Index type_index, Index data_index) override;
Result OnArrayNewDefaultExpr(Index type_index) override;
Result OnArrayNewElemExpr(Index type_index, Index elem_index) override;
Result OnArrayNewFixedExpr(Index type_index, Index count) override;
Result OnArraySetExpr(Index type_index) override;
Result OnAtomicLoadExpr(Opcode opcode,
Index memidx,
Address alignment_log2,
Expand All @@ -174,14 +196,20 @@ class BinaryReaderLogging : public BinaryReaderDelegate {
Result OnBlockExpr(Type sig_type) override;
Result OnBrExpr(Index depth) override;
Result OnBrIfExpr(Index depth) override;
Result OnBrOnCastExpr(Opcode opcode,
Index depth,
Type type1,
Type type2) override;
Result OnBrOnNonNullExpr(Index depth) override;
Result OnBrOnNullExpr(Index depth) override;
Result OnBrTableExpr(Index num_targets,
Index* target_depths,
Index default_target_depth) override;
Result OnCallExpr(Index func_index) override;
Result OnCatchExpr(Index tag_index) override;
Result OnCatchAllExpr() override;
Result OnCallIndirectExpr(Index sig_index, Index table_index) override;
Result OnCallRefExpr() override;
Result OnCallRefExpr(Type sig_type) override;
Result OnCompareExpr(Opcode opcode) override;
Result OnConvertExpr(Opcode opcode) override;
Result OnDelegateExpr(Index depth) override;
Expand All @@ -191,6 +219,7 @@ class BinaryReaderLogging : public BinaryReaderDelegate {
Result OnF32ConstExpr(uint32_t value_bits) override;
Result OnF64ConstExpr(uint64_t value_bits) override;
Result OnV128ConstExpr(v128 value_bits) override;
Result OnGCUnaryExpr(Opcode opcode) override;
Result OnGlobalGetExpr(Index global_index) override;
Result OnGlobalSetExpr(Index global_index) override;
Result OnI32ConstExpr(uint32_t value) override;
Expand Down Expand Up @@ -218,19 +247,29 @@ class BinaryReaderLogging : public BinaryReaderDelegate {
Result OnTableGrowExpr(Index table) override;
Result OnTableSizeExpr(Index table) override;
Result OnTableFillExpr(Index table) override;
Result OnRefAsNonNullExpr() override;
Result OnRefCastExpr(Type type) override;
Result OnRefFuncExpr(Index index) override;
Result OnRefNullExpr(Type type) override;
Result OnRefIsNullExpr() override;
Result OnRefTestExpr(Type type) override;
Result OnNopExpr() override;
Result OnRethrowExpr(Index depth) override;
Result OnReturnCallExpr(Index func_index) override;
Result OnReturnCallRefExpr(Type sig_type) override;
Result OnReturnCallIndirectExpr(Index sig_index, Index table_index) override;
Result OnReturnExpr() override;
Result OnSelectExpr(Index result_count, Type* result_types) override;
Result OnStoreExpr(Opcode opcode,
Index memidx,
Address alignment_log2,
Address offset) override;
Result OnStructGetExpr(Opcode opcode,
Index type_index,
Index field_index) override;
Result OnStructNewExpr(Index type_index) override;
Result OnStructNewDefaultExpr(Index type_index) override;
Result OnStructSetExpr(Index type_index, Index field_index) override;
Result OnThrowExpr(Index tag_index) override;
Result OnThrowRefExpr() override;
Result OnTryExpr(Type sig_type) override;
Expand Down Expand Up @@ -424,6 +463,7 @@ class BinaryReaderLogging : public BinaryReaderDelegate {
void LogType(Type type);
void LogTypes(Index type_count, Type* types);
void LogTypes(TypeVector& types);
void LogGCInfo(GCTypeExtension* gc_ext);
void LogField(TypeMut field);

Stream* stream_;
Expand Down
77 changes: 70 additions & 7 deletions include/wabt/binary-reader-nop.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,20 +45,29 @@ class BinaryReaderNop : public BinaryReaderDelegate {

/* Type section */
Result BeginTypeSection(Offset size) override { return Result::Ok; }
Result OnRecursiveType(Index first_type_index, Index type_count) override {
return Result::Ok;
}
Result OnTypeCount(Index count) override { return Result::Ok; }
Result OnFuncType(Index index,
Index param_count,
Type* param_types,
Index result_count,
Type* result_types) override {
Type* result_types,
GCTypeExtension* gc_ext) override {
return Result::Ok;
}
Result OnStructType(Index index,
Index field_count,
TypeMut* fields) override {
TypeMut* fields,
GCTypeExtension* gc_ext) override {
return Result::Ok;
}
Result OnArrayType(Index index,
TypeMut field,
GCTypeExtension* gc_ext) override {
return Result::Ok;
}
Result OnArrayType(Index index, TypeMut field) override { return Result::Ok; }
Result EndTypeSection() override { return Result::Ok; }

/* Import section */
Expand Down Expand Up @@ -121,11 +130,15 @@ class BinaryReaderNop : public BinaryReaderDelegate {
/* Table section */
Result BeginTableSection(Offset size) override { return Result::Ok; }
Result OnTableCount(Index count) override { return Result::Ok; }
Result OnTable(Index index,
Type elem_type,
const Limits* elem_limits) override {
Result BeginTable(Index index,
Type elem_type,
const Limits* elem_limits,
bool has_init_expr) override {
return Result::Ok;
}
Result BeginTableInitExpr(Index index) override { return Result::Ok; }
Result EndTableInitExpr(Index index) override { return Result::Ok; }
Result EndTable(Index index) override { return Result::Ok; }
Result EndTableSection() override { return Result::Ok; }

/* Memory section */
Expand Down Expand Up @@ -206,6 +219,31 @@ class BinaryReaderNop : public BinaryReaderDelegate {
Result OnOpcodeV128(v128 value) override { return Result::Ok; }
Result OnOpcodeBlockSig(Type sig_type) override { return Result::Ok; }
Result OnOpcodeType(Type type) override { return Result::Ok; }
Result OnArrayCopyExpr(Index dst_type_index, Index src_type_index) override {
return Result::Ok;
}
Result OnArrayFillExpr(Index type_index) override { return Result::Ok; }
Result OnArrayGetExpr(Opcode opcode, Index type_index) override {
return Result::Ok;
}
Result OnArrayInitDataExpr(Index type_index, Index data_index) override {
return Result::Ok;
}
Result OnArrayInitElemExpr(Index type_index, Index elem_index) override {
return Result::Ok;
}
Result OnArrayNewExpr(Index type_index) override { return Result::Ok; }
Result OnArrayNewDataExpr(Index type_index, Index data_index) override {
return Result::Ok;
}
Result OnArrayNewDefaultExpr(Index type_index) override { return Result::Ok; }
Result OnArrayNewElemExpr(Index type_index, Index elem_index) override {
return Result::Ok;
}
Result OnArrayNewFixedExpr(Index type_index, Index count) override {
return Result::Ok;
}
Result OnArraySetExpr(Index type_index) override { return Result::Ok; }
Result OnAtomicLoadExpr(Opcode opcode,
Index memidx,
Address alignment_log2,
Expand Down Expand Up @@ -241,6 +279,14 @@ class BinaryReaderNop : public BinaryReaderDelegate {
Result OnBlockExpr(Type sig_type) override { return Result::Ok; }
Result OnBrExpr(Index depth) override { return Result::Ok; }
Result OnBrIfExpr(Index depth) override { return Result::Ok; }
Result OnBrOnCastExpr(Opcode opcode,
Index depth,
Type type1,
Type type2) override {
return Result::Ok;
}
Result OnBrOnNonNullExpr(Index depth) override { return Result::Ok; }
Result OnBrOnNullExpr(Index depth) override { return Result::Ok; }
Result OnBrTableExpr(Index num_targets,
Index* target_depths,
Index default_target_depth) override {
Expand All @@ -250,7 +296,7 @@ class BinaryReaderNop : public BinaryReaderDelegate {
Result OnCallIndirectExpr(Index sig_index, Index table_index) override {
return Result::Ok;
}
Result OnCallRefExpr() override { return Result::Ok; }
Result OnCallRefExpr(Type sig_type) override { return Result::Ok; }
Result OnCatchExpr(Index tag_index) override { return Result::Ok; }
Result OnCatchAllExpr() override { return Result::Ok; }
Result OnCompareExpr(Opcode opcode) override { return Result::Ok; }
Expand All @@ -262,6 +308,7 @@ class BinaryReaderNop : public BinaryReaderDelegate {
Result OnF32ConstExpr(uint32_t value_bits) override { return Result::Ok; }
Result OnF64ConstExpr(uint64_t value_bits) override { return Result::Ok; }
Result OnV128ConstExpr(v128 value_bits) override { return Result::Ok; }
Result OnGCUnaryExpr(Opcode opcode) override { return Result::Ok; }
Result OnGlobalGetExpr(Index global_index) override { return Result::Ok; }
Result OnGlobalSetExpr(Index global_index) override { return Result::Ok; }
Result OnI32ConstExpr(uint32_t value) override { return Result::Ok; }
Expand Down Expand Up @@ -299,15 +346,19 @@ class BinaryReaderNop : public BinaryReaderDelegate {
Result OnTableGrowExpr(Index table_index) override { return Result::Ok; }
Result OnTableSizeExpr(Index table_index) override { return Result::Ok; }
Result OnTableFillExpr(Index table_index) override { return Result::Ok; }
Result OnRefAsNonNullExpr() override { return Result::Ok; }
Result OnRefCastExpr(Type type) override { return Result::Ok; }
Result OnRefFuncExpr(Index func_index) override { return Result::Ok; }
Result OnRefNullExpr(Type type) override { return Result::Ok; }
Result OnRefIsNullExpr() override { return Result::Ok; }
Result OnRefTestExpr(Type type) override { return Result::Ok; }
Result OnNopExpr() override { return Result::Ok; }
Result OnRethrowExpr(Index depth) override { return Result::Ok; }
Result OnReturnCallExpr(Index sig_index) override { return Result::Ok; }
Result OnReturnCallIndirectExpr(Index sig_index, Index table_index) override {
return Result::Ok;
}
Result OnReturnCallRefExpr(Type sig_type) override { return Result::Ok; }
Result OnReturnExpr() override { return Result::Ok; }
Result OnSelectExpr(Index result_count, Type* result_types) override {
return Result::Ok;
Expand All @@ -318,6 +369,18 @@ class BinaryReaderNop : public BinaryReaderDelegate {
Address offset) override {
return Result::Ok;
}
Result OnStructGetExpr(Opcode opcode,
Index type_index,
Index field_index) override {
return Result::Ok;
}
Result OnStructNewExpr(Index type_index) override { return Result::Ok; }
Result OnStructNewDefaultExpr(Index type_index) override {
return Result::Ok;
}
Result OnStructSetExpr(Index type_index, Index field_index) override {
return Result::Ok;
}
Result OnThrowExpr(Index depth) override { return Result::Ok; }
Result OnThrowRefExpr() override { return Result::Ok; }
Result OnTryExpr(Type sig_type) override { return Result::Ok; }
Expand Down
Loading
Loading