fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2024-12-13 14:25:32 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'private/feature/dynasm-backend' into feature/dynasm-backend

Browse Source
This commit is contained in:
losfair 2019-03-17 03:08:06 +08:00
commit 1f8c644855
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -48,7 +48,7 @@ test-emscripten:
release: release:
# If you are in OS-X, you will need mingw-w64 for cross compiling to windows # If you are in OS-X, you will need mingw-w64 for cross compiling to windows
# brew install mingw-w64 # brew install mingw-w64
cargo build --release cargo +nightly build --release
debug-release: debug-release:
cargo build --release --features debug cargo build --release --features debug

6
lib/dynasm-backend/src/lib.rs
View File

@ -38,7 +38,8 @@ impl CacheGen for Placeholder {
&self, &self,
module: &ModuleInner, module: &ModuleInner,
) -> Result<(Box<ModuleInfo>, Box<[u8]>, Memory), CacheError> { ) -> Result<(Box<ModuleInfo>, Box<[u8]>, Memory), CacheError> {
unimplemented!() // unimplemented!()
Err(CacheError::Unknown("the dynasm backend doesn't support caching yet".to_string()))
} }
} }
@ -73,7 +74,8 @@ impl Compiler for SinglePassCompiler {
} }
unsafe fn from_cache(&self, _artifact: Artifact, _: Token) -> Result<ModuleInner, CacheError> { unsafe fn from_cache(&self, _artifact: Artifact, _: Token) -> Result<ModuleInner, CacheError> {
unimplemented!("the dynasm backend doesn't support caching yet") Err(CacheError::Unknown("the dynasm backend doesn't support caching yet".to_string()))
// unimplemented!("the dynasm backend doesn't support caching yet")
} }
} }

5
src/bin/wasmer.rs
View File

@ -128,8 +128,9 @@ fn execute_wasm(options: &Run) -> Result<(), String> {
let module = webassembly::compile(&wasm_binary[..]) let module = webassembly::compile(&wasm_binary[..])
.map_err(|e| format!("Can't compile module: {:?}", e))?; .map_err(|e| format!("Can't compile module: {:?}", e))?;
// We save the module into a cache file // We try to save the module into a cache file
cache.store(hash, module.clone()).unwrap(); cache.store(hash, module.clone()).unwrap_or_default();
module module
} }
}; };