Skip to content

Binary 0xc: Remove arity on return instruction #740

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

Merged
merged 2 commits into from
Oct 4, 2016
Merged

Binary 0xc: Remove arity on return instruction #740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9035a40
Binary 0xc: Remove arity on return instruction
dschuff Oct 4, 2016
6049631
Missed wasm-binary.h
dschuff Oct 4, 2016
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
2 changes: 2 additions & 0 deletions check.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,6 +433,8 @@ def fix(x):

# we must ignore some binary format splits
splits_to_skip = {
'func.wast': [2],
'return.wast': [2]
}

# check binary format. here we can verify execution of the final result, no need for an output verification
Expand Down
6 changes: 2 additions & 4 deletions src/wasm-binary.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1313,7 +1313,7 @@ class WasmBinaryWriter : public Visitor<WasmBinaryWriter, void> {
if (curr->value) {
recurse(curr->value);
}
o << int8_t(BinaryConsts::Return) << U32LEB(curr->value ? 1 : 0);
o << int8_t(BinaryConsts::Return);
}
void visitHost(Host *curr) {
if (debug) std::cerr << "zz node: Host" << std::endl;
Expand Down Expand Up @@ -2378,9 +2378,7 @@ class WasmBinaryBuilder {
}
void visitReturn(Return *curr) {
if (debug) std::cerr << "zz node: Return" << std::endl;
auto arity = getU32LEB();
assert(arity == 0 || arity == 1);
if (arity == 1) {
if (currFunction->result != none) {
curr->value = popExpression();
}
}
Expand Down