T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'yurydelendik-lightbeam/cranelift-32'

Browse Source
This commit is contained in:
Dan Gohman
2019-10-02 09:45:54 -07:00
parent 8298a7a8b5 8b9c170a91
commit 5832eff76f
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lightbeam/Cargo.toml
View File

@@ -13,7 +13,7 @@ edition = "2018"
smallvec = "0.6"
dynasm = "0.3"
dynasmrt = "0.3"
wasmparser = "0.29"
wasmparser = "0.32"
memoffset = "0.2"
itertools = "0.8"
capstone = "0.5.0"

17
lightbeam/src/microwasm.rs
View File

@@ -290,6 +290,13 @@ impl SignlessType {
}
}
fn create_returns_from_wasm_type(ty: wasmparser::TypeOrFuncType) -> Vec<SignlessType> {
match ty {
wasmparser::TypeOrFuncType::Type(ty) => Vec::from_iter(Type::from_wasm(ty)),
wasmparser::TypeOrFuncType::FuncType(_) => panic!("unsupported func type"),
}
}
#[derive(Debug, Clone)]
pub struct BrTable<L> {
pub targets: Vec<BrTargetDrop<L>>,
@@ -1407,9 +1414,9 @@ where
self.stack.clone()
}
fn block_params_with_wasm_type(&self, ty: wasmparser::Type) -> Vec<SignlessType> {
fn block_params_with_wasm_type(&self, ty: wasmparser::TypeOrFuncType) -> Vec<SignlessType> {
let mut out = self.block_params();
out.extend(Type::from_wasm(ty));
out.extend(create_returns_from_wasm_type(ty));
out
}
}
@@ -1538,7 +1545,7 @@ where
self.control_frames.push(ControlFrame {
id,
arguments: self.stack.len() as u32,
returns: Vec::from_iter(Type::from_wasm(ty)),
returns: create_returns_from_wasm_type(ty),
kind: ControlFrameKind::Block {
needs_end_label: false,
},
@@ -1553,7 +1560,7 @@ where
self.control_frames.push(ControlFrame {
id,
arguments: self.stack.len() as u32,
returns: Vec::from_iter(Type::from_wasm(ty)),
returns: create_returns_from_wasm_type(ty),
kind: ControlFrameKind::Loop,
});
let label = (id, NameTag::Header);
@@ -1571,7 +1578,7 @@ where
self.control_frames.push(ControlFrame {
id,
arguments: self.stack.len() as u32,
returns: Vec::from_iter(Type::from_wasm(ty)),
returns: create_returns_from_wasm_type(ty),
kind: ControlFrameKind::If { has_else: false },
});
let (then, else_, end) = (