From d448fd5e6cb6595d70172195afaee56c5097e4ed Mon Sep 17 00:00:00 2001 From: Frans Kaashoek Date: Tue, 2 Oct 2018 08:36:02 -0400 Subject: Simplify by freeing user part of addres pace in one page increments. This undoes commit ffe444 and 052e18, which skipped page directories, but was tailored to two-level page table. Undoing doesn't seem to affect boottime for xv6 visibly. --- mmu.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'mmu.h') diff --git a/mmu.h b/mmu.h index 544de31..fdc9924 100644 --- a/mmu.h +++ b/mmu.h @@ -95,7 +95,6 @@ struct segdesc { #define NPDENTRIES 512 // # directory entries per page directory #define PGSIZE 4096 // bytes mapped by a page #define PGSHIFT 12 // offset of PTX in a linear address -#define PDXSHIFT 21 // offset of PDX in a linear address #define PXMASK 0x1FF #define PXSHIFT(n) (PGSHIFT+(9*(n))) @@ -103,9 +102,6 @@ struct segdesc { #define PX(n, va) ((((uint64) (va)) >> PXSHIFT(n)) & PXMASK) #define L_PML4 3 -// construct virtual address from indexes and offset -#define PGADDR(d, t, o) ((uint64)((d) << PDXSHIFT | (t) << PGSHIFT | (o))) - #define PGROUNDUP(sz) (((sz)+PGSIZE-1) & ~(PGSIZE-1)) #define PGROUNDDOWN(a) (((a)) & ~(PGSIZE-1)) -- cgit v1.2.3