Remove HyperlightPEB::code_ptr

src/hyperlight_common/src/mem.rs

@@ -43,7 +43,6 @@ pub struct GuestStack {
 pub struct HyperlightPEB {
     pub security_cookie_seed: u64,
     pub guest_function_dispatch_ptr: u64,
-    pub code_ptr: u64,
     pub input_stack: GuestMemoryRegion,
     pub output_stack: GuestMemoryRegion,
     pub init_data: GuestMemoryRegion,

src/hyperlight_host/src/mem/layout.rs

@@ -98,7 +98,6 @@ pub(crate) struct SandboxMemoryLayout {
     peb_offset: usize,
     peb_security_cookie_seed_offset: usize,
     peb_guest_dispatch_function_ptr_offset: usize, // set by guest in guest entrypoint
-    peb_code_pointer_offset: usize,
     pub(super) peb_host_function_definitions_offset: usize,
     peb_input_data_offset: usize,
     peb_output_data_offset: usize,
@@ -154,10 +153,6 @@ impl Debug for SandboxMemoryLayout {
                 "Host Function Definitions Offset",
                 &format_args!("{:#x}", self.peb_host_function_definitions_offset),
             )
-            .field(
-                "Code Pointer Offset",
-                &format_args!("{:#x}", self.peb_code_pointer_offset),
-            )
             .field(
                 "Input Data Offset",
                 &format_args!("{:#x}", self.peb_input_data_offset),
@@ -276,7 +271,6 @@ impl SandboxMemoryLayout {
             peb_offset + offset_of!(HyperlightPEB, security_cookie_seed);
         let peb_guest_dispatch_function_ptr_offset =
             peb_offset + offset_of!(HyperlightPEB, guest_function_dispatch_ptr);
-        let peb_code_pointer_offset = peb_offset + offset_of!(HyperlightPEB, code_ptr);
         let peb_input_data_offset = peb_offset + offset_of!(HyperlightPEB, input_stack);
         let peb_output_data_offset = peb_offset + offset_of!(HyperlightPEB, output_stack);
         let peb_init_data_offset = peb_offset + offset_of!(HyperlightPEB, init_data);
@@ -319,7 +313,6 @@ impl SandboxMemoryLayout {
             heap_size,
             peb_security_cookie_seed_offset,
             peb_guest_dispatch_function_ptr_offset,
-            peb_code_pointer_offset,
             peb_host_function_definitions_offset,
             peb_input_data_offset,
             peb_output_data_offset,
@@ -423,14 +416,6 @@ impl SandboxMemoryLayout {
         self.get_input_data_size_offset() + size_of::<u64>()
     }
 
-    /// Get the offset in guest memory to the code pointer
-    #[instrument(skip_all, parent = Span::current(), level= "Trace")]
-    pub(super) fn get_code_pointer_offset(&self) -> usize {
-        // The code pointer is the first field
-        // in the `CodeAndOutBPointers` struct which is a u64
-        self.peb_code_pointer_offset
-    }
-
     /// Get the offset in guest memory to where the guest dispatch function
     /// pointer is written
     #[instrument(skip_all, parent = Span::current(), level= "Trace")]

src/hyperlight_host/src/mem/mgr.rs

@@ -338,14 +338,6 @@ impl SandboxMemoryManager<ExclusiveSharedMemory> {
 
         let entrypoint_offset = exe_info.entrypoint();
 
-        let offset = layout.get_code_pointer_offset();
-
-        {
-            // write the code pointer to shared memory
-            let load_addr_u64: u64 = load_addr.clone().into();
-            shared_mem.write_u64(offset, load_addr_u64)?;
-        }
-
         // The load method returns a LoadInfo which can also be a different type once the
         // `mem_profile` feature is enabled.
         #[allow(clippy::let_unit_value)]