mii/wasmer
1
0
Fork 0
mirror of https://github.com/mii443/wasmer.git synced 2025-12-07 05:08:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into singlepass-dynamicfunc

Browse Source
This commit is contained in:
Syrus
2020-05-27 17:43:06 -07:00
parent dafcd9069a 17bca3cf8e
commit bf50ced1a3
18 changed files with 247 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

177
Cargo.lock generated
View File

@@ -444,6 +444,21 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d9d8664cf849d7d0f3114a3a387d2f5e4303176d746d5a951aaddc66dfe9240"
[[package]]
name = "dlib"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "77e51249a9d823a4cb79e3eca6dcd756153e8ed0157b6c04775d04bf1b13b76a"
dependencies = [
"libloading 0.5.2",
]
[[package]]
name = "downcast-rs"
version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "52ba6eb47c2131e784a38b726eb54c1e1484904f013e576a25354d0124161af6"
[[package]]
name = "dynasm"
version = "0.5.2"
@@ -890,16 +905,23 @@ dependencies = [
[[package]]
name = "minifb"
version = "0.13.0"
version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "55cbdf43445926b65e07992f06019321e7481df8fd656dcb6871d00cdbd9fc73"
checksum = "b18d2987dac6afdd7f6d81101a3b422b7da3e6799d7f11863ad006d8ccd562b2"
dependencies = [
"cast",
"cc",
"orbclient",
"raw-window-handle",
"tempfile",
"time",
"wayland-client",
"wayland-cursor",
"wayland-protocols",
"winapi",
"x11-dl",
"xkb",
"xkbcommon-sys",
]
[[package]]
@@ -908,6 +930,19 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0debeb9fcf88823ea64d64e4a815ab1643f33127d995978e099942ce38f25238"
[[package]]
name = "nix"
version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "50e4785f2c3b7589a0d0c1dd60285e1188adac4006e8abd6dd578e1567027363"
dependencies = [
"bitflags",
"cc",
"cfg-if",
"libc",
"void",
]
[[package]]
name = "nom"
version = "4.2.3"
@@ -1250,6 +1285,15 @@ dependencies = [
"rustc_version",
]
[[package]]
name = "raw-window-handle"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0a441a7a6c80ad6473bd4b74ec1c9a4c951794285bf941c2126f607c72e48211"
dependencies = [
"libc",
]
[[package]]
name = "rayon"
version = "1.3.0"
@@ -1361,6 +1405,12 @@ version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed3d612bc64430efeb3f7ee6ef26d590dce0c43249217bddc62112540c7941e1"
[[package]]
name = "scoped-tls"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
[[package]]
name = "scopeguard"
version = "1.1.0"
@@ -1759,6 +1809,12 @@ version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce"
[[package]]
name = "void"
version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
[[package]]
name = "wasi"
version = "0.9.0+wasi-snapshot-preview1"
@@ -2049,7 +2105,7 @@ dependencies = [
"anyhow",
"thiserror",
"wasmer",
"wast 14.0.0",
"wast 17.0.0",
]
[[package]]
@@ -2058,15 +2114,6 @@ version = "0.51.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aeb1956b19469d1c5e63e459d29e7b5aa0f558d9f16fcef09736f8a265e6c10a"
[[package]]
name = "wast"
version = "14.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "47b11c94c63d5365a76ea287f8e6e5b6050233fae4b2423aea2a1e126a385e17"
dependencies = [
"leb128",
]
[[package]]
name = "wast"
version = "16.0.0"
@@ -2076,6 +2123,15 @@ dependencies = [
"leb128",
]
[[package]]
name = "wast"
version = "17.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a0e1c36b928fca33dbaf96235188f5fad22ee87100e26cc606bd0fbabdf1932"
dependencies = [
"leb128",
]
[[package]]
name = "wat"
version = "1.0.17"
@@ -2085,6 +2141,76 @@ dependencies = [
"wast 16.0.0",
]
[[package]]
name = "wayland-client"
version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a42cb608953ec8e132c7f53fde722cca9bfbf8b2071d685dbbb8df2b567fee8b"
dependencies = [
"bitflags",
"downcast-rs",
"libc",
"nix",
"scoped-tls",
"wayland-commons",
"wayland-scanner",
"wayland-sys",
]
[[package]]
name = "wayland-commons"
version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8caa2f106138cf71358c6a9e84468e4406069cec93cbd6dbfce92225fc175932"
dependencies = [
"nix",
"once_cell",
"smallvec",
"wayland-sys",
]
[[package]]
name = "wayland-cursor"
version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d774f69a6a4a9eac6d1a29cea45a4750ee7f997520421b2068f099a11b4cbba"
dependencies = [
"wayland-client",
"wayland-sys",
]
[[package]]
name = "wayland-protocols"
version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f784a990d5fa6d846fa93eb8d3bb744ff1e6ec60c7f785b0a0ee2f1a1f20bee9"
dependencies = [
"bitflags",
"wayland-client",
"wayland-commons",
"wayland-scanner",
]
[[package]]
name = "wayland-scanner"
version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f45ddc08a8078f3efa96b5f413268cc9c53b30712891de081fbc1d5846fbc736"
dependencies = [
"proc-macro2",
"quote",
"xml-rs",
]
[[package]]
name = "wayland-sys"
version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "80f9fc64f9045ad5ff491886a9460437655353e8be73c1b3f29f569342553319"
dependencies = [
"dlib",
]
[[package]]
name = "which"
version = "3.1.1"
@@ -2136,3 +2262,30 @@ dependencies = [
"maybe-uninit",
"pkg-config",
]
[[package]]
name = "xkb"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aec02bc5de902aa579f3d2f2c522edaf40fa42963cbaffe645b058ddcc68fdb2"
dependencies = [
"bitflags",
"libc",
"xkbcommon-sys",
]
[[package]]
name = "xkbcommon-sys"
version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa434980dca02ebf28795d71e570dbb78316d095a228707efd6117bf8246d78b"
dependencies = [
"libc",
"pkg-config",
]
[[package]]
name = "xml-rs"
version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b07db065a5cf61a7e4ba64f29e67db906fb1787316516c4e6e5ff0fea1efcd8a"

14
Cargo.toml
View File

@@ -34,13 +34,13 @@ wasmer-wast = { version = "0.16.2", path = "tests/lib/wast", optional = true }
wasmer-cache = { version = "0.16.2", path = "lib/cache", optional = true }
atty = "0.2"
colored = "1.9"
anyhow = "1.0.28"
anyhow = "1.0"
structopt = { version = "0.3", features = ["suggestions"] }
# For the function names autosuggestion
distance = "0.4"
# For the inspect subcommand
bytesize = "1.0.0"
cfg-if = "0.1.10"
bytesize = "1.0"
cfg-if = "0.1"
[workspace]
members = [
@@ -49,20 +49,20 @@ members = [
[build-dependencies]
test-generator = { path = "tests/lib/test-generator" }
anyhow = "1.0.28"
anyhow = "1.0"
glob = "0.3"
rustc_version = "0.2"
[dev-dependencies]
anyhow = "1.0.28"
blake3 = "0.3.3"
anyhow = "1.0"
blake3 = "0.3"
test-utils = { path = "tests/lib/test-utils" }
wasmer-engine-dummy = { path = "tests/lib/engine-dummy" }
[features]
# Don't add the compiler features in default, please add them on the Makefile
# since we might want to autoconfigure them depending on the availability on the host.
default = ["wat", "wast", "wasi", "cranelift", "cache", "jit", "native"]
default = ["wat", "wast", "wasi", "singlepass", "cache", "jit", "native"]
engine = []
jit = [
"wasmer-engine-jit",

20
lib/api/Cargo.toml
View File

@@ -18,23 +18,23 @@ wasmer-engine = { path = "../engine", version = "0.16.2" }
wasmer-engine-jit = { path = "../engine-jit", version = "0.16.2", optional = true }
wasmer-engine-native = { path = "../engine-native", version = "0.16.2", optional = true }
wasm-common = { path = "../wasm-common", version = "0.16.2" }
indexmap = { version = "1.3.2", features = ["serde-1"] }
cfg-if = "0.1.10"
wat = { version = "1.0.15", optional = true }
thiserror = "1.0.16"
more-asserts = "0.2.1"
target-lexicon = { version = "0.10.0", default-features = false }
indexmap = { version = "1.3", features = ["serde-1"] }
cfg-if = "0.1"
wat = { version = "1.0", optional = true }
thiserror = "1.0"
more-asserts = "0.2"
target-lexicon = { version = "0.10", default-features = false }
[target.'cfg(target_os = "windows")'.dependencies]
winapi = "0.3.8"
winapi = "0.3"
[dev-dependencies]
# for the binary wasmer.rs
wasmer-engine-dummy = { path = "../../tests/lib/engine-dummy", version = "0.16.2" }
libc = { version = "0.2.70", default-features = false }
wat = "1.0.15"
libc = { version = "0.2", default-features = false }
wat = "1.0"
tempfile = "3.1"
anyhow = "1.0.28"
anyhow = "1.0"
[badges]
maintenance = { status = "actively-developed" }

2
lib/c-api/Cargo.toml
View File

@@ -16,7 +16,7 @@ crate-type = ["cdylib", "staticlib"]
[dependencies]
lazy_static = "1"
libc = { version = "0.2.70", default-features = false }
libc = { version = "0.2", default-features = false }
libffi = { version = "0.9" }
# for generating code in the same way thot the wasm-c-api does
# Commented out for now until we can find a solution to the exported function problem

2
lib/cache/Cargo.toml vendored
View File

@@ -15,7 +15,7 @@ wasmer = { path = "../api", version = "0.16.2", default-features = false }
memmap = "0.7"
hex = "0.4"
thiserror = "1"
blake3 = { version = "0.3.3", optional = true }
blake3 = { version = "0.3", optional = true }
[features]
default = ["blake3"]

20
lib/compiler-cranelift/Cargo.toml
View File

@@ -12,21 +12,21 @@ readme = "README.md"
edition = "2018"
[dependencies]
hashbrown = { version = "0.7.2", optional = true }
tracing = "0.1"
cranelift-codegen = { version = "0.62.0", default-features = false }
cranelift-frontend = { version = "0.62.0", default-features = false }
wasmer-compiler = { path = "../compiler", version = "0.16.2", features = ["translator"], default-features = false }
wasmer-runtime = { path = "../runtime", version = "0.16.2" }
wasm-common = { path = "../wasm-common", version = "0.16.2", default-features = false }
rayon = "1.3.0"
serde = { version = "1.0.106", features = ["derive"] }
more-asserts = "0.2.1"
cranelift-codegen = { version = "0.62", default-features = false }
cranelift-frontend = { version = "0.62", default-features = false }
tracing = "0.1"
hashbrown = { version = "0.7", optional = true }
rayon = "1.3"
serde = { version = "1.0", features = ["derive"] }
more-asserts = "0.2"
[dev-dependencies]
target-lexicon = { version = "0.10.0", default-features = false }
cranelift-codegen = { version = "0.62.0", features = ["enable-serde", "all-arch"] }
lazy_static = "1.4.0"
target-lexicon = { version = "0.10", default-features = false }
cranelift-codegen = { version = "0.62", features = ["enable-serde", "all-arch"] }
lazy_static = "1.4"
[badges]
maintenance = { status = "actively-developed" }

8
lib/compiler-llvm/Cargo.toml
View File

@@ -13,13 +13,13 @@ readme = "README.md"
wasmer-compiler = { path = "../compiler", version = "0.16.2", features = ["translator"] }
wasmer-runtime = { path = "../runtime", version = "0.16.2" }
wasm-common = { path = "../wasm-common", version = "0.16.2" }
target-lexicon = { version = "0.10.0", default-features = false }
target-lexicon = { version = "0.10", default-features = false }
smallvec = "1"
goblin = "0.2"
libc = { version = "0.2.70", default-features = false }
libc = { version = "0.2", default-features = false }
byteorder = "1"
itertools = "0.9.0"
rayon = "1.3.0"
itertools = "0.9"
rayon = "1.3"
[target.'cfg(target_arch = "x86_64")'.dependencies.inkwell]
#version = "0.1.0-llvm8sample"

8
lib/compiler-singlepass/Cargo.toml
View File

@@ -12,13 +12,13 @@ readme = "README.md"
edition = "2018"
[dependencies]
hashbrown = { version = "0.7.2", optional = true }
wasmer-compiler = { path = "../compiler", version = "0.16.2", features = ["translator"], default-features = false }
wasmer-runtime = { path = "../runtime", version = "0.16.2" }
wasm-common = { path = "../wasm-common", version = "0.16.2", default-features = false }
rayon = "1.3.0"
serde = { version = "1.0.106", features = ["derive"] }
more-asserts = "0.2.1"
rayon = "1.3"
hashbrown = { version = "0.7", optional = true }
serde = { version = "1.0", features = ["derive"] }
more-asserts = "0.2"
dynasm = "0.5"
dynasmrt = "0.5"
lazy_static = "1.4"

16
lib/compiler/Cargo.toml
View File

@@ -11,18 +11,18 @@ keywords = ["webassembly", "wasm", "compiler"]
edition = "2018"
[dependencies]
enumset = "1.0.0"
target-lexicon = { version = "0.10.0", default-features = false }
wasmparser = { version = "0.51.4", optional = true, default-features = false }
wasmer-runtime = { path = "../runtime", version = "0.16.2" }
wasm-common = { path = "../wasm-common", version = "0.16.2" }
hashbrown = { version = "0.7.2", optional = true }
serde = { version = "1.0.106", features = ["derive"], optional = true }
thiserror = "1.0.16"
serde_bytes = { version = "0.11.3", optional = true }
wasmparser = { version = "0.51", optional = true, default-features = false }
target-lexicon = { version = "0.10", default-features = false }
enumset = "1.0"
hashbrown = { version = "0.7", optional = true }
serde = { version = "1.0", features = ["derive"], optional = true }
thiserror = "1.0"
serde_bytes = { version = "0.11", optional = true }
[target.'cfg(any(target_arch = "x86", target_arch = "x86_64"))'.dependencies]
raw-cpuid = "7.0.3"
raw-cpuid = "7.0"
[features]
default = ["std", "enable-serde"]

10
lib/engine-jit/Cargo.toml
View File

@@ -16,13 +16,13 @@ wasmer-compiler = { path = "../compiler", version = "0.16.2", default-features =
wasmer-runtime = { path = "../runtime", version = "0.16.2" }
wasmer-engine = { path = "../engine", version = "0.16.2" }
# flexbuffers = { path = "../../../flatbuffers/rust/flexbuffers", version = "0.1.0" }
region = "2.1.2"
serde = { version = "1.0.106", features = ["derive", "rc"] }
serde_bytes = { version = "0.11.3" }
bincode = "1.2.1"
region = "2.1"
serde = { version = "1.0", features = ["derive", "rc"] }
serde_bytes = { version = "0.11" }
bincode = "1.2"
[target.'cfg(target_os = "windows")'.dependencies]
winapi = { version = "0.3.8", features = ["winnt", "impl-default"] }
winapi = { version = "0.3", features = ["winnt", "impl-default"] }
[features]
# Enable the `compiler` feature if you want the engine to compile

16
lib/engine-native/Cargo.toml
View File

@@ -15,14 +15,14 @@ wasm-common = { path = "../wasm-common", version = "0.16.2" }
wasmer-compiler = { path = "../compiler", version = "0.16.2", default-features = false }
wasmer-runtime = { path = "../runtime", version = "0.16.2" }
wasmer-engine = { path = "../engine", version = "0.16.2" }
faerie = "0.15.0"
serde = { version = "1.0.106", features = ["derive", "rc"] }
serde_bytes = { version = "0.11.3" }
cfg-if = "0.1.10"
bincode = "1.2.1"
leb128 = "0.2.4"
libloading = "0.6.2"
tempfile = "3.1.0"
faerie = "0.15"
serde = { version = "1.0", features = ["derive", "rc"] }
serde_bytes = { version = "0.11" }
cfg-if = "0.1"
bincode = "1.2"
leb128 = "0.2"
libloading = "0.6"
tempfile = "3.1"
[features]
# Enable the `compiler` feature if you want the engine to compile

6
lib/engine/Cargo.toml
View File

@@ -14,13 +14,13 @@ edition = "2018"
wasm-common = { path = "../wasm-common", version = "0.16.2" }
wasmer-compiler = { path = "../compiler", version = "0.16.2", default-features = false }
wasmer-runtime = { path = "../runtime", version = "0.16.2" }
target-lexicon = { version = "0.10.0", default-features = false }
target-lexicon = { version = "0.10", default-features = false }
# flexbuffers = { path = "../../../flatbuffers/rust/flexbuffers", version = "0.1.0" }
backtrace = "0.3"
rustc-demangle = "0.1"
more-asserts = "0.2"
thiserror = "1.0.16"
region = "2.1.2"
thiserror = "1.0"
region = "2.1"
serde = { version = "1.0", features = ["derive", "rc"] }
serde_bytes = { version = "0.11" }
bincode = "1.2"

20
lib/runtime/Cargo.toml
View File

@@ -12,18 +12,18 @@ edition = "2018"
[dependencies]
wasm-common = { path = "../wasm-common", version = "0.16.2", features = ["enable-serde"] }
region = "2.1.2"
libc = { version = "0.2.70", default-features = false }
memoffset = "0.5.4"
indexmap = { version = "1.3.2", features = ["serde-1"] }
thiserror = "1.0.16"
more-asserts = "0.2.1"
cfg-if = "0.1.10"
backtrace = "0.3.46"
serde = { version = "1.0.106", features = ["derive", "rc"] }
region = "2.1"
libc = { version = "0.2", default-features = false }
memoffset = "0.5"
indexmap = { version = "1.3", features = ["serde-1"] }
thiserror = "1.0"
more-asserts = "0.2"
cfg-if = "0.1"
backtrace = "0.3"
serde = { version = "1.0", features = ["derive", "rc"] }
[target.'cfg(target_os = "windows")'.dependencies]
winapi = { version = "0.3.8", features = ["winbase", "memoryapi", "errhandlingapi"] }
winapi = { version = "0.3", features = ["winbase", "memoryapi", "errhandlingapi"] }
[build-dependencies]
cc = "1.0"

4
lib/wasi-experimental-io-devices/Cargo.toml
View File

@@ -12,9 +12,9 @@ license = "MIT"
maintenance = { status = "experimental" }
[dependencies]
tracing = "0.1"
minifb = "0.13"
wasmer-wasi = { version = "0.16.2", path = "../wasi" }
tracing = "0.1"
minifb = "0.16"
ref_thread_local = "0.0"
serde = "1"
typetag = "0.1"

4
lib/wasi/Cargo.toml
View File

@@ -14,12 +14,12 @@ bincode = "1"
byteorder = "1.3"
thiserror = "1"
generational-arena = { version = "0.2", features = ["serde"] }
libc = { version = "0.2.70", default-features = false }
libc = { version = "0.2", default-features = false }
tracing = "0.1"
getrandom = "0.1"
time = "0.1"
typetag = "0.1"
serde = { version = "1", features = ["derive"] }
serde = { version = "1.0", features = ["derive"] }
wasmer = { path = "../api", version = "0.16.2", default-features = false }
[target.'cfg(windows)'.dependencies]

4
lib/wasm-common/Cargo.toml
View File

@@ -13,8 +13,8 @@ edition = "2018"
[dependencies]
# The cranelift-entity is just useful structures, not anything about the
# compiler itself, that's why we depend on it :)
cranelift-entity = "0.62.0"
serde = { version = "1.0.106", features = ["derive"], optional = true }
cranelift-entity = "0.62"
serde = { version = "1.0", features = ["derive"], optional = true }
[features]
default = ["std", "enable-serde"]

4
tests/lib/test-generator/Cargo.toml
View File

@@ -5,5 +5,5 @@ edition = "2018"
private = true
[dependencies]
anyhow = "1.0.28"
target-lexicon = "0.10.0"
anyhow = "1.0"
target-lexicon = "0.10"

6
tests/lib/wast/Cargo.toml
View File

@@ -11,10 +11,10 @@ readme = "README.md"
edition = "2018"
[dependencies]
anyhow = "1.0.28"
anyhow = "1.0"
wasmer = { path = "../../../lib/api", version = "0.16.2", default-features = false }
wast = "14.0.0"
thiserror = "1.0.15"
wast = "17.0"
thiserror = "1.0"
[features]
default = ["wat"]