[src/trunk]: src/sys/arch/hpcarm/hpcarm Catch up long ago arm32 change: vm_of...

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

details:   https://anonhg.NetBSD.org/src/rev/a12dbe5ef7b1
branches:  trunk
changeset: 511887:a12dbe5ef7b1
user:      toshii <toshii%NetBSD.org@localhost>
date:      Fri Jun 29 02:40:28 2001 +0000

description:
Catch up long ago arm32 change: vm_offset_t -> {p,v}addr_t.

diffstat:

 sys/arch/hpcarm/hpcarm/fault.c       |  16 ++++----
 sys/arch/hpcarm/hpcarm/hpc_machdep.c |  22 +++++-----
 sys/arch/hpcarm/hpcarm/machdep.c     |  68 ++++++++++++++++++------------------
 sys/arch/hpcarm/hpcarm/mem.c         |  10 ++--
 sys/arch/hpcarm/hpcarm/stubs.c       |   4 +-
 sys/arch/hpcarm/hpcarm/vm_machdep.c  |  14 +++---
 6 files changed, 67 insertions(+), 67 deletions(-)

diffs (truncated from 399 to 300 lines):

diff -r 2499b671aecd -r a12dbe5ef7b1 sys/arch/hpcarm/hpcarm/fault.c
--- a/sys/arch/hpcarm/hpcarm/fault.c    Fri Jun 29 02:38:32 2001 +0000
+++ b/sys/arch/hpcarm/hpcarm/fault.c    Fri Jun 29 02:40:28 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fault.c,v 1.7 2001/06/19 13:42:17 wiz Exp $    */
+/*     $NetBSD: fault.c,v 1.8 2001/06/29 02:40:28 toshii Exp $ */
 
 /*
  * Copyright (c) 1994-1997 Mark Brinicombe.
@@ -70,9 +70,9 @@
 extern int pmap_debug_level;
 #endif /* PMAP_DEBUG */
 
-int pmap_modified_emulation __P((pmap_t, vm_offset_t));
-int pmap_handled_emulation __P((pmap_t, vm_offset_t));
-pt_entry_t *pmap_pte __P((pmap_t pmap, vm_offset_t va));
+int pmap_modified_emulation __P((pmap_t, vaddr_t));
+int pmap_handled_emulation __P((pmap_t, vaddr_t));
+pt_entry_t *pmap_pte __P((pmap_t pmap, vaddr_t va));
 int cowfault __P((vaddr_t));
 
 int fetchuserword __P((u_int address, u_int *location));
@@ -328,14 +328,14 @@
         * the page and possibly the page table page.
         */
        {
-               register vm_offset_t va;
+               register vaddr_t va;
                register struct vmspace *vm = p->p_vmspace;
                register struct vm_map *map;
                int rv;
                vm_prot_t ftype;
                extern struct vm_map *kernel_map;
 
-               va = trunc_page((vm_offset_t)fault_address);
+               va = trunc_page((vaddr_t)fault_address);
 
 #ifdef PMAP_DEBUG
                if (pmap_debug_level >= 0)
@@ -570,7 +570,7 @@
 
        /* Is the page already mapped ? */
        /* This is debugging for rev K SA110 silicon */
-       pte = pmap_pte(p->p_vmspace->vm_map.pmap, (vm_offset_t)fault_pc);
+       pte = pmap_pte(p->p_vmspace->vm_map.pmap, (vaddr_t)fault_pc);
        if (pte && *pte != 0) {
                if (kernel_debug & 1) {
                        printf("prefetch_abort: page is already mapped - pte=%p *pte=%08x\n",
@@ -604,7 +604,7 @@
                        disassemble(fault_pc);
                        printf("return addr=%08x", frame->tf_pc);
                        pte = pmap_pte(p->p_vmspace->vm_map.pmap,
-                           (vm_offset_t)fault_pc);
+                           (vaddr_t)fault_pc);
                        if (pte)
                                printf(" pte=%p *pte=%08x\n", pte, *pte);
                        else
diff -r 2499b671aecd -r a12dbe5ef7b1 sys/arch/hpcarm/hpcarm/hpc_machdep.c
--- a/sys/arch/hpcarm/hpcarm/hpc_machdep.c      Fri Jun 29 02:38:32 2001 +0000
+++ b/sys/arch/hpcarm/hpcarm/hpc_machdep.c      Fri Jun 29 02:40:28 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hpc_machdep.c,v 1.14 2001/06/19 13:45:55 wiz Exp $     */
+/*     $NetBSD: hpc_machdep.c,v 1.15 2001/06/29 02:40:28 toshii Exp $  */
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -143,7 +143,7 @@
 char *boot_args = NULL;
 char *boot_file = NULL;
 
-vm_offset_t msgbufphys;
+vaddr_t msgbufphys;
 
 extern u_int data_abort_handler_address;
 extern u_int prefetch_abort_handler_address;
@@ -180,14 +180,14 @@
 void physcon_display_base      __P((u_int addr));
 extern void consinit           __P((void));
 
-void map_section       __P((vm_offset_t pt, vm_offset_t va, vm_offset_t pa,
+void map_section       __P((vaddr_t pt, vaddr_t va, vaddr_t pa,
                             int cacheable));
-void map_pagetable     __P((vm_offset_t pt, vm_offset_t va, vm_offset_t pa));
-void map_entry         __P((vm_offset_t pt, vm_offset_t va, vm_offset_t pa));
-void map_entry_nc      __P((vm_offset_t pt, vm_offset_t va, vm_offset_t pa));
-void map_entry_ro      __P((vm_offset_t pt, vm_offset_t va, vm_offset_t pa));
-vm_size_t map_chunk    __P((vm_offset_t pd, vm_offset_t pt, vm_offset_t va,
-                            vm_offset_t pa, vm_size_t size, u_int acc,
+void map_pagetable     __P((vaddr_t pt, vaddr_t va, vaddr_t pa));
+void map_entry         __P((vaddr_t pt, vaddr_t va, vaddr_t pa));
+void map_entry_nc      __P((vaddr_t pt, vaddr_t va, vaddr_t pa));
+void map_entry_ro      __P((vaddr_t pt, vaddr_t va, vaddr_t pa));
+vm_size_t map_chunk    __P((vaddr_t pd, vaddr_t pt, vaddr_t va,
+                            vaddr_t pa, vm_size_t size, u_int acc,
                             u_int flg));
 
 void data_abort_handler                __P((trapframe_t *frame));
@@ -211,7 +211,7 @@
 extern int db_trapper();
 
 extern void dump_spl_masks     __P((void));
-extern pt_entry_t *pmap_pte    __P((pmap_t pmap, vm_offset_t va));
+extern pt_entry_t *pmap_pte    __P((pmap_t pmap, vaddr_t va));
 extern void db_machine_init    __P((void));
 
 extern void dumpsys    __P((void));
@@ -304,7 +304,7 @@
        u_int kerneldatasize, symbolsize;
        u_int l1pagetable;
        u_int l2pagetable;
-       vm_offset_t freemempos;
+       vaddr_t freemempos;
        extern char page0[], page0_end[];
        pv_addr_t kernel_l1pt;
        pv_addr_t kernel_ptpt;
diff -r 2499b671aecd -r a12dbe5ef7b1 sys/arch/hpcarm/hpcarm/machdep.c
--- a/sys/arch/hpcarm/hpcarm/machdep.c  Fri Jun 29 02:38:32 2001 +0000
+++ b/sys/arch/hpcarm/hpcarm/machdep.c  Fri Jun 29 02:40:28 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.10 2001/06/02 18:09:12 chs Exp $ */
+/*     $NetBSD: machdep.c,v 1.11 2001/06/29 02:40:28 toshii Exp $      */
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -96,7 +96,7 @@
 
 extern pt_entry_t msgbufpte;
 caddr_t        msgbufaddr;
-extern vm_offset_t msgbufphys;
+extern paddr_t msgbufphys;
 
 #ifdef PMAP_DEBUG
 extern int pmap_debug_level;
@@ -112,12 +112,12 @@
 
 void consinit          __P((void));
 
-void map_section       __P((vm_offset_t pt, vm_offset_t va, vm_offset_t pa,
+void map_section       __P((vaddr_t pt, vaddr_t va, paddr_t pa,
                             int cacheable));
-void map_pagetable     __P((vm_offset_t pt, vm_offset_t va, vm_offset_t pa));
-void map_entry         __P((vm_offset_t pt, vm_offset_t va, vm_offset_t pa));
-void map_entry_nc      __P((vm_offset_t pt, vm_offset_t va, vm_offset_t pa));
-void map_entry_ro      __P((vm_offset_t pt, vm_offset_t va, vm_offset_t pa));
+void map_pagetable     __P((vaddr_t pt, vaddr_t va, paddr_t pa));
+void map_entry         __P((vaddr_t pt, vaddr_t va, paddr_t pa));
+void map_entry_nc      __P((vaddr_t pt, vaddr_t va, paddr_t pa));
+void map_entry_ro      __P((vaddr_t pt, vaddr_t va, paddr_t pa));
 
 u_long strtoul                 __P((const char *s, char **ptr, int base));
 void data_abort_handler                __P((trapframe_t *frame));
@@ -125,7 +125,7 @@
 void zero_page_readonly                __P((void));
 void zero_page_readwrite       __P((void));
 extern void configure          __P((void));
-extern pt_entry_t *pmap_pte    __P((pmap_t pmap, vm_offset_t va));
+extern pt_entry_t *pmap_pte    __P((pmap_t pmap, vaddr_t va));
 extern void pmap_postinit      __P((void));
 extern void dumpsys    __P((void));
 #ifdef PMAP_DEBUG
@@ -177,9 +177,9 @@
 
 void
 map_section(pagetable, va, pa, cacheable)
-       vm_offset_t pagetable;
-       vm_offset_t va;
-       vm_offset_t pa;
+       vaddr_t pagetable;
+       vaddr_t va;
+       paddr_t pa;
        int cacheable;
 {
 #ifdef DIAGNOSTIC
@@ -198,9 +198,9 @@
 
 void
 map_pagetable(pagetable, va, pa)
-       vm_offset_t pagetable;
-       vm_offset_t va;
-       vm_offset_t pa;
+       vaddr_t pagetable;
+       vaddr_t va;
+       paddr_t pa;
 {
 #ifdef DIAGNOSTIC
        if ((pa & 0xc00) != 0)
@@ -219,10 +219,10 @@
 
 vm_size_t
 map_chunk(pd, pt, va, pa, size, acc, flg)
-       vm_offset_t pd;
-       vm_offset_t pt;
-       vm_offset_t va;
-       vm_offset_t pa;
+       vaddr_t pd;
+       vaddr_t pt;
+       vaddr_t va;
+       paddr_t pa;
        vm_size_t size;
        u_int acc;
        u_int flg;
@@ -285,9 +285,9 @@
 
 void
 map_entry(pagetable, va, pa)
-       vm_offset_t pagetable;
-       vm_offset_t va;
-       vm_offset_t pa;
+       vaddr_t pagetable;
+       vaddr_t va;
+       paddr_t pa;
 {
        ((pt_entry_t *)pagetable)[((va >> PGSHIFT) & 0x000003ff)] =
            L2_PTE((pa & PG_FRAME), AP_KRW);
@@ -296,9 +296,9 @@
 
 void
 map_entry_nc(pagetable, va, pa)
-       vm_offset_t pagetable;
-       vm_offset_t va;
-       vm_offset_t pa;
+       vaddr_t pagetable;
+       vaddr_t va;
+       paddr_t pa;
 {
        ((pt_entry_t *)pagetable)[((va >> PGSHIFT) & 0x000003ff)] =
            L2_PTE_NC_NB((pa & PG_FRAME), AP_KRW);
@@ -307,9 +307,9 @@
 
 void
 map_entry_ro(pagetable, va, pa)
-       vm_offset_t pagetable;
-       vm_offset_t va;
-       vm_offset_t pa;
+       vaddr_t pagetable;
+       vaddr_t va;
+       paddr_t pa;
 {
        ((pt_entry_t *)pagetable)[((va >> PGSHIFT) & 0x000003ff)] =
            L2_PTE((pa & PG_FRAME), AP_KR);
@@ -327,8 +327,8 @@
 cpu_startup()
 {
        int loop;
-       vm_offset_t minaddr;
-       vm_offset_t maxaddr;
+       paddr_t minaddr;
+       paddr_t maxaddr;
        caddr_t sysbase;
        caddr_t size;
        vm_size_t bufsize;
@@ -360,7 +360,7 @@
        /* msgbufphys was setup during the secondary boot strap */
        for (loop = 0; loop < btoc(MSGBUFSIZE); ++loop)
                pmap_enter(pmap_kernel(),
-                   (vm_offset_t)((caddr_t)msgbufaddr + loop * NBPG),
+                   (vaddr_t)((caddr_t)msgbufaddr + loop * NBPG),
                    msgbufphys + loop * NBPG, VM_PROT_READ|VM_PROT_WRITE,
                    VM_PROT_READ|VM_PROT_WRITE|PMAP_WIRED);
        pmap_update();
@@ -393,12 +393,12 @@
         * in that they usually occupy more virtual memory than physical.
         */
        bufsize = MAXBSIZE * nbuf;
-       if (uvm_map(kernel_map, (vm_offset_t *)&buffers, round_page(bufsize),
+       if (uvm_map(kernel_map, (vaddr_t *)&buffers, round_page(bufsize),
            NULL, UVM_UNKNOWN_OFFSET, 0,
            UVM_MAPFLAG(UVM_PROT_NONE, UVM_PROT_NONE, UVM_INH_NONE,
            UVM_ADV_NORMAL, 0)) != 0)
                panic("cpu_startup: cannot allocate UVM space for buffers");
-       minaddr = (vm_offset_t)buffers;
+       minaddr = (vaddr_t)buffers;
        if ((bufpages / nbuf) >= btoc(MAXBSIZE)) {
                /* don't want to alloc more physical mem than needed */
                bufpages = btoc(MAXBSIZE) * nbuf;
@@ -408,10 +408,10 @@
        residual = bufpages % nbuf;
        for (loop = 0; loop < nbuf; ++loop) {
                vm_size_t curbufsize;
-               vm_offset_t curbuf;
+               vaddr_t curbuf;
                struct vm_page *pg;
 
-               curbuf = (vm_offset_t) buffers + (loop * MAXBSIZE);
+               curbuf = (vaddr_t) buffers + (loop * MAXBSIZE);
                curbufsize = NBPG * ((loop < residual) ? (base+1) : base);
 
                while (curbufsize) {
diff -r 2499b671aecd -r a12dbe5ef7b1 sys/arch/hpcarm/hpcarm/mem.c
--- a/sys/arch/hpcarm/hpcarm/mem.c      Fri Jun 29 02:38:32 2001 +0000
+++ b/sys/arch/hpcarm/hpcarm/mem.c      Fri Jun 29 02:40:28 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mem.c,v 1.2 2001/04/24 04:30:57 thorpej Exp $  */
+/*     $NetBSD: mem.c,v 1.3 2001/06/29 02:40:28 toshii Exp $   */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -89,7 +89,7 @@
        struct uio *uio;
        int flags;