diff --git a/ch8/os/drivers/block/index.html b/ch8/os/drivers/block/index.html index 246f4994..a231a5d6 100644 --- a/ch8/os/drivers/block/index.html +++ b/ch8/os/drivers/block/index.html @@ -5,7 +5,7 @@

Module os::drivers::block

source · [−]

Re-exports

-
pub use virtio_blk::VirtIOBlock;
pub use sdcard::SDCardWrapper;

Modules

+
pub use sdcard::SDCardWrapper;
pub use virtio_blk::VirtIOBlock;

Modules

sdcard 🔒
virtio_blk 🔒

Structs

BLOCK_DEVICE

Functions

block_device_test
diff --git a/ch8/os/mm/memory_set/fn.remap_test.html b/ch8/os/mm/memory_set/fn.remap_test.html index e68483f1..37ea1f17 100644 --- a/ch8/os/mm/memory_set/fn.remap_test.html +++ b/ch8/os/mm/memory_set/fn.remap_test.html @@ -4,5 +4,5 @@
-

Function os::mm::memory_set::remap_test

source · [−]
pub fn remap_test()
+

Function os::mm::memory_set::remap_test

source · [−]
pub fn remap_test()
\ No newline at end of file diff --git a/ch8/os/mm/memory_set/index.html b/ch8/os/mm/memory_set/index.html index 9c2006f2..790a366c 100644 --- a/ch8/os/mm/memory_set/index.html +++ b/ch8/os/mm/memory_set/index.html @@ -4,7 +4,7 @@
-

Module os::mm::memory_set

source · [−]

Structs

+

Module os::mm::memory_set

source · [−]

Structs

KERNEL_SPACE
MapArea
MapPermission
MemorySet

Enums

MapType

Functions

ebss 🔒 ⚠
edata 🔒 ⚠
ekernel 🔒 ⚠
erodata 🔒 ⚠
etext 🔒 ⚠
kernel_token
remap_test
sbss_with_stack 🔒 ⚠
sdata 🔒 ⚠
srodata 🔒 ⚠
stext 🔒 ⚠
strampoline 🔒 ⚠
diff --git a/ch8/src/os/boards/qemu.rs.html b/ch8/src/os/boards/qemu.rs.html index 13672cff..fac00b73 100644 --- a/ch8/src/os/boards/qemu.rs.html +++ b/ch8/src/os/boards/qemu.rs.html @@ -8,13 +8,11 @@ 3 4 5 -6 
pub const CLOCK_FREQ: usize = 12500000;
 
 pub const MMIO: &[(usize, usize)] = &[(0x10001000, 0x1000)];
 
 pub type BlockDeviceImpl = crate::drivers::block::VirtIOBlock;
-
\ No newline at end of file diff --git a/ch8/src/os/config.rs.html b/ch8/src/os/config.rs.html index f15073ed..66a33366 100644 --- a/ch8/src/os/config.rs.html +++ b/ch8/src/os/config.rs.html @@ -16,7 +16,6 @@ 11 12 13 -14 
#[allow(unused)]
 
 pub const USER_STACK_SIZE: usize = 4096 * 2;
@@ -30,7 +29,6 @@
 pub const TRAP_CONTEXT_BASE: usize = TRAMPOLINE - PAGE_SIZE;
 
 pub use crate::board::{CLOCK_FREQ, MMIO};
-
\ No newline at end of file diff --git a/ch8/src/os/drivers/block/mod.rs.html b/ch8/src/os/drivers/block/mod.rs.html index 3b38b5c5..bdff2da9 100644 --- a/ch8/src/os/drivers/block/mod.rs.html +++ b/ch8/src/os/drivers/block/mod.rs.html @@ -36,13 +36,13 @@ 
mod sdcard;
 mod virtio_blk;
 
-pub use virtio_blk::VirtIOBlock;
 pub use sdcard::SDCardWrapper;
+pub use virtio_blk::VirtIOBlock;
 
+use crate::board::BlockDeviceImpl;
 use alloc::sync::Arc;
 use easy_fs::BlockDevice;
 use lazy_static::*;
-use crate::board::BlockDeviceImpl;
 
 lazy_static! {
     pub static ref BLOCK_DEVICE: Arc<dyn BlockDevice> = Arc::new(BlockDeviceImpl::new());
diff --git a/ch8/src/os/mm/memory_set.rs.html b/ch8/src/os/mm/memory_set.rs.html
index 3e25e5c1..c9e337cf 100644
--- a/ch8/src/os/mm/memory_set.rs.html
+++ b/ch8/src/os/mm/memory_set.rs.html
@@ -373,12 +373,6 @@
 368
 369
 370
-371
-372
-373
-374
-375
-376
 
use super::{frame_alloc, FrameTracker};
 use super::{PTEFlags, PageTable, PageTableEntry};
 use super::{PhysAddr, PhysPageNum, VirtAddr, VirtPageNum};
@@ -732,27 +726,21 @@
     let mid_text: VirtAddr = ((stext as usize + etext as usize) / 2).into();
     let mid_rodata: VirtAddr = ((srodata as usize + erodata as usize) / 2).into();
     let mid_data: VirtAddr = ((sdata as usize + edata as usize) / 2).into();
-    assert!(
-        !kernel_space
-            .page_table
-            .translate(mid_text.floor())
-            .unwrap()
-            .writable(),
-    );
-    assert!(
-        !kernel_space
-            .page_table
-            .translate(mid_rodata.floor())
-            .unwrap()
-            .writable(),
-    );
-    assert!(
-        !kernel_space
-            .page_table
-            .translate(mid_data.floor())
-            .unwrap()
-            .executable(),
-    );
+    assert!(!kernel_space
+        .page_table
+        .translate(mid_text.floor())
+        .unwrap()
+        .writable(),);
+    assert!(!kernel_space
+        .page_table
+        .translate(mid_rodata.floor())
+        .unwrap()
+        .writable(),);
+    assert!(!kernel_space
+        .page_table
+        .translate(mid_data.floor())
+        .unwrap()
+        .executable(),);
     println!("remap_test passed!");
 }