fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2025-06-21 12:41:32 +00:00
Code Issues Projects Releases Wiki Activity

Update loader-kernel feature name, fix compilation track state, cargo fmt

Browse Source
This commit is contained in:
Brandon Fish
2019-07-12 23:02:57 -05:00
parent 09db8d6cdc
commit ed19fd2913
5 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -67,7 +67,7 @@ rustc_version = "0.2.3"
[features] [features]
default = ["fast-tests", "wasi"] default = ["fast-tests", "wasi"]
"loader:kernel" = ["wasmer-kernel-loader"] "loader-kernel" = ["wasmer-kernel-loader"]
debug = ["wasmer-runtime-core/debug"] debug = ["wasmer-runtime-core/debug"]
trace = ["wasmer-runtime-core/trace"] trace = ["wasmer-runtime-core/trace"]
extra-debug = ["wasmer-clif-backend/debug", "wasmer-runtime-core/debug"] extra-debug = ["wasmer-clif-backend/debug", "wasmer-runtime-core/debug"]

4
Makefile
View File

@ -118,10 +118,10 @@ install:
cargo install --path . cargo install --path .
check: check:
cargo check --release --features backend-singlepass,backend-llvm,loader:kernel cargo check --release --features backend-singlepass,backend-llvm,loader-kernel
release: release:
cargo build --release --features backend-singlepass,backend-llvm,loader:kernel cargo build --release --features backend-singlepass,backend-llvm,loader-kernel
# Only one backend (cranelift) # Only one backend (cranelift)
release-fast: release-fast:

11
lib/singlepass-backend/src/codegen_x64.rs
View File

@ -1775,7 +1775,7 @@ impl FunctionCodeGenerator<CodegenError> for X64FunctionCode {
.unwrap() .unwrap()
.insert(a.get_offset(), callback); .insert(a.get_offset(), callback);
} }
InternalEvent::FunctionBegin(_) | InternalEvent::FunctionEnd => {}, InternalEvent::FunctionBegin(_) | InternalEvent::FunctionEnd => {}
InternalEvent::GetInternal(idx) => { InternalEvent::GetInternal(idx) => {
let idx = idx as usize; let idx = idx as usize;
assert!(idx < INTERNALS_SIZE); assert!(idx < INTERNALS_SIZE);
@ -1826,7 +1826,11 @@ impl FunctionCodeGenerator<CodegenError> for X64FunctionCode {
), ),
Location::GPR(tmp), Location::GPR(tmp),
); );
let loc = get_location_released(a, &mut self.machine, self.value_stack.pop().unwrap()); let loc = get_location_released(
a,
&mut self.machine,
self.value_stack.pop().unwrap(),
);
// Move internal into storage. // Move internal into storage.
Self::emit_relaxed_binop( Self::emit_relaxed_binop(
@ -1838,8 +1842,7 @@ impl FunctionCodeGenerator<CodegenError> for X64FunctionCode {
Location::Memory(tmp, (idx * 8) as i32), Location::Memory(tmp, (idx * 8) as i32),
); );
self.machine.release_temp_gpr(tmp); self.machine.release_temp_gpr(tmp);
} } //_ => unimplemented!(),
//_ => unimplemented!(),
} }
return Ok(()); return Ok(());
} }

19
src/bin/kwasmd.rs
View File

@ -5,10 +5,10 @@ extern crate structopt;
use structopt::StructOpt; use structopt::StructOpt;
#[cfg(feature = "loader:kernel")] #[cfg(feature = "loader-kernel")]
use wasmer_singlepass_backend::SinglePassCompiler; use wasmer_singlepass_backend::SinglePassCompiler;
#[cfg(feature = "loader:kernel")] #[cfg(feature = "loader-kernel")]
use std::os::unix::net::{UnixListener, UnixStream}; use std::os::unix::net::{UnixListener, UnixStream};
#[derive(Debug, StructOpt)] #[derive(Debug, StructOpt)]
@ -24,14 +24,14 @@ struct Listen {
socket: String, socket: String,
} }
#[cfg(feature = "loader:kernel")] #[cfg(feature = "loader-kernel")]
const CMD_RUN_CODE: u32 = 0x901; const CMD_RUN_CODE: u32 = 0x901;
#[cfg(feature = "loader:kernel")] #[cfg(feature = "loader-kernel")]
const CMD_READ_MEMORY: u32 = 0x902; const CMD_READ_MEMORY: u32 = 0x902;
#[cfg(feature = "loader:kernel")] #[cfg(feature = "loader-kernel")]
const CMD_WRITE_MEMORY: u32 = 0x903; const CMD_WRITE_MEMORY: u32 = 0x903;
#[cfg(feature = "loader:kernel")] #[cfg(feature = "loader-kernel")]
fn handle_client(mut stream: UnixStream) { fn handle_client(mut stream: UnixStream) {
use byteorder::{LittleEndian, ReadBytesExt, WriteBytesExt}; use byteorder::{LittleEndian, ReadBytesExt, WriteBytesExt};
use std::io::{Read, Write}; use std::io::{Read, Write};
@ -54,6 +54,7 @@ fn handle_client(mut stream: UnixStream) {
symbol_map: None, symbol_map: None,
memory_bound_check_mode: MemoryBoundCheckMode::Disable, memory_bound_check_mode: MemoryBoundCheckMode::Disable,
enforce_stack_check: true, enforce_stack_check: true,
track_state: false,
}, },
&SinglePassCompiler::new(), &SinglePassCompiler::new(),
) )
@ -131,7 +132,7 @@ fn handle_client(mut stream: UnixStream) {
} }
} }
#[cfg(feature = "loader:kernel")] #[cfg(feature = "loader-kernel")]
fn run_listen(opts: Listen) { fn run_listen(opts: Listen) {
let listener = UnixListener::bind(&opts.socket).unwrap(); let listener = UnixListener::bind(&opts.socket).unwrap();
use std::thread; use std::thread;
@ -154,7 +155,7 @@ fn run_listen(opts: Listen) {
} }
} }
#[cfg(feature = "loader:kernel")] #[cfg(feature = "loader-kernel")]
fn main() { fn main() {
let options = CLIOptions::from_args(); let options = CLIOptions::from_args();
match options { match options {
@ -164,7 +165,7 @@ fn main() {
} }
} }
#[cfg(not(feature = "loader:kernel"))] #[cfg(not(feature = "loader-kernel"))]
fn main() { fn main() {
panic!("Kwasm loader is not enabled during compilation."); panic!("Kwasm loader is not enabled during compilation.");
} }

12
src/bin/wasmer.rs
View File

@ -143,7 +143,7 @@ struct Run {
#[derive(Debug, Copy, Clone)] #[derive(Debug, Copy, Clone)]
enum LoaderName { enum LoaderName {
Local, Local,
#[cfg(feature = "loader:kernel")] #[cfg(feature = "loader-kernel")]
Kernel, Kernel,
} }
@ -151,7 +151,7 @@ impl LoaderName {
pub fn variants() -> &'static [&'static str] { pub fn variants() -> &'static [&'static str] {
&[ &[
"local", "local",
#[cfg(feature = "loader:kernel")] #[cfg(feature = "loader-kernel")]
"kernel", "kernel",
] ]
} }
@ -162,7 +162,7 @@ impl FromStr for LoaderName {
fn from_str(s: &str) -> Result<LoaderName, String> { fn from_str(s: &str) -> Result<LoaderName, String> {
match s.to_lowercase().as_str() { match s.to_lowercase().as_str() {
"local" => Ok(LoaderName::Local), "local" => Ok(LoaderName::Local),
#[cfg(feature = "loader:kernel")] #[cfg(feature = "loader-kernel")]
"kernel" => Ok(LoaderName::Kernel), "kernel" => Ok(LoaderName::Kernel),
_ => Err(format!("The loader {} doesn't exist", s)), _ => Err(format!("The loader {} doesn't exist", s)),
} }
@ -334,14 +334,14 @@ fn execute_wasm(options: &Run) -> Result<(), String> {
let track_state = !options.no_track_state; let track_state = !options.no_track_state;
#[cfg(feature = "loader:kernel")] #[cfg(feature = "loader-kernel")]
let is_kernel_loader = if let Some(LoaderName::Kernel) = options.loader { let is_kernel_loader = if let Some(LoaderName::Kernel) = options.loader {
true true
} else { } else {
false false
}; };
#[cfg(not(feature = "loader:kernel"))] #[cfg(not(feature = "loader-kernel"))]
let is_kernel_loader = false; let is_kernel_loader = false;
let module = if is_kernel_loader { let module = if is_kernel_loader {
@ -451,7 +451,7 @@ fn execute_wasm(options: &Run) -> Result<(), String> {
.load(LocalLoader) .load(LocalLoader)
.expect("Can't use the local loader"), .expect("Can't use the local loader"),
), ),
#[cfg(feature = "loader:kernel")] #[cfg(feature = "loader-kernel")]
LoaderName::Kernel => Box::new( LoaderName::Kernel => Box::new(
instance instance
.load(::wasmer_kernel_loader::KernelLoader) .load(::wasmer_kernel_loader::KernelLoader)