Skip to content

Commit 84cd8d9

Browse files
arch/riscv: Updated the UserspaceKernelBoundary implementation
Signed-off-by: Ioan-Cristian CÎRSTEA <ioan.cirstea@oxidos.io>
1 parent 81545b3 commit 84cd8d9

1 file changed

Lines changed: 0 additions & 19 deletions

File tree

arch/riscv/src/syscall.rs

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ use kernel::errorcode::ErrorCode;
1313
use kernel::memory_management::pointers::{
1414
ImmutableKernelVirtualPointer,
1515
ImmutableUserVirtualPointer,
16-
MutableKernelVirtualPointer,
17-
MutableUserVirtualPointer,
1816
};
1917
use kernel::syscall::ContextSwitchReason;
2018

@@ -152,18 +150,10 @@ impl kernel::syscall::UserspaceKernelBoundary for SysCall {
152150
Ok(())
153151
}
154152

155-
fn get_sp(&self, state: &mut Self::StoredState) -> MutableUserVirtualPointer<u8> {
156-
// SAFETY: `esp` is a valid user pointer
157-
unsafe { MutableUserVirtualPointer::new_from_raw(state.regs[R_SP] as *mut u8) }.unwrap()
158-
}
159-
160153
unsafe fn set_syscall_return_value(
161154
&self,
162-
_kernel_accessible_memory_start: &ImmutableKernelVirtualPointer<u8>,
163-
_kernel_app_brk: &ImmutableKernelVirtualPointer<u8>,
164155
_user_accessible_memory_start: &ImmutableUserVirtualPointer<u8>,
165156
_user_app_brk: &ImmutableUserVirtualPointer<u8>,
166-
_sp: &MutableKernelVirtualPointer<u8>,
167157
state: &mut Self::StoredState,
168158
return_value: kernel::syscall::SyscallReturn,
169159
) -> Result<(), ()> {
@@ -201,11 +191,8 @@ impl kernel::syscall::UserspaceKernelBoundary for SysCall {
201191

202192
unsafe fn set_process_function(
203193
&self,
204-
_kernel_accessible_memory_start: &ImmutableKernelVirtualPointer<u8>,
205-
_kernel_app_brk: &ImmutableKernelVirtualPointer<u8>,
206194
_user_accessible_memory_start: &ImmutableUserVirtualPointer<u8>,
207195
_user_app_brk: &ImmutableUserVirtualPointer<u8>,
208-
_sp: &MutableKernelVirtualPointer<u8>,
209196
state: &mut Riscv32iStoredState,
210197
callback: kernel::process::FunctionCall,
211198
) -> Result<(), ()> {
@@ -234,11 +221,8 @@ impl kernel::syscall::UserspaceKernelBoundary for SysCall {
234221
#[cfg(not(any(doc, all(target_arch = "riscv32", target_os = "none"))))]
235222
unsafe fn switch_to_process(
236223
&self,
237-
_kernel_accessible_memory_start: &ImmutableKernelVirtualPointer<u8>,
238-
_kernel_app_brk: &ImmutableKernelVirtualPointer<u8>,
239224
_user_accessible_memory_start: &ImmutableUserVirtualPointer<u8>,
240225
_user_app_brk: &ImmutableUserVirtualPointer<u8>,
241-
_sp: &MutableKernelVirtualPointer<u8>,
242226
_state: &mut Riscv32iStoredState,
243227
) -> (ContextSwitchReason, Option<*const u8>) {
244228
// Convince lint that 'mcause' and 'R_A4' are used during test build
@@ -250,11 +234,8 @@ impl kernel::syscall::UserspaceKernelBoundary for SysCall {
250234
#[cfg(any(doc, all(target_arch = "riscv32", target_os = "none")))]
251235
unsafe fn switch_to_process(
252236
&self,
253-
_kernel_accessible_memory_start: &ImmutableKernelVirtualPointer<u8>,
254-
_kernel_app_brk: &ImmutableKernelVirtualPointer<u8>,
255237
_user_accessible_memory_start: &ImmutableUserVirtualPointer<u8>,
256238
_user_app_brk: &ImmutableUserVirtualPointer<u8>,
257-
_sp: &MutableKernelVirtualPointer<u8>,
258239
state: &mut Riscv32iStoredState,
259240
) -> (ContextSwitchReason, Option<ImmutableUserVirtualPointer<u8>>) {
260241
use core::arch::asm;

0 commit comments

Comments
 (0)