[src/trunk]: src/sys/arch Change pcb32_pagedir to a paddr_t (after all, it's ...

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6423a450213a
branches:  trunk
changeset: 543373:6423a450213a
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sun Feb 23 23:40:01 2003 +0000

description:
Change pcb32_pagedir to a paddr_t (after all, it's used as a paddr_t
everywhere in the code).

diffstat:

 sys/arch/acorn32/acorn32/hydra.c   |   6 +++---
 sys/arch/arm/arm32/arm32_machdep.c |   4 ++--
 sys/arch/arm/arm32/pmap.c          |  15 ++++++++-------
 sys/arch/arm/include/pcb.h         |   4 ++--
 4 files changed, 15 insertions(+), 14 deletions(-)

diffs (102 lines):

diff -r 781c75c990f4 -r 6423a450213a sys/arch/acorn32/acorn32/hydra.c
--- a/sys/arch/acorn32/acorn32/hydra.c  Sun Feb 23 23:36:35 2003 +0000
+++ b/sys/arch/acorn32/acorn32/hydra.c  Sun Feb 23 23:40:01 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hydra.c,v 1.14 2003/01/01 00:25:01 thorpej Exp $       */
+/*     $NetBSD: hydra.c,v 1.15 2003/02/23 23:40:02 thorpej Exp $       */
 
 /*-
  * Copyright (c) 2002 Ben Harris
@@ -29,7 +29,7 @@
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(0, "$NetBSD: hydra.c,v 1.14 2003/01/01 00:25:01 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hydra.c,v 1.15 2003/02/23 23:40:02 thorpej Exp $");
 
 #include <sys/device.h>
 #include <sys/systm.h>
@@ -326,7 +326,7 @@
            hydra_ehatchcode - hydra_hatchcode);
        KASSERT(hydra_ehatchcode - hydra_hatchcode <= HYDRABOOT_VARS);
        hb = (struct hydraboot_vars *)(sc->sc_bootpage_va + HYDRABOOT_VARS);
-       hb->hb_ttb = (paddr_t)cpu->sc_cpuinfo.ci_idlepcb->pcb_pagedir;
+       hb->hb_ttb = cpu->sc_cpuinfo.ci_idlepcb->pcb_pagedir;
        hb->hb_bootpage_pa = sc->sc_bootpage_pa;
        hb->hb_sp = cpu->sc_cpuinfo.ci_idlepcb->pcb_un.un_32.pcb32_sp;
        hb->hb_entry = &cpu_hydra_hatch;
diff -r 781c75c990f4 -r 6423a450213a sys/arch/arm/arm32/arm32_machdep.c
--- a/sys/arch/arm/arm32/arm32_machdep.c        Sun Feb 23 23:36:35 2003 +0000
+++ b/sys/arch/arm/arm32/arm32_machdep.c        Sun Feb 23 23:40:01 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: arm32_machdep.c,v 1.27 2003/01/17 22:28:49 thorpej Exp $       */
+/*     $NetBSD: arm32_machdep.c,v 1.28 2003/02/23 23:40:01 thorpej Exp $       */
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -330,7 +330,7 @@
        curpcb->pcb_un.un_32.pcb32_sp = (u_int)lwp0.l_addr +
            USPACE_SVC_STACK_TOP;
        (void) pmap_extract(pmap_kernel(), (vaddr_t)(pmap_kernel())->pm_pdir,
-           (paddr_t *)&curpcb->pcb_pagedir);
+           &curpcb->pcb_pagedir);
 
         curpcb->pcb_tf = (struct trapframe *)curpcb->pcb_un.un_32.pcb32_sp - 1;
 }
diff -r 781c75c990f4 -r 6423a450213a sys/arch/arm/arm32/pmap.c
--- a/sys/arch/arm/arm32/pmap.c Sun Feb 23 23:36:35 2003 +0000
+++ b/sys/arch/arm/arm32/pmap.c Sun Feb 23 23:40:01 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.125 2003/02/21 00:23:03 chris Exp $ */
+/*     $NetBSD: pmap.c,v 1.126 2003/02/23 23:40:01 thorpej Exp $       */
 
 /*
  * Copyright (c) 2002 Wasabi Systems, Inc.
@@ -143,7 +143,7 @@
 #include <machine/param.h>
 #include <arm/arm32/katelib.h>
 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.125 2003/02/21 00:23:03 chris Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.126 2003/02/23 23:40:01 thorpej Exp $");
 
 #ifdef PMAP_DEBUG
 #define        PDEBUG(_lev_,_stat_) \
@@ -1697,14 +1697,15 @@
        struct pcb *pcb = &l->l_addr->u_pcb;
 
        (void) pmap_extract(pmap_kernel(), (vaddr_t)pmap->pm_pdir,
-           (paddr_t *)&pcb->pcb_pagedir);
-
-       PDEBUG(0, printf("pmap_activate: l=%p pmap=%p pcb=%p pdir=%p l1=%p\n",
-           l, pmap, pcb, pmap->pm_pdir, pcb->pcb_pagedir));
+           &pcb->pcb_pagedir);
+
+       PDEBUG(0,
+           printf("pmap_activate: l=%p pmap=%p pcb=%p pdir=%p l1=0x%lx\n",
+           l, pmap, pcb, pmap->pm_pdir, (u_long) pcb->pcb_pagedir));
 
        if (l == curlwp) {
                PDEBUG(0, printf("pmap_activate: setting TTB\n"));
-               setttb((u_int)pcb->pcb_pagedir);
+               setttb(pcb->pcb_pagedir);
        }
 }
 
diff -r 781c75c990f4 -r 6423a450213a sys/arch/arm/include/pcb.h
--- a/sys/arch/arm/include/pcb.h        Sun Feb 23 23:36:35 2003 +0000
+++ b/sys/arch/arm/include/pcb.h        Sun Feb 23 23:40:01 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pcb.h,v 1.6 2002/10/19 00:10:54 bjh21 Exp $    */
+/*     $NetBSD: pcb.h,v 1.7 2003/02/23 23:40:02 thorpej Exp $  */
 
 /*
  * Copyright (c) 2001 Matt Thomas <matt%3am-software.com@localhost>.
@@ -44,7 +44,7 @@
 struct trapframe;
 
 struct pcb_arm32 {
-       pd_entry_t *pcb32_pagedir;              /* PT hooks */
+       paddr_t pcb32_pagedir;                  /* PT hooks */
        u_int   pcb32_r8;                       /* used */
        u_int   pcb32_r9;                       /* used */
        u_int   pcb32_r10;                      /* used */