Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
155 changes: 79 additions & 76 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ repository = "https://github.com/hyperlight-dev/hyperlight-wasm"
readme = "README.md"

[workspace.dependencies]
hyperlight-host = { version = "0.8.0", default-features = false, features = ["executable_heap", "init-paging"] }
hyperlight-host = { version = "0.9.0", default-features = false, features = ["executable_heap", "init-paging"] }
2 changes: 1 addition & 1 deletion src/hyperlight_wasm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ windows = { version = "0.61", features = ["Win32_System_Threading"] }
page_size = "0.6.0"

[dev-dependencies]
hyperlight-component-macro = { version = "0.8.0" }
hyperlight-component-macro = { version = "0.9.0" }
examples_common = { path = "../examples_common" }
criterion = { version = "0.7.0", features = ["html_reports"] }
crossbeam-queue = "0.3"
Expand Down
20 changes: 10 additions & 10 deletions src/hyperlight_wasm_macro/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/hyperlight_wasm_macro/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ proc-macro2 = { version = "1.0.101" }
syn = { version = "2.0.106" }
itertools = { version = "0.14.0" }
prettyplease = { version = "0.2.37" }
hyperlight-component-util = { version = "0.8.0" }
hyperlight-component-util = { version = "0.9.0" }
10 changes: 6 additions & 4 deletions src/hyperlight_wasm_macro/src/wasmguest.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ limitations under the License.
// the `Resources` struct with.)

use hyperlight_component_util::emit::{
FnName, State, WitName, kebab_to_fn, kebab_to_namespace, kebab_to_type, kebab_to_var,
split_wit_name,
FnName, ResolvedBoundVar, State, WitName, kebab_to_fn, kebab_to_namespace, kebab_to_type,
kebab_to_var, split_wit_name,
};
use hyperlight_component_util::etypes::{
self, Component, Defined, ExternDecl, ExternDesc, Handleable, Instance, Tyvar,
Expand Down Expand Up @@ -94,10 +94,12 @@ fn emit_import_extern_decl<'b>(
}
ExternDesc::Type(t) => match t {
Defined::Handleable(Handleable::Var(Tyvar::Bound(b))) => {
let (b, _) = s.resolve_tv(*b);
let ResolvedBoundVar::Resource { rtidx } = s.resolve_bound_var(*b) else {
return quote! {};
};
let li = format_ident!("li{}", depth);
let edkn = ed.kebab_name;
let rtid = format_ident!("HostResource{}", b);
let rtid = format_ident!("HostResource{rtidx}");
quote! {
#li.resource(#edkn, ::wasmtime::component::ResourceType::host::<#rtid>(), |_, _| { Ok(()) });
}
Expand Down
60 changes: 37 additions & 23 deletions src/wasm_runtime/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions src/wasm_runtime/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ doctest = false
bench = false

[dependencies]
hyperlight-common = { version = "0.8.0", default-features = false }
hyperlight-guest-bin = { version = "0.8.0", features = [ "printf" ] }
hyperlight-guest = { version = "0.8.0" }
hyperlight-common = { version = "0.9.0", default-features = false }
hyperlight-guest-bin = { version = "0.9.0", features = [ "printf" ] }
hyperlight-guest = { version = "0.9.0" }
wasmtime = { version = "36.0.2", default-features = false, features = [ "runtime", "custom-virtual-memory", "custom-native-signals", "component-model" ] }
hyperlight-wasm-macro = { path = "../hyperlight_wasm_macro" }
spin = "0.10.0"
Expand Down