From owner-p4-projects@FreeBSD.ORG Thu May 22 21:04:58 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 10AF837B404; Thu, 22 May 2003 21:04:58 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 85D4A37B401 for ; Thu, 22 May 2003 21:04:57 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2358143F85 for ; Thu, 22 May 2003 21:04:57 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h4N44u0U009985 for ; Thu, 22 May 2003 21:04:56 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4N44uaC009982 for perforce@freebsd.org; Thu, 22 May 2003 21:04:56 -0700 (PDT) Date: Thu, 22 May 2003 21:04:56 -0700 (PDT) Message-Id: <200305230404.h4N44uaC009982@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 31674 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 May 2003 04:04:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=31674 Change 31674 by peter@peter_hammer on 2003/05/22 21:04:40 use vm_pindex_t (uint64_t) for page indexes since multi-terrabyte VM is on the way. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#13 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#13 (text+ko) ==== @@ -217,7 +217,7 @@ static vm_page_t pmap_allocpte(pmap_t pmap, vm_offset_t va); -static vm_page_t _pmap_allocpte(pmap_t pmap, unsigned ptepindex); +static vm_page_t _pmap_allocpte(pmap_t pmap, vm_pindex_t ptepindex); static vm_page_t pmap_page_lookup(vm_object_t object, vm_pindex_t pindex); static int pmap_unuse_pt(pmap_t, vm_offset_t, vm_page_t); static vm_offset_t pmap_kmem_choose(vm_offset_t addr); @@ -246,7 +246,7 @@ /********************/ /* Return a non-clipped PD index for a given VA */ -static __inline unsigned long +static __inline vm_pindex_t pmap_pde_pindex(vm_offset_t va) { return va >> PDRSHIFT; @@ -254,28 +254,28 @@ /* Return various clipped indexes for a given VA */ -static __inline int +static __inline vm_pindex_t pmap_pte_index(vm_offset_t va) { return ((va >> PAGE_SHIFT) & ((1ul << NPTEPGSHIFT) - 1)); } -static __inline int +static __inline vm_pindex_t pmap_pde_index(vm_offset_t va) { return ((va >> PDRSHIFT) & ((1ul << NPDEPGSHIFT) - 1)); } -static __inline int +static __inline vm_pindex_t pmap_pdpe_index(vm_offset_t va) { return ((va >> PDPSHIFT) & ((1ul << NPDPEPGSHIFT) - 1)); } -static __inline int +static __inline vm_pindex_t pmap_pml4e_index(vm_offset_t va) { @@ -1185,7 +1185,7 @@ static int pmap_unuse_pt(pmap_t pmap, vm_offset_t va, vm_page_t mpte) { - unsigned long ptepindex; + vm_pindex_t ptepindex; if (va >= VM_MAXUSER_ADDRESS) return 0; @@ -1286,7 +1286,7 @@ static vm_page_t _pmap_allocpte(pmap, ptepindex) pmap_t pmap; - unsigned ptepindex; + vm_pindex_t ptepindex; { vm_page_t m, pdppg, pdpg; @@ -1314,7 +1314,7 @@ if (ptepindex >= (NUPDE + NUPDPE)) { pml4_entry_t *pml4; - unsigned pml4index; + vm_pindex_t pml4index; /* Wire up a new PDPE page */ pml4index = ptepindex - (NUPDE + NUPDPE); @@ -1322,8 +1322,8 @@ *pml4 = VM_PAGE_TO_PHYS(m) | PG_U | PG_RW | PG_V | PG_A | PG_M; } else if (ptepindex >= NUPDE) { - unsigned pml4index; - unsigned pdpindex; + vm_pindex_t pml4index; + vm_pindex_t pdpindex; pml4_entry_t *pml4; pdp_entry_t *pdp; @@ -1347,8 +1347,8 @@ *pdp = VM_PAGE_TO_PHYS(m) | PG_U | PG_RW | PG_V | PG_A | PG_M; } else { - unsigned pml4index; - unsigned pdpindex; + vm_pindex_t pml4index; + vm_pindex_t pdpindex; pml4_entry_t *pml4; pdp_entry_t *pdp; pd_entry_t *pd; @@ -1401,7 +1401,7 @@ static vm_page_t pmap_allocpte(pmap_t pmap, vm_offset_t va) { - unsigned long ptepindex; + vm_pindex_t ptepindex; pd_entry_t *pd; vm_page_t m; @@ -2158,7 +2158,7 @@ * resident, we are creating it here. */ if (va < VM_MAXUSER_ADDRESS) { - unsigned ptepindex; + vm_pindex_t ptepindex; pd_entry_t *ptepa; /* @@ -2545,7 +2545,7 @@ pt_entry_t *src_pte, *dst_pte; vm_page_t dstmpte, srcmpte; pd_entry_t srcptepaddr, *pde; - unsigned ptepindex; + vm_pindex_t ptepindex; if (addr >= UPT_MIN_ADDRESS) panic("pmap_copy: invalid to pmap_copy page tables\n");