diff --git a/src/framework/jinux-frame/src/user.rs b/src/framework/jinux-frame/src/user.rs index 6bdc7dbd..daa006a6 100644 --- a/src/framework/jinux-frame/src/user.rs +++ b/src/framework/jinux-frame/src/user.rs @@ -26,18 +26,6 @@ impl UserSpace { Self { vm_space, init_ctx } } - pub fn instruction_pointer(&self) -> usize { - self.init_ctx.instruction_pointer() - } - - pub fn stack_pointer(&self) -> usize { - self.init_ctx.stack_pointer() - } - - pub fn syscall_ret(&self) -> usize { - self.init_ctx.syscall_ret() - } - /// Returns the VM address space. pub fn vm_space(&self) -> &VmSpace { &self.vm_space diff --git a/src/services/libs/jinux-std/src/thread/task.rs b/src/services/libs/jinux-std/src/thread/task.rs index 0358ce08..b2d3cd85 100644 --- a/src/services/libs/jinux-std/src/thread/task.rs +++ b/src/services/libs/jinux-std/src/thread/task.rs @@ -1,7 +1,7 @@ use jinux_frame::{ cpu::UserContext, task::Task, - user::{UserEvent, UserMode, UserSpace}, + user::{UserEvent, UserMode, UserSpace, UserContextApi}, }; use crate::{ @@ -19,10 +19,10 @@ pub fn create_new_user_task(user_space: Arc, thread_ref: Weak let mut user_mode = UserMode::new(user_space); debug!( "[Task entry] rip = 0x{:x}", - user_space.instruction_pointer() + user_mode.context().instruction_pointer() ); - debug!("[Task entry] rsp = 0x{:x}", user_space.stack_pointer()); - debug!("[Task entry] rax = 0x{:x}", user_space.syscall_ret()); + debug!("[Task entry] rsp = 0x{:x}", user_mode.context().stack_pointer()); + debug!("[Task entry] rax = 0x{:x}", user_mode.context().syscall_ret()); loop { let user_event = user_mode.execute(); let context = user_mode.context_mut();