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

Merge master & correct errors

Browse Source
This commit is contained in:
Patrick Ventuzelo
2019-12-10 14:07:22 +01:00
parent 9daa8e7f38 3716a863be
commit c4511d53e1
5 changed files with 215 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
crates/lightbeam/src/function_body.rs
View File

@@ -1,13 +1,15 @@
use crate::backend::{
ret_locs, BlockCallingConvention, CodeGenSession, Context, Label, Registers, ValueLocation,
VirtualCallingConvention,
ret_locs, BlockCallingConvention, CodeGenSession, Context, Label, VirtualCallingConvention,
};
#[cfg(debug_assertions)]
use crate::backend::{Registers, ValueLocation};
use crate::error::Error;
use crate::microwasm::*;
use crate::module::{ModuleContext, SigType, Signature};
use cranelift_codegen::binemit;
use dynasmrt::DynasmApi;
use either::{Either, Left, Right};
#[cfg(debug_assertions)]
use more_asserts::assert_ge;
use multi_mut::HashMapMultiMut;
use std::{collections::HashMap, hash::Hash};
@@ -413,13 +415,8 @@ where
None
};
let mut cc : Option<BlockCallingConvention> = None;
if then_block_should_serialize_args
|| else_block_should_serialize_args
{
let a = ctx.serialize_args(max_params)?;
cc = Some(a);
}
let cc = if then_block_should_serialize_args
|| else_block_should_serialize_args { let a = ctx.serialize_args(max_params)? ; Some(a) } else { None };
**then_cc = if then_block_should_serialize_args {
let mut cc = cc.clone().unwrap();
@@ -449,7 +446,7 @@ where
};
Ok(())
},
_ => return Err(Error::Microwasm(
_ => Err(Error::Microwasm(
"unimplemented: Can't pass different params to different sides of `br_if` yet".to_string(),
)),
}
@@ -813,8 +810,8 @@ where
Operator::Load { ty: F32, memarg } => ctx.f32_load(memarg.offset)?,
Operator::Load { ty: I64, memarg } => ctx.i64_load(memarg.offset)?,
Operator::Load { ty: F64, memarg } => ctx.f64_load(memarg.offset)?,
Operator::Store8 { ty: _, memarg } => ctx.store8(memarg.offset)?,
Operator::Store16 { ty: _, memarg } => ctx.store16(memarg.offset)?,
Operator::Store8 { memarg, .. } => ctx.store8(memarg.offset)?,
Operator::Store16 { memarg, .. } => ctx.store16(memarg.offset)?,
Operator::Store32 { memarg }
| Operator::Store { ty: I32, memarg }
| Operator::Store { ty: F32, memarg } => ctx.store32(memarg.offset)?,
@@ -826,10 +823,10 @@ where
Operator::Select => {
ctx.select()?;
}
Operator::MemorySize { reserved: _ } => {
Operator::MemorySize { .. } => {
ctx.memory_size()?;
}
Operator::MemoryGrow { reserved: _ } => {
Operator::MemoryGrow { .. } => {
ctx.memory_grow()?;
}
Operator::Call { function_index } => {