diff --git a/.envrc b/.envrc new file mode 100644 index 0000000000..5166a810c5 --- /dev/null +++ b/.envrc @@ -0,0 +1,16 @@ +# shellcheck shell=bash +if ! has nix_direnv_version || ! nix_direnv_version 3.0.4; then + source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.4/direnvrc" "sha256-DzlYZ33mWF/Gs8DDeyjr8mnVmQGx7ASYqA5WlxwvBG4=" +fi + +dotenv_if_exists + +# watch_file "$(find ./nix -name "*.nix" -type f)" + +OS_AND_SYSTEM=$(uname -a) + +if [[ "${NO_NIX:-}" == "1" || $OS_AND_SYSTEM == "Darwin"* ]]; then + source non-nix-build/env.sh +else + use flake +fi diff --git a/.gitignore b/.gitignore index 08f2b95e18..877f83c211 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,6 @@ spec/target **/fuzz/artifacts/ **/fuzz/crash-inputs/ **/fuzz/Cargo.lock + +*.wasm +.direnv/ diff --git a/Cargo.lock b/Cargo.lock index 9cbd7de74f..87a4fe31bd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1712,10 +1712,6 @@ dependencies = [ "wasm-encoder 0.227.1", ] -[[package]] -name = "wasm-test" -version = "0.44.0" - [[package]] name = "wasmi" version = "0.31.2" diff --git a/Cargo.toml b/Cargo.toml index d5a4319355..f40f5442e7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,8 @@ members = [ "crates/ir", "crates/fuzz", "crates/wast", - "fuzz", "wasm-test", "crates/tracer", + "fuzz", "crates/tracer", + # "wasm-test", ] exclude = [] resolver = "2" diff --git a/justfile b/justfile new file mode 100644 index 0000000000..d2287c40f2 --- /dev/null +++ b/justfile @@ -0,0 +1,10 @@ +build-wasm-test-c: + emcc -O0 -g3 -o wasm_test.wasm wasm_test.c + +dwarfdump wasm-path: + # from llvm + llvm-dwarfdump {{wasm-path}} + +dis wasm-path: + # from binaryen + wasm-dis {{wasm-path}} diff --git a/shell.nix b/shell.nix index 96f0a8ac44..d145d35563 100644 --- a/shell.nix +++ b/shell.nix @@ -26,7 +26,15 @@ mkShell { emscripten binaryen llvm + just rust-analyzer + + figlet ]; + shellHook = '' + export EM_CACHE=/tmp/emcc/ + + figlet "welcome to wasmi recorder" + ''; } diff --git a/wasm_test.c b/wasm_test.c new file mode 100644 index 0000000000..f9cb952d43 --- /dev/null +++ b/wasm_test.c @@ -0,0 +1,4 @@ +int main() { + int x = 1; + int y = 2; +}