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

Fix fuzz and wasi-c builds (#447)

Browse Source 
* Fix the wasmtime-wasi-c crate build and upgrade it to Rust 2018.

* Fix the fuzz build.
This commit is contained in:
Dan Gohman
2019-10-23 14:05:23 -07:00
committed by GitHub
parent 876d5e1075
commit a7fa6bdb31
7 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fuzz/fuzz_targets/compile.rs
View File

@@ -2,11 +2,8 @@
#[macro_use] #[macro_use]
extern crate libfuzzer_sys; extern crate libfuzzer_sys;
extern crate cranelift_codegen; extern crate alloc;
extern crate cranelift_native; extern crate core;
extern crate wasmparser;
extern crate wasmtime_environ;
extern crate wasmtime_jit;
use alloc::rc::Rc; use alloc::rc::Rc;
use core::cell::RefCell; use core::cell::RefCell;

2
wasmtime-jit/Cargo.toml
View File

@@ -27,7 +27,7 @@ wasmparser = { version = "0.39.2", default-features = false }
[features] [features]
default = ["std"] default = ["std"]
std = ["cranelift-codegen/std", "cranelift-wasm/std", "wasmtime-environ/std", "wasmtime-debug/std", "wasmparser/std"] std = ["cranelift-codegen/std", "cranelift-wasm/std", "wasmtime-environ/std", "wasmtime-debug/std", "wasmtime-runtime/std", "wasmparser/std"]
core = ["hashbrown/nightly", "cranelift-codegen/core", "cranelift-wasm/core", "wasmtime-environ/core", "wasmtime-debug/core", "wasmparser/core"] core = ["hashbrown/nightly", "cranelift-codegen/core", "cranelift-wasm/core", "wasmtime-environ/core", "wasmtime-debug/core", "wasmparser/core"]
lightbeam = ["wasmtime-environ/lightbeam"] lightbeam = ["wasmtime-environ/lightbeam"]

1
wasmtime-wasi-c/Cargo.toml
View File

@@ -7,6 +7,7 @@ categories = ["wasm"]
repository = "https://github.com/CraneStation/wasmtime" repository = "https://github.com/CraneStation/wasmtime"
license = "Apache-2.0 WITH LLVM-exception" license = "Apache-2.0 WITH LLVM-exception"
readme = "README.md" readme = "README.md"
edition = "2018"
[dependencies] [dependencies]
wasmtime-runtime = { path = "../wasmtime-runtime" } wasmtime-runtime = { path = "../wasmtime-runtime" }

2
wasmtime-wasi-c/src/instantiate.rs
View File

@@ -2,6 +2,7 @@ use crate::host::{
argv_environ_init, argv_environ_values, fd_prestats, fd_prestats_init, fd_prestats_insert, argv_environ_init, argv_environ_values, fd_prestats, fd_prestats_init, fd_prestats_insert,
fd_table, fd_table_init, fd_table_insert_existing, fd_table, fd_table_init, fd_table_insert_existing,
}; };
use crate::syscalls;
use alloc::rc::Rc; use alloc::rc::Rc;
use core::cell::RefCell; use core::cell::RefCell;
use cranelift_codegen::ir::types; use cranelift_codegen::ir::types;
@@ -13,7 +14,6 @@ use std::ffi::CString;
use std::fs::File; use std::fs::File;
use std::mem; use std::mem;
use std::os::unix::io::AsRawFd; use std::os::unix::io::AsRawFd;
use syscalls;
use target_lexicon::HOST; use target_lexicon::HOST;
use wasmtime_environ::{translate_signature, Export, Module}; use wasmtime_environ::{translate_signature, Export, Module};
use wasmtime_runtime::{Imports, InstanceHandle, InstantiationError, VMFunctionBody}; use wasmtime_runtime::{Imports, InstanceHandle, InstantiationError, VMFunctionBody};

9
wasmtime-wasi-c/src/lib.rs
View File

@@ -1,12 +1,7 @@
extern crate cranelift_codegen;
extern crate cranelift_entity;
extern crate cranelift_wasm;
extern crate target_lexicon;
extern crate wasmtime_environ;
extern crate wasmtime_jit;
extern crate wasmtime_runtime;
#[macro_use] #[macro_use]
extern crate log; extern crate log;
extern crate alloc;
extern crate core;
mod host; mod host;
mod instantiate; mod instantiate;

6
wasmtime-wasi-c/src/syscalls.rs
View File

@@ -1,11 +1,11 @@
use crate::host;
use crate::host::{argv_environ_values, fd_prestats, fd_table}; use crate::host::{argv_environ_values, fd_prestats, fd_table};
use crate::instantiate::WASIState; use crate::instantiate::WASIState;
use crate::translate::*;
use crate::wasm32;
use core::convert::TryFrom; use core::convert::TryFrom;
use cranelift_codegen::ir::types::{Type, I32, I64}; use cranelift_codegen::ir::types::{Type, I32, I64};
use host;
use std::{mem, ptr, slice, str}; use std::{mem, ptr, slice, str};
use translate::*;
use wasm32;
use wasmtime_runtime::VMContext; use wasmtime_runtime::VMContext;
fn str_for_trace<'str>(ptr: *const i8, len: usize) -> Result<&'str str, str::Utf8Error> { fn str_for_trace<'str>(ptr: *const i8, len: usize) -> Result<&'str str, str::Utf8Error> {

4
wasmtime-wasi-c/src/translate.rs
View File

@@ -1,8 +1,8 @@
use crate::host;
use crate::wasm32;
use core::convert::TryFrom; use core::convert::TryFrom;
use host;
use std::mem::{align_of, size_of, zeroed}; use std::mem::{align_of, size_of, zeroed};
use std::slice; use std::slice;
use wasm32;
use wasmtime_runtime::{Export, VMContext}; use wasmtime_runtime::{Export, VMContext};
/// Translate a wasm pointer into a native pointer. /// Translate a wasm pointer into a native pointer.