code002lover/Wasynth
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add block multi-value support

Browse Source
This commit is contained in:
Rerumu 2021-11-28 03:35:58 -05:00
parent 8d7340af64
commit ea639ed420
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
wasm/Cargo.toml
View File

@ -7,3 +7,4 @@ edition = "2021"
[dependencies.parity-wasm] [dependencies.parity-wasm]
git = "https://github.com/paritytech/parity-wasm.git" git = "https://github.com/paritytech/parity-wasm.git"
features = ["multi_value"]

21
wasm/src/backend/ast/transformer.rs
View File

@ -61,6 +61,12 @@ impl<'a> Transformer<'a> {
} }
} }
fn get_type_of(&self, index: u32) -> Arity {
let types = self.wasm.type_section().unwrap().types();
Arity::from_index(types, index)
}
fn push_recall(&mut self, num: u32) { fn push_recall(&mut self, num: u32) {
let len = self.stack.len(); let len = self.stack.len();
@ -70,11 +76,15 @@ impl<'a> Transformer<'a> {
} }
fn push_block_result(&mut self, typ: BlockType) { fn push_block_result(&mut self, typ: BlockType) {
if matches!(typ, BlockType::NoResult) { let num = match typ {
return; BlockType::NoResult => {
} return;
}
BlockType::Value(_) => 1,
BlockType::TypeIndex(i) => self.get_type_of(i).num_result,
};
self.push_recall(1); self.push_recall(num);
} }
// If any expressions are still pending at the start of // If any expressions are still pending at the start of
@ -138,8 +148,7 @@ impl<'a> Transformer<'a> {
} }
fn gen_call_indirect(&mut self, typ: u32, table: u8, stat: &mut Vec<Statement>) { fn gen_call_indirect(&mut self, typ: u32, table: u8, stat: &mut Vec<Statement>) {
let types = self.wasm.type_section().unwrap().types(); let arity = self.get_type_of(typ);
let arity = Arity::from_index(types, typ);
let index = self.stack.pop().unwrap(); let index = self.stack.pop().unwrap();
let param_list = self let param_list = self