Update to latest hl

Signed-off-by: James Sturtevant <jsturtevant@gmail.com>

Author: jsturtevant

Cargo.lock

@@ -13,11 +13,11 @@ repository = "https://github.com/hyperlight-dev/hyperlight-wasm"
 readme = "README.md"
 
 [workspace.dependencies]
-hyperlight-common = { version = "0.13.0", default-features = false }
-hyperlight-component-macro = { version = "0.13.0" }
-hyperlight-component-util = { version = "0.13.0" }
-hyperlight-guest = { version = "0.13.0" }
-hyperlight-guest-bin = { version = "0.13.0", features = [ "printf" ] }
-hyperlight-host = { version = "0.13.0", default-features = false, features = ["executable_heap", "init-paging"] }
+hyperlight-common = { git = "https://github.com/hyperlight-dev/hyperlight", rev = "c9a1a4cefce6a085af92e375121e9f1b1c8deeec", default-features = false }
+hyperlight-component-macro = { git = "https://github.com/hyperlight-dev/hyperlight", rev = "c9a1a4cefce6a085af92e375121e9f1b1c8deeec" }
+hyperlight-component-util = { git = "https://github.com/hyperlight-dev/hyperlight", rev = "c9a1a4cefce6a085af92e375121e9f1b1c8deeec" }
+hyperlight-guest = { git = "https://github.com/hyperlight-dev/hyperlight", rev = "c9a1a4cefce6a085af92e375121e9f1b1c8deeec" }
+hyperlight-guest-bin = { git = "https://github.com/hyperlight-dev/hyperlight", rev = "c9a1a4cefce6a085af92e375121e9f1b1c8deeec", features = [ "printf" ] }
+hyperlight-host = { git = "https://github.com/hyperlight-dev/hyperlight", rev = "c9a1a4cefce6a085af92e375121e9f1b1c8deeec", default-features = false, features = ["executable_heap"] }
 hyperlight-wasm-macro = { version = "0.13.0", path = "src/hyperlight_wasm_macro" }
 hyperlight-wasm-runtime = { version = "0.13.0", path = "src/hyperlight_wasm_runtime" }

Cargo.toml

@@ -53,7 +53,7 @@ test = true
 
 [dependencies]
 hyperlight-host.workspace = true
-hyperlight-common = "0.13.0"
+hyperlight-common.workspace = true
 libc = "0.2.183"
 once_cell = "1.21.3"
 tracing = "0.1.44"

src/hyperlight_wasm/Cargo.toml

@@ -17,6 +17,7 @@ limitations under the License.
 use std::path::Path;
 use std::sync::Arc;
 
+use hyperlight_host::mem::memory_region::{MemoryRegion, MemoryRegionFlags, MemoryRegionType};
 use hyperlight_host::sandbox::snapshot::Snapshot;
 use hyperlight_host::{MultiUseSandbox, Result, new_error};
 
@@ -116,8 +117,19 @@ impl WasmSandbox {
             .as_mut()
             .ok_or_else(|| new_error!("WasmSandbox is None"))?;
 
-        let wasm_bytes = unsafe { std::slice::from_raw_parts(base as *const u8, len).to_vec() };
-        load_wasm_module_from_bytes(inner, wasm_bytes)?;
+        let guest_base: usize = MAPPED_BINARY_VA as usize;
+        let rgn = MemoryRegion {
+            host_region: base as usize..base.wrapping_add(len) as usize,
+            guest_region: guest_base..guest_base + len,
+            flags: MemoryRegionFlags::READ | MemoryRegionFlags::EXECUTE,
+            region_type: MemoryRegionType::Heap,
+        };
+        if let Ok(()) = unsafe { inner.map_region(&rgn) } {
+            inner.call::<()>("LoadWasmModulePhys", (MAPPED_BINARY_VA, len as u64))?;
+        } else {
+            let wasm_bytes = unsafe { std::slice::from_raw_parts(base as *const u8, len).to_vec() };
+            load_wasm_module_from_bytes(inner, wasm_bytes)?;
+        }
 
         self.finalize_module_load()
     }