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

Remove FunctionBuilderContext from API, and change FunctionBuilder API

Browse Source
This commit is contained in:
Aaron Power
2019-03-21 10:32:42 +01:00
committed by Dan Gohman
parent 0273eb84e0
commit 8fd1128990
11 changed files with 162 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
cranelift/simplejit/examples/simplejit-minimal.rs
View File

@@ -7,7 +7,6 @@ fn main() {
let mut module: Module<SimpleJITBackend> =
Module::new(SimpleJITBuilder::new(default_libcall_names()));
let mut ctx = module.make_context();
let mut func_ctx = FunctionBuilderContext::new();
let mut sig_a = module.make_signature();
sig_a.params.push(AbiParam::new(types::I32));
@@ -25,8 +24,8 @@ fn main() {
ctx.func.signature = sig_a;
ctx.func.name = ExternalName::user(0, func_a.as_u32());
{
let mut bcx: FunctionBuilder = FunctionBuilder::new(&mut ctx.func, &mut func_ctx);
ctx.func = {
let mut bcx: FunctionBuilder = FunctionBuilder::new(ctx.func);
let ebb = bcx.create_ebb();
bcx.switch_to_block(ebb);
@@ -36,15 +35,15 @@ fn main() {
let add = bcx.ins().iadd(cst, param);
bcx.ins().return_(&[add]);
bcx.seal_all_blocks();
bcx.finalize();
}
bcx.finalize()
};
module.define_function(func_a, &mut ctx).unwrap();
module.clear_context(&mut ctx);
ctx.func.signature = sig_b;
ctx.func.name = ExternalName::user(0, func_b.as_u32());
{
let mut bcx: FunctionBuilder = FunctionBuilder::new(&mut ctx.func, &mut func_ctx);
ctx.func = {
let mut bcx: FunctionBuilder = FunctionBuilder::new(ctx.func);
let ebb = bcx.create_ebb();
bcx.switch_to_block(ebb);
@@ -58,8 +57,8 @@ fn main() {
};
bcx.ins().return_(&[value]);
bcx.seal_all_blocks();
bcx.finalize();
}
bcx.finalize()
};
module.define_function(func_b, &mut ctx).unwrap();
module.clear_context(&mut ctx);

37
cranelift/simplejit/tests/basic.rs
View File

@@ -37,14 +37,16 @@ fn define_simple_function(module: &mut Module<SimpleJITBackend>) -> FuncId {
.unwrap();
let mut ctx = Context::new();
ctx.func = Function::with_name_signature(ExternalName::user(0, func_id.as_u32()), sig);
let mut func_ctx = FunctionBuilderContext::new();
{
let mut bcx: FunctionBuilder = FunctionBuilder::new(&mut ctx.func, &mut func_ctx);
ctx.func = {
let func = Function::with_name_signature(ExternalName::user(0, func_id.as_u32()), sig);
let mut bcx: FunctionBuilder = FunctionBuilder::new(func);
let ebb = bcx.create_ebb();
bcx.switch_to_block(ebb);
bcx.ins().return_(&[]);
}
bcx.seal_all_blocks();
bcx.finalize()
};
module.define_function(func_id, &mut ctx).unwrap();
@@ -85,11 +87,9 @@ fn switch_error() {
call_conv: CallConv::SystemV,
};
let mut func = Function::with_name_signature(ExternalName::user(0, 0), sig);
let mut func_ctx = FunctionBuilderContext::new();
{
let mut bcx: FunctionBuilder = FunctionBuilder::new(&mut func, &mut func_ctx);
let func = {
let func = Function::with_name_signature(ExternalName::user(0, 0), sig);
let mut bcx: FunctionBuilder = FunctionBuilder::new(func);
let start = bcx.create_ebb();
let bb0 = bcx.create_ebb();
let bb1 = bcx.create_ebb();
@@ -134,8 +134,8 @@ fn switch_error() {
bcx.ins().return_(&[r]);
bcx.seal_all_blocks();
bcx.finalize();
}
bcx.finalize()
};
let flags = settings::Flags::new(settings::builder());
match cranelift_codegen::verify_function(&func, &flags) {
@@ -164,10 +164,9 @@ fn libcall_function() {
.unwrap();
let mut ctx = Context::new();
ctx.func = Function::with_name_signature(ExternalName::user(0, func_id.as_u32()), sig);
let mut func_ctx = FunctionBuilderContext::new();
{
let mut bcx: FunctionBuilder = FunctionBuilder::new(&mut ctx.func, &mut func_ctx);
ctx.func = {
let func = Function::with_name_signature(ExternalName::user(0, func_id.as_u32()), sig);
let mut bcx: FunctionBuilder = FunctionBuilder::new(func);
let ebb = bcx.create_ebb();
bcx.switch_to_block(ebb);
@@ -189,7 +188,11 @@ fn libcall_function() {
bcx.call_memset(module.target_config(), buffer, zero, size);
bcx.ins().return_(&[]);
}
bcx.seal_all_blocks();
bcx.finalize()
};
module.define_function(func_id, &mut ctx).unwrap();