Merge pull request #69 from wei-huan/main

virtaddr -> usize high 256GB addrspace bug fix
2022-04-30 06:16:51 -07:00 · 2022-04-30 06:16:51 -07:00 · 879f5a5ba5
commit 879f5a5ba5
parent a1a4520b23 ae6afe93cb
1 changed files with 5 additions and 1 deletions
--- a/os/src/mm/address.rs
+++ b/os/src/mm/address.rs
@ -83,7 +83,11 @@ impl From<PhysPageNum> for usize {
 }
 impl From<VirtAddr> for usize {
    fn from(v: VirtAddr) -> Self {
-        v.0
+        if v.0 >= (1 << (VA_WIDTH_SV39 - 1)) {
+            v.0 | (!((1 << VA_WIDTH_SV39) - 1))
+        } else {
+            v.0
+        }
    }
 }
 impl From<VirtPageNum> for usize {