* Auto-generate shims for old `wasi_unstable` module This commit is effectively just doing what #707 already did, but applying it to the `snapshot_0` module as well. The end result is the same, where we cut down on all the boilerplate in `snapshot_0` and bring it in line with the main `wasi_snapshot_preview1` implementation. The goal here is to make it easier to change the two in tandem since they're both doing the same thing. * Migrate `wasi_common::hostcalls` to a macro This commit migrates the `hostcalls` module to being auto-generated by a macro rather than duplicating a handwritten signature for each wasi syscall. * Auto-generate snapshot_0's `hostcalls` module Similar to the previous commit, but for `snapshot_0` * Delete the `wasi-common-cbindgen` crate This is no longer needed with the hostcalls macro now, we can easily fold the definition of the cbindgen macro into the same crate. * Rustfmt * Fix windows build errors * Rustfmt * Remove now no-longer-necessary code * rustfmt
129 lines
4.2 KiB
Rust
129 lines
4.2 KiB
Rust
use cranelift_codegen::ir::types;
|
|
use cranelift_codegen::{ir, isa};
|
|
use cranelift_entity::PrimaryMap;
|
|
use cranelift_wasm::DefinedFuncIndex;
|
|
use std::fs::File;
|
|
use std::rc::Rc;
|
|
use target_lexicon::HOST;
|
|
use wasi_common::old::snapshot_0::hostcalls;
|
|
use wasi_common::old::snapshot_0::{WasiCtx, WasiCtxBuilder};
|
|
use wasi_common::wasi;
|
|
use wasmtime_environ::{translate_signature, Export, Module};
|
|
use wasmtime_runtime::{Imports, InstanceHandle, InstantiationError, VMContext};
|
|
|
|
/// Creates `wasmtime::Instance` object implementing the "wasi" interface.
|
|
pub fn create_wasi_instance(
|
|
store: &wasmtime::Store,
|
|
preopened_dirs: &[(String, File)],
|
|
argv: &[String],
|
|
environ: &[(String, String)],
|
|
) -> Result<wasmtime::Instance, InstantiationError> {
|
|
let wasi = instantiate_wasi(preopened_dirs, argv, environ)?;
|
|
let instance = wasmtime::Instance::from_handle(&store, wasi);
|
|
Ok(instance)
|
|
}
|
|
|
|
/// Return an instance implementing the "wasi" interface.
|
|
pub fn instantiate_wasi(
|
|
preopened_dirs: &[(String, File)],
|
|
argv: &[String],
|
|
environ: &[(String, String)],
|
|
) -> Result<InstanceHandle, InstantiationError> {
|
|
let mut wasi_ctx_builder = WasiCtxBuilder::new()
|
|
.inherit_stdio()
|
|
.args(argv)
|
|
.envs(environ);
|
|
|
|
for (dir, f) in preopened_dirs {
|
|
wasi_ctx_builder = wasi_ctx_builder.preopened_dir(
|
|
f.try_clone().map_err(|err| {
|
|
InstantiationError::Resource(format!(
|
|
"couldn't clone an instance handle to pre-opened dir: {}",
|
|
err
|
|
))
|
|
})?,
|
|
dir,
|
|
);
|
|
}
|
|
|
|
let wasi_ctx = wasi_ctx_builder.build().map_err(|err| {
|
|
InstantiationError::Resource(format!("couldn't assemble WASI context object: {}", err))
|
|
})?;
|
|
instantiate_wasi_with_context(wasi_ctx)
|
|
}
|
|
|
|
/// Return an instance implementing the "wasi" interface.
|
|
///
|
|
/// The wasi context is configured by
|
|
pub fn instantiate_wasi_with_context(
|
|
wasi_ctx: WasiCtx,
|
|
) -> Result<InstanceHandle, InstantiationError> {
|
|
let pointer_type = types::Type::triple_pointer_type(&HOST);
|
|
let mut module = Module::new();
|
|
let mut finished_functions = PrimaryMap::new();
|
|
let call_conv = isa::CallConv::triple_default(&HOST);
|
|
|
|
// This function is defined in the macro invocation of
|
|
// `define_add_wrappers_to_module` below. For more information about how
|
|
// this works it'd recommended to read the source in
|
|
// `crates/wasi-common/wig/src/wasi.rs`.
|
|
add_wrappers_to_module(
|
|
&mut module,
|
|
&mut finished_functions,
|
|
call_conv,
|
|
pointer_type,
|
|
);
|
|
|
|
let imports = Imports::none();
|
|
let data_initializers = Vec::new();
|
|
let signatures = PrimaryMap::new();
|
|
|
|
InstanceHandle::new(
|
|
Rc::new(module),
|
|
finished_functions.into_boxed_slice(),
|
|
imports,
|
|
&data_initializers,
|
|
signatures.into_boxed_slice(),
|
|
None,
|
|
Box::new(wasi_ctx),
|
|
)
|
|
}
|
|
|
|
// Used by `add_wrappers_to_module` defined in the macro above
|
|
fn get_wasi_ctx(vmctx: &mut VMContext) -> Result<&mut WasiCtx, wasi::__wasi_errno_t> {
|
|
unsafe {
|
|
vmctx
|
|
.host_state()
|
|
.downcast_mut::<WasiCtx>()
|
|
.ok_or_else(|| panic!("no host state named WasiCtx available"))
|
|
}
|
|
}
|
|
|
|
// Used by `add_wrappers_to_module` defined in the macro above
|
|
fn get_memory(caller_vmctx: &mut VMContext) -> Result<&mut [u8], wasi::__wasi_errno_t> {
|
|
match unsafe { InstanceHandle::from_vmctx(caller_vmctx) }.lookup("memory") {
|
|
Some(wasmtime_runtime::Export::Memory {
|
|
definition,
|
|
vmctx: _,
|
|
memory: _,
|
|
}) => unsafe {
|
|
let definition = &*definition;
|
|
let ptr = definition.base;
|
|
let len = definition.current_length;
|
|
Ok(std::slice::from_raw_parts_mut(ptr, len))
|
|
},
|
|
Some(export) => {
|
|
log::error!("export named \"memory\" isn't a memory: {:?}", export);
|
|
Err(wasi::__WASI_ERRNO_INVAL)
|
|
}
|
|
None => {
|
|
log::error!("no export named \"memory\" available from caller");
|
|
Err(wasi::__WASI_ERRNO_INVAL)
|
|
}
|
|
}
|
|
}
|
|
|
|
wig::define_add_wrappers_to_module!(
|
|
"old/snapshot_0" "wasi_unstable"
|
|
);
|