diff --git a/Cargo.lock b/Cargo.lock index 906e70a..cef69f8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -507,33 +507,36 @@ dependencies = [ [[package]] name = "cranelift-assembler-x64" -version = "0.117.2" +version = "0.121.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b83fcf2fc1c8954561490d02079b496fd0c757da88129981e15bfe3a548229" +checksum = "226b7077389885873ffad5d778e8512742580a6e11b0f723072f41f305d3652f" dependencies = [ "cranelift-assembler-x64-meta", ] [[package]] name = "cranelift-assembler-x64-meta" -version = "0.117.2" +version = "0.121.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7496a6e92b5cee48c5d772b0443df58816dee30fed6ba19b2a28e78037ecedf" +checksum = "e9cfeae5a23c8cf9c43381f49211f3ce6dc1da1d46f1c5d06966e6258cc483fa" +dependencies = [ + "cranelift-srcgen", +] [[package]] name = "cranelift-bforest" -version = "0.117.2" +version = "0.121.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73a9dc0a8d3d49ee772101924968830f1c1937d650c571d3c2dd69dc36a68f41" +checksum = "8c88c577c6af92b550cb83455c331cf8e1bc89fe0ccc3e7eb0fa617ed1d63056" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-bitset" -version = "0.117.2" +version = "0.121.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "573c641174c40ef31021ae4a5a3ad78974e280633502d0dfc6e362385e0c100f" +checksum = "370f0aa7f1816bf0f838048d69b72d6cf12ef2fc3b37f6997fe494ffb9feb3ad" dependencies = [ "serde", "serde_derive", @@ -541,9 +544,9 @@ dependencies = [ [[package]] name = "cranelift-codegen" -version = "0.117.2" +version = "0.121.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d7c94d572615156f2db682181cadbd96342892c31e08cc26a757344319a9220" +checksum = "7d1a10a8a2958b68ecd261e565eef285249e242a8447ac959978319eabbb4a55" dependencies = [ "bumpalo", "cranelift-assembler-x64", @@ -563,39 +566,41 @@ dependencies = [ "serde", "smallvec", "target-lexicon", + "wasmtime-math", ] [[package]] name = "cranelift-codegen-meta" -version = "0.117.2" +version = "0.121.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beecd9fcf2c3e06da436d565de61a42676097ea6eb6b4499346ac6264b6bb9ce" +checksum = "f319986d5ae1386cfec625c70f8c01e52dc1f910aa6aaee7740bf8842d4e19c7" dependencies = [ - "cranelift-assembler-x64", + "cranelift-assembler-x64-meta", "cranelift-codegen-shared", + "cranelift-srcgen", "pulley-interpreter", ] [[package]] name = "cranelift-codegen-shared" -version = "0.117.2" +version = "0.121.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4ff8d2e1235f2d6e7fc3c6738be6954ba972cd295f09079ebffeca2f864e22" +checksum = "ed52f5660397039c3c741c3acf18746445f4e20629b7280d9f2ccfe57e2b1efd" [[package]] name = "cranelift-control" -version = "0.117.2" +version = "0.121.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "001312e9fbc7d9ca9517474d6fe71e29d07e52997fd7efe18f19e8836446ceb2" +checksum = "79bde8d48e1840702574e28c5d7d4499441435af71e6c47450881f84ce2b60a5" dependencies = [ "arbitrary", ] [[package]] name = "cranelift-entity" -version = "0.117.2" +version = "0.121.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb0fd6d4aae680275fcbceb08683416b744e65c8b607352043d3f0951d72b3b2" +checksum = "e0335ac187211ac94c254826b6e78d23b8654ae09ebf0830506a827a2647162f" dependencies = [ "cranelift-bitset", "serde", @@ -604,9 +609,9 @@ dependencies = [ [[package]] name = "cranelift-frontend" -version = "0.117.2" +version = "0.121.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fd44e7e5dcea20ca104d45894748205c51365ce4cdb18f4418e3ba955971d1b" +checksum = "f4fce5fcf93c1fece95d0175b15fbaf0808b187430bc06c8ecde80db0ed58c5e" dependencies = [ "cranelift-codegen", "log", @@ -616,21 +621,27 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.117.2" +version = "0.121.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f900e0a3847d51eed0321f0777947fb852ccfce0da7fb070100357f69a2f37fc" +checksum = "13fc8d838a2bf28438dbaf6ccdbc34531b6a972054f43fd23be7f124121ce6e0" [[package]] name = "cranelift-native" -version = "0.117.2" +version = "0.121.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7617f13f392ebb63c5126258aca8b8eca739636ca7e4eeee301d3eff68489a6a" +checksum = "0975ce66adcf2e0729d06b1d3efea0398d793d1f39c2e0a6f52a347537836693" dependencies = [ "cranelift-codegen", "libc", "target-lexicon", ] +[[package]] +name = "cranelift-srcgen" +version = "0.121.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4493a9b500bb02837ea2fb7d4b58c1c21c37a470ae33c92659f4e637aad14c9" + [[package]] name = "crc32fast" version = "1.4.2" @@ -1238,7 +1249,7 @@ dependencies = [ "proc-macro2", "quote", "syn", - "wasmparser", + "wasmparser 0.224.1", ] [[package]] @@ -1253,7 +1264,7 @@ dependencies = [ "proc-macro2", "quote", "syn", - "wasmparser", + "wasmparser 0.224.1", ] [[package]] @@ -1616,10 +1627,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] -name = "leb128" -version = "0.2.5" +name = "leb128fmt" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" +checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2" [[package]] name = "libc" @@ -1985,12 +1996,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "paste" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" - [[package]] name = "percent-encoding" version = "2.3.1" @@ -2124,15 +2129,27 @@ dependencies = [ [[package]] name = "pulley-interpreter" -version = "30.0.2" +version = "34.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0ecb9823083f71df8735f21f6c44f2f2b55986d674802831df20f27e26c907" +checksum = "fe0e8f39bc99694ce6fc8df7df7ed258d38d255a9268e2ff964f67f4a6588cdb" dependencies = [ "cranelift-bitset", "log", + "pulley-macros", "wasmtime-math", ] +[[package]] +name = "pulley-macros" +version = "34.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9276d404009cc49f3b8befeb8ffc1d868c5ea732bd9d72ab3e64231187f908c5" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "quanta" version = "0.12.6" @@ -2253,9 +2270,9 @@ dependencies = [ [[package]] name = "regalloc2" -version = "0.11.2" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc06e6b318142614e4a48bc725abbf08ff166694835c43c9dae5a9009704639a" +checksum = "5216b1837de2149f8bc8e6d5f88a9326b63b8c836ed58ce4a0a29ec736a59734" dependencies = [ "allocator-api2", "bumpalo", @@ -2664,12 +2681,6 @@ dependencies = [ "lock_api", ] -[[package]] -name = "sptr" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a" - [[package]] name = "stable_deref_trait" version = "1.2.0" @@ -3102,12 +3113,12 @@ dependencies = [ [[package]] name = "wasm-encoder" -version = "0.224.1" +version = "0.233.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ab7a13a23790fe91ea4eb7526a1f3131001d874e3e00c2976c48861f2e82920" +checksum = "9679ae3cf7cfa2ca3a327f7fab97f27f3294d402fd1a76ca8ab514e17973e4d3" dependencies = [ - "leb128", - "wasmparser", + "leb128fmt", + "wasmparser 0.233.0", ] [[package]] @@ -3123,22 +3134,35 @@ dependencies = [ "serde", ] +[[package]] +name = "wasmparser" +version = "0.233.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b51cb03afce7964bbfce46602d6cb358726f36430b6ba084ac6020d8ce5bc102" +dependencies = [ + "bitflags 2.9.1", + "hashbrown", + "indexmap", + "semver", + "serde", +] + [[package]] name = "wasmprinter" -version = "0.224.1" +version = "0.233.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0095b53a3b09cbc2f90f789ea44aa1b17ecc2dad8b267e657c7391f3ded6293d" +checksum = "abf8e5b732895c99b21aa615f1b73352e51bbe2b2cb6c87eae7f990d07c1ac18" dependencies = [ "anyhow", "termcolor", - "wasmparser", + "wasmparser 0.233.0", ] [[package]] name = "wasmtime" -version = "30.0.2" +version = "34.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "809cc8780708f1deed0a7c3fcab46954f0e8c08a6fe0252772481fbc88fcf946" +checksum = "2523d3347356a74e9c312c2c96e709c82d998dcafdca97f6d620e69c032fd043" dependencies = [ "addr2line", "anyhow", @@ -3155,18 +3179,16 @@ dependencies = [ "memfd", "object", "once_cell", - "paste", "postcard", "psm", "pulley-interpreter", - "rustix 0.38.44", + "rustix 1.0.7", "semver", "serde", "serde_derive", "smallvec", - "sptr", "target-lexicon", - "wasmparser", + "wasmparser 0.233.0", "wasmtime-asm-macros", "wasmtime-component-macro", "wasmtime-component-util", @@ -3183,18 +3205,18 @@ dependencies = [ [[package]] name = "wasmtime-asm-macros" -version = "30.0.2" +version = "34.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "236964b6b35af0f08879c9c56dbfbc5adc12e8d624672341a0121df31adaa3fa" +checksum = "7c45ecc343d3ad4629d5882e94f3b0f0fac22a043c07e64373381168ae00c259" dependencies = [ "cfg-if", ] [[package]] name = "wasmtime-component-macro" -version = "30.0.2" +version = "34.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2581ef04bf33904db9a902ffb558e7b2de534d6a4881ee985ea833f187a78fdf" +checksum = "3491c0f2511be561a92ac9b086351abc3a0f48c5f5f7d14f3975e246c13838be" dependencies = [ "anyhow", "proc-macro2", @@ -3207,15 +3229,15 @@ dependencies = [ [[package]] name = "wasmtime-component-util" -version = "30.0.2" +version = "34.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a7108498a8a0afc81c7d2d81b96cdc509cd631d7bbaa271b7db5137026f10e3" +checksum = "26bc084e249f74e61c79077d8937c34fb0af223752b9b1725e3d7ed94b006f23" [[package]] name = "wasmtime-cranelift" -version = "30.0.2" +version = "34.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abcc9179097235c91f299a8ff56b358ee921266b61adff7d14d6e48428954dd2" +checksum = "0010bd93362c634837e6bb13e213c2d83673b28dc12208b64ddd821fa55f7d33" dependencies = [ "anyhow", "cfg-if", @@ -3225,23 +3247,24 @@ dependencies = [ "cranelift-frontend", "cranelift-native", "gimli", - "itertools 0.12.1", + "itertools 0.14.0", "log", "object", "pulley-interpreter", "smallvec", "target-lexicon", - "thiserror 1.0.69", - "wasmparser", + "thiserror 2.0.12", + "wasmparser 0.233.0", "wasmtime-environ", + "wasmtime-math", "wasmtime-versioned-export-macros", ] [[package]] name = "wasmtime-environ" -version = "30.0.2" +version = "34.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e90f6cba665939381839bbf2ddf12d732fca03278867910348ef1281b700954" +checksum = "36a035dc308ff6be3d790dafdc2e41a128415e20ad864580da49470073e21dc1" dependencies = [ "anyhow", "cranelift-bitset", @@ -3257,21 +3280,22 @@ dependencies = [ "smallvec", "target-lexicon", "wasm-encoder", - "wasmparser", + "wasmparser 0.233.0", "wasmprinter", "wasmtime-component-util", ] [[package]] name = "wasmtime-fiber" -version = "30.0.2" +version = "34.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba5c2ac21f0b39d72d2dac198218a12b3ddeb4ab388a8fa0d2e429855876783c" +checksum = "fdc3c1e4e70cdd3a4572dff79062caa48988f7f1ccf6850d98a4e4c41bf3cfc8" dependencies = [ "anyhow", "cc", "cfg-if", - "rustix 0.38.44", + "libc", + "rustix 1.0.7", "wasmtime-asm-macros", "wasmtime-versioned-export-macros", "windows-sys 0.59.0", @@ -3279,9 +3303,9 @@ dependencies = [ [[package]] name = "wasmtime-jit-icache-coherence" -version = "30.0.2" +version = "34.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f180cc0d2745e3a5df5d02231cd3046f49c75512eaa987b8202363b112e125d" +checksum = "44c71d64e8ebe132cd45e9d299a4d0daf261d66bd05cf50a204a1bf8cf96ff1f" dependencies = [ "anyhow", "cfg-if", @@ -3291,24 +3315,24 @@ dependencies = [ [[package]] name = "wasmtime-math" -version = "30.0.2" +version = "34.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5f04c5dcf5b2f88f81cfb8d390294b2f67109dc4d0197ea7303c60a092df27c" +checksum = "222bfa4769c6931c985711eb49a92748ea0acc4ca85fcd24e945a2f1bacda0c1" dependencies = [ "libm", ] [[package]] name = "wasmtime-slab" -version = "30.0.2" +version = "34.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9681707f1ae9a4708ca22058722fca5c135775c495ba9b9624fe3732b94c97" +checksum = "5ac42c7fb0639f7c3e0c1ed0c984050245c55410f3fae334dd5b102e0edfab14" [[package]] name = "wasmtime-versioned-export-macros" -version = "30.0.2" +version = "34.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd2fe69d04986a12fc759d2e79494100d600adcb3bb79e63dedfc8e6bb2ab03e" +checksum = "4e052e1d9c30b8f31aff64380caaaff492a9890a412658bcc8866fe626b8e91f" dependencies = [ "proc-macro2", "quote", @@ -3317,16 +3341,16 @@ dependencies = [ [[package]] name = "wasmtime-winch" -version = "30.0.2" +version = "34.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a9c8eae8395d530bb00a388030de9f543528674c382326f601de47524376975" +checksum = "f2d71e002033124221f6633a462c26067280519fdd7527ba2751f585db779cc6" dependencies = [ "anyhow", "cranelift-codegen", "gimli", "object", "target-lexicon", - "wasmparser", + "wasmparser 0.233.0", "wasmtime-cranelift", "wasmtime-environ", "winch-codegen", @@ -3334,9 +3358,9 @@ dependencies = [ [[package]] name = "wasmtime-wit-bindgen" -version = "30.0.2" +version = "34.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a5531455e2c55994a1540355140369bb7ec0e46d2699731c5ee9f4cf9c3f7d4" +checksum = "f967f5efaaac7694e6bd0d67542a5a036830860e4adf95684260181e85a5d299" dependencies = [ "anyhow", "heck", @@ -3399,20 +3423,22 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "winch-codegen" -version = "30.0.2" +version = "34.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dbd4e07bd92c7ddace2f3267bdd31d4197b5ec58c315751325d45c19bfb56df" +checksum = "7d2bf456780101aff8950642fdf984f182816d7f555d5375699200242be78762" dependencies = [ "anyhow", + "cranelift-assembler-x64", "cranelift-codegen", "gimli", "regalloc2", "smallvec", "target-lexicon", - "thiserror 1.0.69", - "wasmparser", + "thiserror 2.0.12", + "wasmparser 0.233.0", "wasmtime-cranelift", "wasmtime-environ", + "wasmtime-math", ] [[package]] @@ -3710,9 +3736,9 @@ dependencies = [ [[package]] name = "wit-parser" -version = "0.224.1" +version = "0.233.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3477d8d0acb530d76beaa8becbdb1e3face08929db275f39934963eb4f716f8" +checksum = "f22f1cd55247a2e616870b619766e9522df36b7abafbb29bbeb34b7a9da7e9f0" dependencies = [ "anyhow", "id-arena", @@ -3723,7 +3749,7 @@ dependencies = [ "serde_derive", "serde_json", "unicode-xid", - "wasmparser", + "wasmparser 0.233.0", ] [[package]] diff --git a/src/hyperlight_wasm_aot/Cargo.toml b/src/hyperlight_wasm_aot/Cargo.toml index f13fbde..7d452ce 100644 --- a/src/hyperlight_wasm_aot/Cargo.toml +++ b/src/hyperlight_wasm_aot/Cargo.toml @@ -4,6 +4,6 @@ version = "0.1.0" edition = "2024" [dependencies] -wasmtime = { version = "30.0.2", default-features = false, features = ["cranelift", "runtime", "component-model" ] } +wasmtime = { version = "34.0.1", default-features = false, features = ["cranelift", "runtime", "component-model" ] } clap = "4.5" cargo_metadata = "0.19" diff --git a/src/hyperlight_wasm_aot/src/main.rs b/src/hyperlight_wasm_aot/src/main.rs index dbdcf7f..a94cd9c 100644 --- a/src/hyperlight_wasm_aot/src/main.rs +++ b/src/hyperlight_wasm_aot/src/main.rs @@ -100,7 +100,7 @@ fn main() { let bytes = std::fs::read(file).unwrap(); let config = get_config(); let engine = Engine::new(&config).unwrap(); - match engine.detect_precompiled(&bytes) { + match Engine::detect_precompiled(&bytes) { Some(pre_compiled) => { match pre_compiled { Precompiled::Module => { diff --git a/src/hyperlight_wasm_macro/Cargo.lock b/src/hyperlight_wasm_macro/Cargo.lock new file mode 100644 index 0000000..d12b955 --- /dev/null +++ b/src/hyperlight_wasm_macro/Cargo.lock @@ -0,0 +1,175 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 4 + +[[package]] +name = "bitflags" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" + +[[package]] +name = "either" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" + +[[package]] +name = "equivalent" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" + +[[package]] +name = "foldhash" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" + +[[package]] +name = "hashbrown" +version = "0.15.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5" +dependencies = [ + "foldhash", + "serde", +] + +[[package]] +name = "hyperlight-component-util" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be3a11b5c5967729ea7c5dedb017097e709da44eca3de3a2ee7681f5502eb751" +dependencies = [ + "itertools", + "log", + "prettyplease", + "proc-macro2", + "quote", + "syn", + "wasmparser", +] + +[[package]] +name = "hyperlight-wasm-macro" +version = "0.1.0" +dependencies = [ + "hyperlight-component-util", + "itertools", + "prettyplease", + "proc-macro2", + "quote", + "syn", + "wasmparser", +] + +[[package]] +name = "indexmap" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e" +dependencies = [ + "equivalent", + "hashbrown", + "serde", +] + +[[package]] +name = "itertools" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" +dependencies = [ + "either", +] + +[[package]] +name = "log" +version = "0.4.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" + +[[package]] +name = "prettyplease" +version = "0.2.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "061c1221631e079b26479d25bbf2275bfe5917ae8419cd7e34f13bfc2aa7539a" +dependencies = [ + "proc-macro2", + "syn", +] + +[[package]] +name = "proc-macro2" +version = "1.0.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "semver" +version = "1.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0" + +[[package]] +name = "serde" +version = "1.0.219" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.219" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "syn" +version = "2.0.104" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "unicode-ident" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" + +[[package]] +name = "wasmparser" +version = "0.224.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04f17a5917c2ddd3819e84c661fae0d6ba29d7b9c1f0e96c708c65a9c4188e11" +dependencies = [ + "bitflags", + "hashbrown", + "indexmap", + "semver", + "serde", +] diff --git a/src/hyperlight_wasm_macro/src/wasmguest.rs b/src/hyperlight_wasm_macro/src/wasmguest.rs index 89f6384..8776680 100644 --- a/src/hyperlight_wasm_macro/src/wasmguest.rs +++ b/src/hyperlight_wasm_macro/src/wasmguest.rs @@ -164,7 +164,7 @@ fn emit_export_extern_decl<'a, 'b, 'c>( }) .unzip::<_, _, Vec<_>, Vec<_>>(); let get_instance = path.iter().map(|export| quote! { - let instance_idx = Some(instance.get_export(&mut *store, instance_idx.as_ref(), #export).unwrap()); + let instance_idx = Some(instance.get_export_index(&mut *store, instance_idx.as_ref(), #export).unwrap()); }).collect::>(); let (function_call, ret) = emit_wasm_function_call(s, &ft.result, pwts, pus); let marshal_result = emit_hl_marshal_result(s, ret.clone(), &ft.result); @@ -175,7 +175,7 @@ fn emit_export_extern_decl<'a, 'b, 'c>( let instance = CUR_INSTANCE.lock(); let mut instance = instance.unwrap(); let instance_idx = None; #(#get_instance;)* - let func_idx = instance.get_export(&mut *store, instance_idx.as_ref(), #nlit).unwrap(); + let func_idx = instance.get_export_index(&mut *store, instance_idx.as_ref(), #nlit).unwrap(); #function_call ::core::result::Result::Ok(::hyperlight_common::flatbuffer_wrappers::util::get_flatbuffer_result::<&[u8]>(&#marshal_result)) } diff --git a/src/wasm_runtime/Cargo.lock b/src/wasm_runtime/Cargo.lock index 5c77d6b..8973bf5 100644 --- a/src/wasm_runtime/Cargo.lock +++ b/src/wasm_runtime/Cargo.lock @@ -121,7 +121,7 @@ dependencies = [ "semver", "serde", "serde_json", - "thiserror 2.0.12", + "thiserror", ] [[package]] @@ -153,33 +153,36 @@ checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" [[package]] name = "cranelift-assembler-x64" -version = "0.117.2" +version = "0.121.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b83fcf2fc1c8954561490d02079b496fd0c757da88129981e15bfe3a548229" +checksum = "226b7077389885873ffad5d778e8512742580a6e11b0f723072f41f305d3652f" dependencies = [ "cranelift-assembler-x64-meta", ] [[package]] name = "cranelift-assembler-x64-meta" -version = "0.117.2" +version = "0.121.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7496a6e92b5cee48c5d772b0443df58816dee30fed6ba19b2a28e78037ecedf" +checksum = "e9cfeae5a23c8cf9c43381f49211f3ce6dc1da1d46f1c5d06966e6258cc483fa" +dependencies = [ + "cranelift-srcgen", +] [[package]] name = "cranelift-bforest" -version = "0.117.2" +version = "0.121.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73a9dc0a8d3d49ee772101924968830f1c1937d650c571d3c2dd69dc36a68f41" +checksum = "8c88c577c6af92b550cb83455c331cf8e1bc89fe0ccc3e7eb0fa617ed1d63056" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-bitset" -version = "0.117.2" +version = "0.121.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "573c641174c40ef31021ae4a5a3ad78974e280633502d0dfc6e362385e0c100f" +checksum = "370f0aa7f1816bf0f838048d69b72d6cf12ef2fc3b37f6997fe494ffb9feb3ad" dependencies = [ "serde", "serde_derive", @@ -187,9 +190,9 @@ dependencies = [ [[package]] name = "cranelift-codegen" -version = "0.117.2" +version = "0.121.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d7c94d572615156f2db682181cadbd96342892c31e08cc26a757344319a9220" +checksum = "7d1a10a8a2958b68ecd261e565eef285249e242a8447ac959978319eabbb4a55" dependencies = [ "bumpalo", "cranelift-assembler-x64", @@ -209,39 +212,41 @@ dependencies = [ "serde", "smallvec", "target-lexicon", + "wasmtime-math", ] [[package]] name = "cranelift-codegen-meta" -version = "0.117.2" +version = "0.121.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beecd9fcf2c3e06da436d565de61a42676097ea6eb6b4499346ac6264b6bb9ce" +checksum = "f319986d5ae1386cfec625c70f8c01e52dc1f910aa6aaee7740bf8842d4e19c7" dependencies = [ - "cranelift-assembler-x64", + "cranelift-assembler-x64-meta", "cranelift-codegen-shared", + "cranelift-srcgen", "pulley-interpreter", ] [[package]] name = "cranelift-codegen-shared" -version = "0.117.2" +version = "0.121.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4ff8d2e1235f2d6e7fc3c6738be6954ba972cd295f09079ebffeca2f864e22" +checksum = "ed52f5660397039c3c741c3acf18746445f4e20629b7280d9f2ccfe57e2b1efd" [[package]] name = "cranelift-control" -version = "0.117.2" +version = "0.121.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "001312e9fbc7d9ca9517474d6fe71e29d07e52997fd7efe18f19e8836446ceb2" +checksum = "79bde8d48e1840702574e28c5d7d4499441435af71e6c47450881f84ce2b60a5" dependencies = [ "arbitrary", ] [[package]] name = "cranelift-entity" -version = "0.117.2" +version = "0.121.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb0fd6d4aae680275fcbceb08683416b744e65c8b607352043d3f0951d72b3b2" +checksum = "e0335ac187211ac94c254826b6e78d23b8654ae09ebf0830506a827a2647162f" dependencies = [ "cranelift-bitset", "serde", @@ -250,9 +255,9 @@ dependencies = [ [[package]] name = "cranelift-frontend" -version = "0.117.2" +version = "0.121.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fd44e7e5dcea20ca104d45894748205c51365ce4cdb18f4418e3ba955971d1b" +checksum = "f4fce5fcf93c1fece95d0175b15fbaf0808b187430bc06c8ecde80db0ed58c5e" dependencies = [ "cranelift-codegen", "log", @@ -262,21 +267,27 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.117.2" +version = "0.121.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f900e0a3847d51eed0321f0777947fb852ccfce0da7fb070100357f69a2f37fc" +checksum = "13fc8d838a2bf28438dbaf6ccdbc34531b6a972054f43fd23be7f124121ce6e0" [[package]] name = "cranelift-native" -version = "0.117.2" +version = "0.121.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7617f13f392ebb63c5126258aca8b8eca739636ca7e4eeee301d3eff68489a6a" +checksum = "0975ce66adcf2e0729d06b1d3efea0398d793d1f39c2e0a6f52a347537836693" dependencies = [ "cranelift-codegen", "libc", "target-lexicon", ] +[[package]] +name = "cranelift-srcgen" +version = "0.121.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4493a9b500bb02837ea2fb7d4b58c1c21c37a470ae33c92659f4e637aad14c9" + [[package]] name = "crc32fast" version = "1.4.2" @@ -605,13 +616,13 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be3a11b5c5967729ea7c5dedb017097e709da44eca3de3a2ee7681f5502eb751" dependencies = [ - "itertools 0.14.0", + "itertools", "log", "prettyplease", "proc-macro2", "quote", "syn", - "wasmparser", + "wasmparser 0.224.1", ] [[package]] @@ -646,12 +657,12 @@ name = "hyperlight-wasm-macro" version = "0.1.0" dependencies = [ "hyperlight-component-util", - "itertools 0.14.0", + "itertools", "prettyplease", "proc-macro2", "quote", "syn", - "wasmparser", + "wasmparser 0.224.1", ] [[package]] @@ -794,15 +805,6 @@ dependencies = [ "serde", ] -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.14.0" @@ -829,10 +831,10 @@ dependencies = [ ] [[package]] -name = "leb128" -version = "0.2.5" +name = "leb128fmt" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" +checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2" [[package]] name = "libc" @@ -852,6 +854,12 @@ version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" +[[package]] +name = "linux-raw-sys" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" + [[package]] name = "litemap" version = "0.8.0" @@ -901,7 +909,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64" dependencies = [ - "rustix", + "rustix 0.38.44", ] [[package]] @@ -942,12 +950,6 @@ version = "1.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" -[[package]] -name = "paste" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" - [[package]] name = "percent-encoding" version = "2.3.1" @@ -1026,15 +1028,27 @@ dependencies = [ [[package]] name = "pulley-interpreter" -version = "30.0.2" +version = "34.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0ecb9823083f71df8735f21f6c44f2f2b55986d674802831df20f27e26c907" +checksum = "fe0e8f39bc99694ce6fc8df7df7ed258d38d255a9268e2ff964f67f4a6588cdb" dependencies = [ "cranelift-bitset", "log", + "pulley-macros", "wasmtime-math", ] +[[package]] +name = "pulley-macros" +version = "34.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9276d404009cc49f3b8befeb8ffc1d868c5ea732bd9d72ab3e64231187f908c5" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "quinn" version = "0.11.8" @@ -1049,7 +1063,7 @@ dependencies = [ "rustc-hash", "rustls", "socket2", - "thiserror 2.0.12", + "thiserror", "tokio", "tracing", "web-time", @@ -1070,7 +1084,7 @@ dependencies = [ "rustls", "rustls-pki-types", "slab", - "thiserror 2.0.12", + "thiserror", "tinyvec", "tracing", "web-time", @@ -1136,9 +1150,9 @@ dependencies = [ [[package]] name = "regalloc2" -version = "0.11.2" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc06e6b318142614e4a48bc725abbf08ff166694835c43c9dae5a9009704639a" +checksum = "5216b1837de2149f8bc8e6d5f88a9326b63b8c836ed58ce4a0a29ec736a59734" dependencies = [ "allocator-api2", "bumpalo", @@ -1232,7 +1246,20 @@ dependencies = [ "bitflags", "errno", "libc", - "linux-raw-sys", + "linux-raw-sys 0.4.15", + "windows-sys 0.59.0", +] + +[[package]] +name = "rustix" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266" +dependencies = [ + "bitflags", + "errno", + "libc", + "linux-raw-sys 0.9.4", "windows-sys 0.59.0", ] @@ -1394,12 +1421,6 @@ dependencies = [ "lock_api", ] -[[package]] -name = "sptr" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a" - [[package]] name = "stable_deref_trait" version = "1.2.0" @@ -1458,33 +1479,13 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "thiserror" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" -dependencies = [ - "thiserror-impl 1.0.69", -] - [[package]] name = "thiserror" version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708" dependencies = [ - "thiserror-impl 2.0.12", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" -dependencies = [ - "proc-macro2", - "quote", - "syn", + "thiserror-impl", ] [[package]] @@ -1750,12 +1751,12 @@ dependencies = [ [[package]] name = "wasm-encoder" -version = "0.224.1" +version = "0.233.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ab7a13a23790fe91ea4eb7526a1f3131001d874e3e00c2976c48861f2e82920" +checksum = "9679ae3cf7cfa2ca3a327f7fab97f27f3294d402fd1a76ca8ab514e17973e4d3" dependencies = [ - "leb128", - "wasmparser", + "leb128fmt", + "wasmparser 0.233.0", ] [[package]] @@ -1787,22 +1788,35 @@ dependencies = [ "serde", ] +[[package]] +name = "wasmparser" +version = "0.233.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b51cb03afce7964bbfce46602d6cb358726f36430b6ba084ac6020d8ce5bc102" +dependencies = [ + "bitflags", + "hashbrown", + "indexmap", + "semver", + "serde", +] + [[package]] name = "wasmprinter" -version = "0.224.1" +version = "0.233.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0095b53a3b09cbc2f90f789ea44aa1b17ecc2dad8b267e657c7391f3ded6293d" +checksum = "abf8e5b732895c99b21aa615f1b73352e51bbe2b2cb6c87eae7f990d07c1ac18" dependencies = [ "anyhow", "termcolor", - "wasmparser", + "wasmparser 0.233.0", ] [[package]] name = "wasmtime" -version = "30.0.2" +version = "34.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "809cc8780708f1deed0a7c3fcab46954f0e8c08a6fe0252772481fbc88fcf946" +checksum = "2523d3347356a74e9c312c2c96e709c82d998dcafdca97f6d620e69c032fd043" dependencies = [ "anyhow", "bitflags", @@ -1817,18 +1831,16 @@ dependencies = [ "mach2", "memfd", "object", - "paste", "postcard", "psm", "pulley-interpreter", - "rustix", + "rustix 1.0.7", "semver", "serde", "serde_derive", "smallvec", - "sptr", "target-lexicon", - "wasmparser", + "wasmparser 0.233.0", "wasmtime-asm-macros", "wasmtime-component-macro", "wasmtime-component-util", @@ -1844,18 +1856,18 @@ dependencies = [ [[package]] name = "wasmtime-asm-macros" -version = "30.0.2" +version = "34.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "236964b6b35af0f08879c9c56dbfbc5adc12e8d624672341a0121df31adaa3fa" +checksum = "7c45ecc343d3ad4629d5882e94f3b0f0fac22a043c07e64373381168ae00c259" dependencies = [ "cfg-if", ] [[package]] name = "wasmtime-component-macro" -version = "30.0.2" +version = "34.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2581ef04bf33904db9a902ffb558e7b2de534d6a4881ee985ea833f187a78fdf" +checksum = "3491c0f2511be561a92ac9b086351abc3a0f48c5f5f7d14f3975e246c13838be" dependencies = [ "anyhow", "proc-macro2", @@ -1868,15 +1880,15 @@ dependencies = [ [[package]] name = "wasmtime-component-util" -version = "30.0.2" +version = "34.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a7108498a8a0afc81c7d2d81b96cdc509cd631d7bbaa271b7db5137026f10e3" +checksum = "26bc084e249f74e61c79077d8937c34fb0af223752b9b1725e3d7ed94b006f23" [[package]] name = "wasmtime-cranelift" -version = "30.0.2" +version = "34.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abcc9179097235c91f299a8ff56b358ee921266b61adff7d14d6e48428954dd2" +checksum = "0010bd93362c634837e6bb13e213c2d83673b28dc12208b64ddd821fa55f7d33" dependencies = [ "anyhow", "cfg-if", @@ -1886,23 +1898,24 @@ dependencies = [ "cranelift-frontend", "cranelift-native", "gimli", - "itertools 0.12.1", + "itertools", "log", "object", "pulley-interpreter", "smallvec", "target-lexicon", - "thiserror 1.0.69", - "wasmparser", + "thiserror", + "wasmparser 0.233.0", "wasmtime-environ", + "wasmtime-math", "wasmtime-versioned-export-macros", ] [[package]] name = "wasmtime-environ" -version = "30.0.2" +version = "34.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e90f6cba665939381839bbf2ddf12d732fca03278867910348ef1281b700954" +checksum = "36a035dc308ff6be3d790dafdc2e41a128415e20ad864580da49470073e21dc1" dependencies = [ "anyhow", "cranelift-bitset", @@ -1918,16 +1931,16 @@ dependencies = [ "smallvec", "target-lexicon", "wasm-encoder", - "wasmparser", + "wasmparser 0.233.0", "wasmprinter", "wasmtime-component-util", ] [[package]] name = "wasmtime-jit-icache-coherence" -version = "30.0.2" +version = "34.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f180cc0d2745e3a5df5d02231cd3046f49c75512eaa987b8202363b112e125d" +checksum = "44c71d64e8ebe132cd45e9d299a4d0daf261d66bd05cf50a204a1bf8cf96ff1f" dependencies = [ "anyhow", "cfg-if", @@ -1937,24 +1950,24 @@ dependencies = [ [[package]] name = "wasmtime-math" -version = "30.0.2" +version = "34.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5f04c5dcf5b2f88f81cfb8d390294b2f67109dc4d0197ea7303c60a092df27c" +checksum = "222bfa4769c6931c985711eb49a92748ea0acc4ca85fcd24e945a2f1bacda0c1" dependencies = [ "libm", ] [[package]] name = "wasmtime-slab" -version = "30.0.2" +version = "34.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9681707f1ae9a4708ca22058722fca5c135775c495ba9b9624fe3732b94c97" +checksum = "5ac42c7fb0639f7c3e0c1ed0c984050245c55410f3fae334dd5b102e0edfab14" [[package]] name = "wasmtime-versioned-export-macros" -version = "30.0.2" +version = "34.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd2fe69d04986a12fc759d2e79494100d600adcb3bb79e63dedfc8e6bb2ab03e" +checksum = "4e052e1d9c30b8f31aff64380caaaff492a9890a412658bcc8866fe626b8e91f" dependencies = [ "proc-macro2", "quote", @@ -1963,16 +1976,16 @@ dependencies = [ [[package]] name = "wasmtime-winch" -version = "30.0.2" +version = "34.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a9c8eae8395d530bb00a388030de9f543528674c382326f601de47524376975" +checksum = "f2d71e002033124221f6633a462c26067280519fdd7527ba2751f585db779cc6" dependencies = [ "anyhow", "cranelift-codegen", "gimli", "object", "target-lexicon", - "wasmparser", + "wasmparser 0.233.0", "wasmtime-cranelift", "wasmtime-environ", "winch-codegen", @@ -1980,9 +1993,9 @@ dependencies = [ [[package]] name = "wasmtime-wit-bindgen" -version = "30.0.2" +version = "34.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a5531455e2c55994a1540355140369bb7ec0e46d2699731c5ee9f4cf9c3f7d4" +checksum = "f967f5efaaac7694e6bd0d67542a5a036830860e4adf95684260181e85a5d299" dependencies = [ "anyhow", "heck", @@ -2030,20 +2043,22 @@ dependencies = [ [[package]] name = "winch-codegen" -version = "30.0.2" +version = "34.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dbd4e07bd92c7ddace2f3267bdd31d4197b5ec58c315751325d45c19bfb56df" +checksum = "7d2bf456780101aff8950642fdf984f182816d7f555d5375699200242be78762" dependencies = [ "anyhow", + "cranelift-assembler-x64", "cranelift-codegen", "gimli", "regalloc2", "smallvec", "target-lexicon", - "thiserror 1.0.69", - "wasmparser", + "thiserror", + "wasmparser 0.233.0", "wasmtime-cranelift", "wasmtime-environ", + "wasmtime-math", ] [[package]] @@ -2139,9 +2154,9 @@ dependencies = [ [[package]] name = "wit-parser" -version = "0.224.1" +version = "0.233.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3477d8d0acb530d76beaa8becbdb1e3face08929db275f39934963eb4f716f8" +checksum = "f22f1cd55247a2e616870b619766e9522df36b7abafbb29bbeb34b7a9da7e9f0" dependencies = [ "anyhow", "id-arena", @@ -2152,7 +2167,7 @@ dependencies = [ "serde_derive", "serde_json", "unicode-xid", - "wasmparser", + "wasmparser 0.233.0", ] [[package]] diff --git a/src/wasm_runtime/Cargo.toml b/src/wasm_runtime/Cargo.toml index 6abd467..8f823d3 100644 --- a/src/wasm_runtime/Cargo.toml +++ b/src/wasm_runtime/Cargo.toml @@ -14,7 +14,7 @@ bench = false hyperlight-common = { version = "0.6.1", default-features = false } hyperlight-guest-bin = { version = "0.6.1", features = [ "printf" ] } hyperlight-guest = { version = "0.6.1" } -wasmtime = { version = "30.0.2", default-features = false, features = [ "runtime", "custom-virtual-memory", "custom-native-signals", "component-model" ] } +wasmtime = { version = "34.0.1", default-features = false, features = [ "runtime", "custom-virtual-memory", "custom-native-signals", "component-model" ] } hyperlight-wasm-macro = { path = "../hyperlight_wasm_macro" } spin = "0.9.8" diff --git a/src/wasm_runtime/src/wasip1.rs b/src/wasm_runtime/src/wasip1.rs index 70b08e4..e4c8881 100644 --- a/src/wasm_runtime/src/wasip1.rs +++ b/src/wasm_runtime/src/wasip1.rs @@ -25,7 +25,7 @@ use hyperlight_guest::error::Result; use hyperlight_guest_bin::host_comm::call_host_function; use wasmtime::{Caller, Extern, Linker}; -pub(crate) fn register_handlers(linker: &mut Linker) -> Result<()> { +pub(crate) fn register_handlers(linker: &mut Linker) -> Result<()> { linker.func_wrap( "wasi_snapshot_preview1", "fd_seek",