[guest,guest_bin] moved memory mod to guest_bin_library

This module defines C-wrappers for our global allocator, specific to the needs of our C-API and custom guests,
so it makes sense to move it.

Signed-off-by: danbugs <[email protected]>

Author: danbugs

src/hyperlight_guest/src/lib.rs

@@ -20,10 +20,8 @@ limitations under the License.
 extern crate alloc;
 
 // Modules
-pub mod exit;
 pub mod error;
-// TODO(danbugs): Move this to hyperlight_guest_bin
-pub mod memory;
+pub mod exit;
 
 pub mod guest_handle {
     pub mod handle;

src/hyperlight_guest_bin/src/lib.rs

@@ -51,6 +51,7 @@ pub mod guest_function {
 
 pub mod guest_logger;
 pub mod host_comm;
+pub mod memory;
 
 // === Globals ===
 #[global_allocator]

src/hyperlight_guest/src/memory.rs renamed to src/hyperlight_guest_bin/src/memory.rs

@@ -20,10 +20,7 @@ use core::mem::{align_of, size_of};
 use core::ptr;
 
 use hyperlight_common::flatbuffer_wrappers::guest_error::ErrorCode;
-
-use crate::exit::abort_with_code;
-
-extern crate alloc;
+use hyperlight_guest::exit::abort_with_code;
 
 /*
     C-wrappers for Rust's registered global allocator.

src/tests/rust_guests/simpleguest/src/main.rs

@@ -47,10 +47,10 @@ use hyperlight_common::flatbuffer_wrappers::util::get_flatbuffer_result;
 use hyperlight_common::mem::PAGE_SIZE;
 use hyperlight_guest::error::{HyperlightGuestError, Result};
 use hyperlight_guest::exit::{abort_with_code, abort_with_code_and_message};
-use hyperlight_guest::memory::malloc;
 use hyperlight_guest_bin::guest_function::definition::GuestFunctionDefinition;
 use hyperlight_guest_bin::guest_function::register::register_function;
 use hyperlight_guest_bin::host_comm::{call_host_function, call_host_function_without_returning};
+use hyperlight_guest_bin::memory::malloc;
 use hyperlight_guest_bin::{guest_logger, MIN_STACK_ADDRESS};
 use log::{error, LevelFilter};