From owner-p4-projects@FreeBSD.ORG Wed May 14 14:13:22 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 429C837B404; Wed, 14 May 2003 14:13:22 -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 D477337B401 for ; Wed, 14 May 2003 14:13:21 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7BADC43F3F for ; Wed, 14 May 2003 14:13:21 -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 h4ELDL0U058454 for ; Wed, 14 May 2003 14:13:21 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4ELDLSf058448 for perforce@freebsd.org; Wed, 14 May 2003 14:13:21 -0700 (PDT) Date: Wed, 14 May 2003 14:13:21 -0700 (PDT) Message-Id: <200305142113.h4ELDLSf058448@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 31192 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: Wed, 14 May 2003 21:13:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=31192 Change 31192 by peter@peter_hammer on 2003/05/14 14:12:50 As per jake's suggestion, change PTmap etc to be compile time constants with casts. libkvm won't be happy about this, but its no big deal. I can still export the symbol values ala kernbase so that libkvm can find them in the symbol table. Anyway, this gets around the problem of requiring the symbols be within +/- 2GB of address zero. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/locore.S#2 edit .. //depot/projects/hammer/sys/amd64/include/pmap.h#6 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/locore.S#2 (text+ko) ==== @@ -34,15 +34,6 @@ #include "assym.s" /* - * PTmap is recursive pagemap at top of virtual address space. - * Within PTmap, the page directory can be found (third indirection). - */ - .globl PTmap,PTD,PTDpde - .set PTmap,(PTDPTDI << PDRSHIFT) - .set PTD,PTmap + (PTDPTDI * PAGE_SIZE) - .set PTDpde,PTD + (PTDPTDI * PDESIZE) - -/* * Compiled KERNBASE location */ .globl kernbase ==== //depot/projects/hammer/sys/amd64/include/pmap.h#6 (text+ko) ==== @@ -145,13 +145,9 @@ * in the page tables and the evil overlapping. */ #ifdef _KERNEL -extern pt_entry_t PTmap[]; -extern pd_entry_t PDmap[]; -extern pdp_entry_t PDPmap[]; -extern pml4_entry_t PML4[]; -extern pdp_entry_t PDP[]; -extern pd_entry_t PTD[]; -extern pd_entry_t PTDpde[]; +#define PTmap ((pt_entry_t *)(VADDR(0, 0, PTDPTDI, 0))) +#define PTD ((pd_entry_t *)(VADDR(0, 0, PTDPTDI, PTDPTDI))) +#define PTDpde ((pd_entry_t *)(VADDR(0, 0, PTDPTDI, PTDPTDI) + (PTDPTDI * sizeof(pd_entry_t)))) extern u_int64_t IdlePML4; /* physical address of "Idle" state directory */ extern u_int64_t IdlePDP; /* physical address of "Idle" state directory */