summaryrefslogtreecommitdiff
path: root/kernel/vm.c
diff options
context:
space:
mode:
authorMole Shang <[email protected]>2024-02-11 14:44:22 +0800
committerMole Shang <[email protected]>2024-02-11 16:06:15 +0800
commit2fe04bc8faa4bf737a86c36a8017473e84814f3b (patch)
tree2146d3dae86f21060e2e807ad364f5a949fd1c53 /kernel/vm.c
parent5ce1f630132d8b7b35b9dc46b4a55f860eb85d5c (diff)
parent48a5e34fcd07852b4a68825ce8e37feb6f6d04d7 (diff)
downloadxv6-labs-2fe04bc8faa4bf737a86c36a8017473e84814f3b.tar.gz
xv6-labs-2fe04bc8faa4bf737a86c36a8017473e84814f3b.tar.bz2
xv6-labs-2fe04bc8faa4bf737a86c36a8017473e84814f3b.zip
Merge branch 'traps' into cow
Conflicts: .gitignore Makefile conf/lab.mk
Diffstat (limited to 'kernel/vm.c')
-rw-r--r--kernel/vm.c27
1 files changed, 27 insertions, 0 deletions
diff --git a/kernel/vm.c b/kernel/vm.c
index 5c31e87..9c17fe7 100644
--- a/kernel/vm.c
+++ b/kernel/vm.c
@@ -449,3 +449,30 @@ copyinstr(pagetable_t pagetable, char *dst, uint64 srcva, uint64 max)
return -1;
}
}
+
+static void
+walkprint(pagetable_t pgtbl, int level)
+{
+ for(int i = 0; i < 512; i++){
+ pte_t pte = pgtbl[i];
+ if(pte & PTE_V){
+ for(int j = 0; j < level; j++){
+ printf(" ..");
+ }
+ printf("%d: pte %p pa %p\n", i, pte, PTE2PA(pte));
+ if((pte & (PTE_R|PTE_W|PTE_X)) == 0){
+ // this PTE points to a lower-level page table.
+ walkprint((pagetable_t)PTE2PA(pte), level+1);
+ }
+ }
+ }
+}
+
+// Print the contents of a page table
+void
+vmprint(pagetable_t pgtbl)
+{
+ printf("page table %p\n", pgtbl);
+
+ walkprint(pgtbl, 1);
+}