update ch4-6

wyfcyx · wyfcyx · commit fffe2e0f3a23 · 2023-03-04T21:10:54.000+08:00
diff --git a/source/chapter4/6multitasking-based-on-as.rst b/source/chapter4/6multitasking-based-on-as.rst
@@ -693,7 +693,11 @@
             vpn.step();
             let mut end_va: VirtAddr = vpn.into();
             end_va = end_va.min(VirtAddr::from(end));
-            v.push(&ppn.get_bytes_array()[start_va.page_offset()..end_va.page_offset()]);
+            if end_va.page_offset() == 0 {
+                v.push(&mut ppn.get_bytes_array()[start_va.page_offset()..]);
+            } else {
+                v.push(&mut ppn.get_bytes_array()[start_va.page_offset()..end_va.page_offset()]);
+            }
             start = end_va.into();
         }
         v

Original file line number	Diff line number	Diff line change
`@@ -693,7 +693,11 @@`
`693`	`693`	`vpn.step();`
`694`	`694`	`let mut end_va: VirtAddr = vpn.into();`
`695`	`695`	`end_va = end_va.min(VirtAddr::from(end));`
`696`		`- v.push(&ppn.get_bytes_array()[start_va.page_offset()..end_va.page_offset()]);`
	`696`	`+ if end_va.page_offset() == 0 {`
	`697`	`+ v.push(&mut ppn.get_bytes_array()[start_va.page_offset()..]);`
	`698`	`+ } else {`
	`699`	`+ v.push(&mut ppn.get_bytes_array()[start_va.page_offset()..end_va.page_offset()]);`
	`700`	`+ }`
`697`	`701`	`start = end_va.into();`
`698`	`702`	`}`
`699`	`703`	`v`