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
218 changes: 122 additions & 96 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/hyperlight_wasm_aot/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion src/hyperlight_wasm_aot/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 => {
Expand Down
175 changes: 175 additions & 0 deletions src/hyperlight_wasm_macro/Cargo.lock

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

4 changes: 2 additions & 2 deletions src/hyperlight_wasm_macro/src/wasmguest.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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::<Vec<_>>();
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);
Expand All @@ -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))
}
Expand Down
Loading
Loading