Initial reorg.

This is largely the same as #305, but updated for the current tree.
2019-11-07 17:11:06 -08:00
parent 2c69546a24
commit 22641de629
351 changed files with 52 additions and 52 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,8 +2,8 @@
 	path = spec_testsuite
 	url = https://github.com/WebAssembly/testsuite
 [submodule "wasmtime-api/c-examples/wasm-c-api"]
-	path = wasmtime-api/c-examples/wasm-c-api
+	path = crates/wasmtime/c-examples/wasm-c-api
 	url = https://github.com/WebAssembly/wasm-c-api
 [submodule "wasi-common/WASI"]
-	path = wasi-common/WASI
+	path = crates/wasi-common/WASI
 	url = https://github.com/WebAssembly/WASI
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,17 +15,17 @@ cranelift-codegen = { version = "0.49", features = ["enable-serde"] }
 cranelift-entity = { version = "0.49", features = ["enable-serde"] }
 cranelift-wasm = { version = "0.49", features = ["enable-serde"] }
 cranelift-native = { version = "0.49" }
-wasmtime-api = { path = "wasmtime-api" }
-wasmtime-debug = { path = "wasmtime-debug" }
-wasmtime-environ = { path = "wasmtime-environ" }
-wasmtime-interface-types = { path = "wasmtime-interface-types" }
-wasmtime-runtime = { path = "wasmtime-runtime" }
-wasmtime-jit = { path = "wasmtime-jit" }
-wasmtime-obj = { path = "wasmtime-obj" }
-wasmtime-wast = { path = "wasmtime-wast" }
-wasmtime-wasi = { path = "wasmtime-wasi" }
-wasmtime-wasi-c = { path = "wasmtime-wasi-c", optional = true }
-wasi-common = { path = "wasi-common" }
+wasmtime-api = { path = "crates/api" }
+wasmtime-debug = { path = "crates/debug" }
+wasmtime-environ = { path = "crates/environ" }
+wasmtime-interface-types = { path = "crates/interface-types" }
+wasmtime-runtime = { path = "crates/runtime" }
+wasmtime-jit = { path = "crates/jit" }
+wasmtime-obj = { path = "crates/obj" }
+wasmtime-wast = { path = "crates/wast" }
+wasmtime-wasi = { path = "crates/wasi" }
+wasmtime-wasi-c = { path = "crates/wasi-c", optional = true }
+wasi-common = { path = "crates/wasi-common" }
 docopt = "1.0.1"
 serde = { "version" = "1.0.94", features = ["derive"] }
 faerie = "0.12.0"
@@ -43,8 +43,8 @@ anyhow = "1.0.19"

 [workspace]
 members = [
-  "misc/wasmtime-rust",
-  "misc/wasmtime-py",
+  "crates/misc/rust",
+  "crates/misc/py",
 ]

 exclude = ["wasi-common/wasi-misc-tests"]
--- a/ci/build-tarballs.sh
+++ b/ci/build-tarballs.sh
@@ -48,7 +48,7 @@ mkdir tmp/$api_pkgname/lib
 mkdir tmp/$api_pkgname/include
 cp LICENSE README.md tmp/$api_pkgname
 mv bins-$src/* tmp/$api_pkgname/lib
-cp wasmtime-api/c-examples/wasm-c-api/include/wasm.h tmp/$api_pkgname/include
+cp crates/wasmtime/c-examples/wasm-c-api/include/wasm.h tmp/$api_pkgname/include
 mktarball $api_pkgname

 # Move wheels to dist folder
--- a/wasmtime-api/Cargo.toml
+++ b/wasmtime-api/Cargo.toml
@@ -17,9 +17,9 @@ cranelift-native = { version = "0.49" }
 cranelift-entity = { version = "0.49", features = ["enable-serde"] }
 cranelift-wasm = { version = "0.49", features = ["enable-serde"] }
 cranelift-frontend = { version = "0.49" }
-wasmtime-runtime = { path="../wasmtime-runtime" }
-wasmtime-environ = { path="../wasmtime-environ" }
-wasmtime-jit = { path="../wasmtime-jit" }
+wasmtime-runtime = { path="../runtime" }
+wasmtime-environ = { path="../environ" }
+wasmtime-jit = { path="../jit" }
 wasmparser = { version = "0.39.2", default-features = false }
 target-lexicon = { version = "0.9.0", default-features = false }
 anyhow = "1.0.19"
@@ -38,7 +38,7 @@ wasi-common = { path = "../wasi-common" }
 docopt = "1.0.1"
 serde = { "version" = "1.0.94", features = ["derive"] }
 pretty_env_logger = "0.3.0"
-wasmtime-wast = { path="../wasmtime-wast" }
-wasmtime-wasi = { path="../wasmtime-wasi" }
+wasmtime-wast = { path="../wast" }
+wasmtime-wasi = { path="../wasi" }
 rayon = "1.1"
 file-per-thread-logger = "0.1.1"
--- a/crates/api/LICENSE
+++ b/crates/api/LICENSE
--- a/wasmtime-api/README.md
+++ b/wasmtime-api/README.md
--- a/wasmtime-api/c-examples/Makefile
+++ b/wasmtime-api/c-examples/Makefile
--- a/crates/api/c-examples/wasm-c-api
+++ b/crates/api/c-examples/wasm-c-api
--- a/wasmtime-api/examples/gcd.rs
+++ b/wasmtime-api/examples/gcd.rs
--- a/wasmtime-api/examples/gcd.wasm
+++ b/wasmtime-api/examples/gcd.wasm
--- a/wasmtime-api/examples/hello.rs
+++ b/wasmtime-api/examples/hello.rs
--- a/wasmtime-api/examples/hello.wasm
+++ b/wasmtime-api/examples/hello.wasm
--- a/wasmtime-api/examples/hello.wat
+++ b/wasmtime-api/examples/hello.wat
--- a/wasmtime-api/examples/memory.rs
+++ b/wasmtime-api/examples/memory.rs
--- a/wasmtime-api/examples/memory.wasm
+++ b/wasmtime-api/examples/memory.wasm
--- a/wasmtime-api/examples/memory.wat
+++ b/wasmtime-api/examples/memory.wat
--- a/wasmtime-api/examples/multi.rs
+++ b/wasmtime-api/examples/multi.rs
--- a/wasmtime-api/examples/multi.wasm
+++ b/wasmtime-api/examples/multi.wasm
--- a/wasmtime-api/examples/multi.wat
+++ b/wasmtime-api/examples/multi.wat
--- a/wasmtime-api/src/callable.rs
+++ b/wasmtime-api/src/callable.rs
--- a/wasmtime-api/src/context.rs
+++ b/wasmtime-api/src/context.rs
--- a/wasmtime-api/src/externals.rs
+++ b/wasmtime-api/src/externals.rs
--- a/wasmtime-api/src/instance.rs
+++ b/wasmtime-api/src/instance.rs
--- a/wasmtime-api/src/lib.rs
+++ b/wasmtime-api/src/lib.rs
--- a/wasmtime-api/src/module.rs
+++ b/wasmtime-api/src/module.rs
--- a/wasmtime-api/src/ref.rs
+++ b/wasmtime-api/src/ref.rs
--- a/wasmtime-api/src/runtime.rs
+++ b/wasmtime-api/src/runtime.rs
--- a/wasmtime-api/src/trampoline/create_handle.rs
+++ b/wasmtime-api/src/trampoline/create_handle.rs
--- a/wasmtime-api/src/trampoline/func.rs
+++ b/wasmtime-api/src/trampoline/func.rs
--- a/wasmtime-api/src/trampoline/global.rs
+++ b/wasmtime-api/src/trampoline/global.rs
--- a/wasmtime-api/src/trampoline/memory.rs
+++ b/wasmtime-api/src/trampoline/memory.rs
--- a/wasmtime-api/src/trampoline/mod.rs
+++ b/wasmtime-api/src/trampoline/mod.rs
--- a/wasmtime-api/src/trampoline/table.rs
+++ b/wasmtime-api/src/trampoline/table.rs
--- a/wasmtime-api/src/trap.rs
+++ b/wasmtime-api/src/trap.rs
--- a/wasmtime-api/src/types.rs
+++ b/wasmtime-api/src/types.rs
--- a/wasmtime-api/src/values.rs
+++ b/wasmtime-api/src/values.rs
--- a/wasmtime-api/src/wasm.rs
+++ b/wasmtime-api/src/wasm.rs
--- a/wasmtime-api/tests/examples.rs
+++ b/wasmtime-api/tests/examples.rs
--- a/wasmtime-api/tests/import_calling_export.rs
+++ b/wasmtime-api/tests/import_calling_export.rs
--- a/wasmtime-api/tests/import_calling_export.wasm
+++ b/wasmtime-api/tests/import_calling_export.wasm
--- a/wasmtime-api/tests/import_calling_export.wat
+++ b/wasmtime-api/tests/import_calling_export.wat
--- a/wasmtime-debug/.gitignore
+++ b/wasmtime-debug/.gitignore
--- a/wasmtime-debug/Cargo.toml
+++ b/wasmtime-debug/Cargo.toml
@@ -18,7 +18,7 @@ cranelift-codegen = { version = "0.49", features = ["enable-serde"] }
 cranelift-entity = { version = "0.49", features = ["enable-serde"] }
 cranelift-wasm = { version = "0.49", features = ["enable-serde"] }
 faerie = "0.12.0"
-wasmtime-environ = { path = "../wasmtime-environ", default-features = false }
+wasmtime-environ = { path = "../environ", default-features = false }
 target-lexicon = { version = "0.9.0", default-features = false }
 failure = { version = "0.1.3", default-features = false }
 hashbrown = { version = "0.6.0", optional = true }
--- a/misc/wasmtime-py/LICENSE
+++ b/misc/wasmtime-py/LICENSE
--- a/wasmtime-debug/README.md
+++ b/wasmtime-debug/README.md
--- a/wasmtime-debug/src/gc.rs
+++ b/wasmtime-debug/src/gc.rs
--- a/wasmtime-debug/src/lib.rs
+++ b/wasmtime-debug/src/lib.rs
--- a/wasmtime-debug/src/read_debuginfo.rs
+++ b/wasmtime-debug/src/read_debuginfo.rs
--- a/wasmtime-debug/src/transform/address_transform.rs
+++ b/wasmtime-debug/src/transform/address_transform.rs
--- a/wasmtime-debug/src/transform/attr.rs
+++ b/wasmtime-debug/src/transform/attr.rs
--- a/wasmtime-debug/src/transform/expression.rs
+++ b/wasmtime-debug/src/transform/expression.rs
--- a/wasmtime-debug/src/transform/line_program.rs
+++ b/wasmtime-debug/src/transform/line_program.rs
--- a/wasmtime-debug/src/transform/mod.rs
+++ b/wasmtime-debug/src/transform/mod.rs
--- a/wasmtime-debug/src/transform/range_info_builder.rs
+++ b/wasmtime-debug/src/transform/range_info_builder.rs
--- a/wasmtime-debug/src/transform/simulate.rs
+++ b/wasmtime-debug/src/transform/simulate.rs
--- a/wasmtime-debug/src/transform/unit.rs
+++ b/wasmtime-debug/src/transform/unit.rs
--- a/wasmtime-debug/src/transform/utils.rs
+++ b/wasmtime-debug/src/transform/utils.rs
--- a/wasmtime-debug/src/write_debuginfo.rs
+++ b/wasmtime-debug/src/write_debuginfo.rs
--- a/wasmtime-environ/.gitignore
+++ b/wasmtime-environ/.gitignore
--- a/wasmtime-environ/Cargo.toml
+++ b/wasmtime-environ/Cargo.toml
--- a/crates/environ/LICENSE
+++ b/crates/environ/LICENSE
--- a/wasmtime-environ/README.md
+++ b/wasmtime-environ/README.md
--- a/wasmtime-environ/build.rs
+++ b/wasmtime-environ/build.rs
--- a/wasmtime-environ/src/address_map.rs
+++ b/wasmtime-environ/src/address_map.rs
--- a/wasmtime-environ/src/cache.rs
+++ b/wasmtime-environ/src/cache.rs
--- a/wasmtime-environ/src/cache/config.rs
+++ b/wasmtime-environ/src/cache/config.rs
--- a/wasmtime-environ/src/cache/config/tests.rs
+++ b/wasmtime-environ/src/cache/config/tests.rs
--- a/wasmtime-environ/src/cache/tests.rs
+++ b/wasmtime-environ/src/cache/tests.rs
--- a/wasmtime-environ/src/cache/worker.rs
+++ b/wasmtime-environ/src/cache/worker.rs
--- a/wasmtime-environ/src/cache/worker/tests.rs
+++ b/wasmtime-environ/src/cache/worker/tests.rs
--- a/wasmtime-environ/src/cache/worker/tests/system_time_stub.rs
+++ b/wasmtime-environ/src/cache/worker/tests/system_time_stub.rs
--- a/wasmtime-environ/src/compilation.rs
+++ b/wasmtime-environ/src/compilation.rs
--- a/wasmtime-environ/src/cranelift.rs
+++ b/wasmtime-environ/src/cranelift.rs
--- a/wasmtime-environ/src/func_environ.rs
+++ b/wasmtime-environ/src/func_environ.rs
--- a/wasmtime-environ/src/lib.rs
+++ b/wasmtime-environ/src/lib.rs
--- a/wasmtime-environ/src/lightbeam.rs
+++ b/wasmtime-environ/src/lightbeam.rs
--- a/wasmtime-environ/src/module.rs
+++ b/wasmtime-environ/src/module.rs
--- a/wasmtime-environ/src/module_environ.rs
+++ b/wasmtime-environ/src/module_environ.rs
--- a/wasmtime-environ/src/tunables.rs
+++ b/wasmtime-environ/src/tunables.rs
--- a/wasmtime-environ/src/vmoffsets.rs
+++ b/wasmtime-environ/src/vmoffsets.rs
--- a/wasmtime-environ/tests/cache_default_config_in_memory.rs
+++ b/wasmtime-environ/tests/cache_default_config_in_memory.rs
--- a/wasmtime-environ/tests/cache_disabled.rs
+++ b/wasmtime-environ/tests/cache_disabled.rs
--- a/wasmtime-environ/tests/cache_fail_calling_init_twice.rs
+++ b/wasmtime-environ/tests/cache_fail_calling_init_twice.rs
--- a/wasmtime-environ/tests/cache_fail_invalid_config.rs
+++ b/wasmtime-environ/tests/cache_fail_invalid_config.rs
--- a/wasmtime-environ/tests/cache_fail_invalid_path_to_config.rs
+++ b/wasmtime-environ/tests/cache_fail_invalid_path_to_config.rs
--- a/wasmtime-environ/tests/cache_write_default_config.rs
+++ b/wasmtime-environ/tests/cache_write_default_config.rs
--- a/wasmtime-interface-types/Cargo.toml
+++ b/wasmtime-interface-types/Cargo.toml
@@ -16,5 +16,5 @@ cranelift-codegen = { version = "0.49", default-features = false }
 walrus = "0.13"
 wasmparser = { version = "0.39.2", default-features = false }
 wasm-webidl-bindings = "0.6"
-wasmtime-jit = { path = '../wasmtime-jit', default-features = false }
-wasmtime-runtime = { path = '../wasmtime-runtime', default-features = false }
+wasmtime-jit = { path = '../jit', default-features = false }
+wasmtime-runtime = { path = '../runtime', default-features = false }
--- a/wasmtime-interface-types/src/lib.rs
+++ b/wasmtime-interface-types/src/lib.rs
--- a/wasmtime-interface-types/src/value.rs
+++ b/wasmtime-interface-types/src/value.rs
--- a/wasmtime-jit/Cargo.toml
+++ b/wasmtime-jit/Cargo.toml
@@ -15,9 +15,9 @@ cranelift-codegen = { version = "0.49", features = ["enable-serde"] }
 cranelift-entity = { version = "0.49", features = ["enable-serde"] }
 cranelift-wasm = { version = "0.49", features = ["enable-serde"] }
 cranelift-frontend = { version = "0.49" }
-wasmtime-environ = { path = "../wasmtime-environ", default-features = false }
-wasmtime-runtime = { path = "../wasmtime-runtime", default-features = false }
-wasmtime-debug = { path = "../wasmtime-debug", default-features = false }
+wasmtime-environ = { path = "../environ", default-features = false }
+wasmtime-runtime = { path = "../runtime", default-features = false }
+wasmtime-debug = { path = "../debug", default-features = false }
 region = "2.0.0"
 failure = { version = "0.1.3", default-features = false }
 thiserror = "1.0.4"
--- a/wasi-common/wasi-common-cbindgen/LICENSE
+++ b/wasi-common/wasi-common-cbindgen/LICENSE
--- a/wasmtime-jit/README.md
+++ b/wasmtime-jit/README.md
--- a/wasmtime-jit/src/action.rs
+++ b/wasmtime-jit/src/action.rs
--- a/wasmtime-jit/src/code_memory.rs
+++ b/wasmtime-jit/src/code_memory.rs
--- a/wasmtime-jit/src/compiler.rs
+++ b/wasmtime-jit/src/compiler.rs
--- a/wasmtime-jit/src/context.rs
+++ b/wasmtime-jit/src/context.rs
--- a/wasmtime-jit/src/function_table.rs
+++ b/wasmtime-jit/src/function_table.rs
--- a/wasmtime-jit/src/instantiate.rs
+++ b/wasmtime-jit/src/instantiate.rs
--- a/wasmtime-jit/src/lib.rs
+++ b/wasmtime-jit/src/lib.rs
--- a/wasmtime-jit/src/link.rs
+++ b/wasmtime-jit/src/link.rs
--- a/Show More
+++ b/Show More