From 9c227174afd28b5e889913a31c66cd97ffcc96b8 Mon Sep 17 00:00:00 2001 From: Yifan Wu Date: Thu, 30 Mar 2023 22:56:11 +0800 Subject: [PATCH] cargo fmt --- user/src/bin/sbrk_test.rs | 10 ++++++---- user/src/syscall.rs | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/user/src/bin/sbrk_test.rs b/user/src/bin/sbrk_test.rs index af21bd1..780693d 100644 --- a/user/src/bin/sbrk_test.rs +++ b/user/src/bin/sbrk_test.rs @@ -4,8 +4,8 @@ #[macro_use] extern crate user_lib; -use user_lib::sbrk; use core::ptr::slice_from_raw_parts_mut; +use user_lib::sbrk; #[no_mangle] fn main() -> i32 { @@ -15,12 +15,14 @@ fn main() -> i32 { println!("origin break point = {:x}", origin_brk); let brk = sbrk(PAGE_SIZE as i32); if brk != origin_brk { - return -1 + return -1; } let brk = sbrk(0); println!("one page allocated, break point = {:x}", brk); println!("try write to allocated page"); - let new_page = unsafe { &mut *slice_from_raw_parts_mut(origin_brk as usize as *const u8 as *mut u8, PAGE_SIZE) }; + let new_page = unsafe { + &mut *slice_from_raw_parts_mut(origin_brk as usize as *const u8 as *mut u8, PAGE_SIZE) + }; for pos in 0..PAGE_SIZE { new_page[pos] = 1; } @@ -35,7 +37,7 @@ fn main() -> i32 { let ret = sbrk(PAGE_SIZE as i32 * -1); if ret != -1 { println!("Test sbrk failed!"); - return -1 + return -1; } println!("Test sbrk almost OK!"); println!("now write to deallocated page, should cause page fault."); diff --git a/user/src/syscall.rs b/user/src/syscall.rs index 73f936b..31144b9 100644 --- a/user/src/syscall.rs +++ b/user/src/syscall.rs @@ -38,4 +38,4 @@ pub fn sys_get_time() -> isize { pub fn sys_sbrk(size: i32) -> isize { syscall(SYSCALL_SBRK, [size as usize, 0, 0]) -} \ No newline at end of file +}