Library restructure (#104)

* Move wasmer-runtime to wasmer-runtime-core

* Add the runtime library

* Fix issue with macros using wasmer_runtime, fmt

* Make default compiler dependency optional

* Add instantiate and validate functions

lib/emscripten/src/env.rs

@@ -8,7 +8,7 @@ use std::mem;
 use std::os::raw::c_char;
 
 use super::utils::{allocate_on_stack, copy_cstr_into_wasm, copy_terminated_array_of_cstrs};
-use wasmer_runtime::{types::Value, Instance};
+use wasmer_runtime_core::{types::Value, Instance};
 //use super::EmscriptenData;
 
 //impl Instance {

lib/emscripten/src/exception.rs

@@ -1,6 +1,6 @@
 use super::env;
 use super::process::_abort;
-use wasmer_runtime::Instance;
+use wasmer_runtime_core::Instance;
 
 /// emscripten: ___cxa_allocate_exception
 pub extern "C" fn ___cxa_allocate_exception(size: u32, instance: &mut Instance) -> u32 {

lib/emscripten/src/io.rs

@@ -1,6 +1,6 @@
 use libc::printf as _printf;
 
-use wasmer_runtime::Instance;
+use wasmer_runtime_core::Instance;
 
 /// putchar
 pub use libc::putchar;

lib/emscripten/src/jmp.rs

@@ -1,5 +1,5 @@
 use libc::{c_int, c_void};
-use wasmer_runtime::Instance;
+use wasmer_runtime_core::Instance;
 
 /// setjmp
 pub extern "C" fn __setjmp(env_addr: u32, instance: &mut Instance) -> c_int {

lib/emscripten/src/lib.rs

@@ -1,10 +1,10 @@
 #[macro_use]
-extern crate wasmer_runtime;
+extern crate wasmer_runtime_core;
 
 use byteorder::{ByteOrder, LittleEndian};
 use hashbrown::HashMap;
 use std::mem;
-use wasmer_runtime::{
+use wasmer_runtime_core::{
     export::{Context, Export, FuncPointer, GlobalPointer},
     import::{ImportObject, Namespace},
     memory::LinearMemory,

lib/emscripten/src/linking.rs

@@ -1,4 +1,4 @@
-use wasmer_runtime::Instance;
+use wasmer_runtime_core::Instance;
 
 // TODO: Need to implement.
 

lib/emscripten/src/lock.rs

@@ -1,5 +1,5 @@
 use libc::c_int;
-use wasmer_runtime::Instance;
+use wasmer_runtime_core::Instance;
 
 // NOTE: Not implemented by Emscripten
 pub extern "C" fn ___lock(which: c_int, varargs: c_int, _instance: &mut Instance) {

lib/emscripten/src/memory.rs

@@ -1,6 +1,6 @@
 use super::process::abort_with_message;
 use libc::{c_int, c_void, memcpy, size_t};
-use wasmer_runtime::Instance;
+use wasmer_runtime_core::Instance;
 
 /// emscripten: _emscripten_memcpy_big
 pub extern "C" fn _emscripten_memcpy_big(

lib/emscripten/src/nullfunc.rs

@@ -1,5 +1,5 @@
 use super::process::abort_with_message;
-use wasmer_runtime::Instance;
+use wasmer_runtime_core::Instance;
 
 pub extern "C" fn nullfunc_ii(x: u32, _instance: &Instance) {
     debug!("emscripten::nullfunc_ii {}", x);

lib/emscripten/src/process.rs

@@ -1,7 +1,7 @@
 use libc::{abort, c_char, c_int, exit, pid_t, EAGAIN};
 
 use std::ffi::CStr;
-use wasmer_runtime::Instance;
+use wasmer_runtime_core::Instance;
 
 pub extern "C" fn abort_with_message(message: &str) {
     debug!("emscripten::abort_with_message");

lib/emscripten/src/signal.rs

@@ -1,5 +1,5 @@
 // use super::varargs::VarArgs;
-use wasmer_runtime::Instance;
+use wasmer_runtime_core::Instance;
 
 #[allow(clippy::cast_ptr_alignment)]
 pub extern "C" fn _sigemptyset(set: u32, instance: &mut Instance) -> i32 {

lib/emscripten/src/syscalls.rs

@@ -70,7 +70,7 @@ use libc::{
     SO_REUSEADDR,
     TIOCGWINSZ,
 };
-use wasmer_runtime::Instance;
+use wasmer_runtime_core::Instance;
 
 use super::env;
 use std::mem;

lib/emscripten/src/time.rs

@@ -6,7 +6,7 @@ use std::time::SystemTime;
 use time;
 
 use super::env;
-use wasmer_runtime::Instance;
+use wasmer_runtime_core::Instance;
 
 #[cfg(target_os = "linux")]
 use libc::{CLOCK_MONOTONIC, CLOCK_MONOTONIC_COARSE, CLOCK_REALTIME};

lib/emscripten/src/utils.rs

@@ -1,5 +1,5 @@
-use wasmer_runtime::{module::Module, Instance};
-//use wasmer_runtime::Instance;
+use wasmer_runtime_core::{module::Module, Instance};
+//use wasmer_runtime_core::Instance;
 use super::env;
 use libc::stat;
 use std::ffi::CStr;
@@ -144,7 +144,7 @@ mod tests {
     use std::sync::Arc;
     use wabt::wat2wasm;
     use wasmer_clif_backend::CraneliftCompiler;
-    use wasmer_runtime::{compile, module::Module};
+    use wasmer_runtime_core::{compile, module::Module};
 
     #[test]
     fn should_detect_emscripten_files() {

lib/emscripten/src/varargs.rs

@@ -1,5 +1,5 @@
 use std::mem;
-use wasmer_runtime::Instance;
+use wasmer_runtime_core::Instance;
 
 #[repr(transparent)]
 pub struct VarArgs {