[src/trunk]: src/sys/arch/news68k/news68k Sync with x68k:

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

details:   https://anonhg.NetBSD.org/src/rev/80640fd0578f
branches:  trunk
changeset: 504214:80640fd0578f
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sun Feb 25 13:28:31 2001 +0000

description:
Sync with x68k:
 Use m68k_page_offset and m68k_trunc_page macros,
 instead of using PGOFSET directly.

diffstat:

 sys/arch/news68k/news68k/db_memrw.c    |  4 ++--
 sys/arch/news68k/news68k/mem.c         |  4 ++--
 sys/arch/news68k/news68k/sys_machdep.c |  6 +++---
 sys/arch/news68k/news68k/trap.c        |  4 ++--
 sys/arch/news68k/news68k/vm_machdep.c  |  4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diffs (99 lines):

diff -r bd9e1df2f594 -r 80640fd0578f sys/arch/news68k/news68k/db_memrw.c
--- a/sys/arch/news68k/news68k/db_memrw.c       Sun Feb 25 12:58:36 2001 +0000
+++ b/sys/arch/news68k/news68k/db_memrw.c       Sun Feb 25 13:28:31 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: db_memrw.c,v 1.3 2000/11/08 14:37:08 tsutsui Exp $     */
+/*     $NetBSD: db_memrw.c,v 1.4 2001/02/25 13:28:31 tsutsui Exp $     */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -136,7 +136,7 @@
                 * with this mapping and subtract it from the
                 * total size.
                 */
-               limit = NBPG - ((u_long)dst & PGOFSET);
+               limit = NBPG - m68k_page_offset(dst);
                if (limit > size)
                        limit = size;
                size -= limit;
diff -r bd9e1df2f594 -r 80640fd0578f sys/arch/news68k/news68k/mem.c
--- a/sys/arch/news68k/news68k/mem.c    Sun Feb 25 12:58:36 2001 +0000
+++ b/sys/arch/news68k/news68k/mem.c    Sun Feb 25 13:28:31 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mem.c,v 1.4 2000/06/29 08:02:52 mrg Exp $      */
+/*     $NetBSD: mem.c,v 1.5 2001/02/25 13:28:32 tsutsui Exp $  */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -136,7 +136,7 @@
                            VM_PROT_WRITE;
                        pmap_enter(pmap_kernel(), (vaddr_t)vmmap,
                            trunc_page(v), prot, prot|PMAP_WIRED);
-                       o = uio->uio_offset & PGOFSET;
+                       o = m68k_page_offset(uio->uio_offset);
                        c = min(uio->uio_resid, (int)(NBPG - o));
                        error = uiomove((caddr_t)vmmap + o, c, uio);
                        pmap_remove(pmap_kernel(), (vaddr_t)vmmap,
diff -r bd9e1df2f594 -r 80640fd0578f sys/arch/news68k/news68k/sys_machdep.c
--- a/sys/arch/news68k/news68k/sys_machdep.c    Sun Feb 25 12:58:36 2001 +0000
+++ b/sys/arch/news68k/news68k/sys_machdep.c    Sun Feb 25 13:28:31 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sys_machdep.c,v 1.3 2000/12/13 18:13:09 jdolecek Exp $ */
+/*     $NetBSD: sys_machdep.c,v 1.4 2001/02/25 13:28:32 tsutsui Exp $  */
 
 /*
  * Copyright (c) 1982, 1986, 1993
@@ -100,7 +100,7 @@
                                addr = addr & ~0xF;
                                inc = 16;
                        } else {
-                               addr = addr & ~PGOFSET;
+                               addr = m68k_trunc_page(addr);
                                inc = NBPG;
                        }
                }
@@ -111,7 +111,7 @@
                         * entire cache (XXX is this a rational thing to do?)
                         */
                        if (!doall &&
-                           (pa == 0 || ((int)addr & PGOFSET) == 0)) {
+                           (pa == 0 || m68k_page_offset(addr) == 0)) {
                                if (pmap_extract(p->p_vmspace->vm_map.pmap,
                                    addr, &pa) == FALSE)
                                        doall = 1;
diff -r bd9e1df2f594 -r 80640fd0578f sys/arch/news68k/news68k/trap.c
--- a/sys/arch/news68k/news68k/trap.c   Sun Feb 25 12:58:36 2001 +0000
+++ b/sys/arch/news68k/news68k/trap.c   Sun Feb 25 13:28:31 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: trap.c,v 1.12 2001/02/17 18:34:57 tsutsui Exp $        */
+/*     $NetBSD: trap.c,v 1.13 2001/02/25 13:28:32 tsutsui Exp $        */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -702,7 +702,7 @@
                        pmap_enter(pmap_kernel(), (vaddr_t)vmmap,
                            trunc_page(f->f_fa), VM_PROT_WRITE,
                            VM_PROT_WRITE|PMAP_WIRED);
-                       fa = (u_int)&vmmap[(f->f_fa & PGOFSET) & ~0xF];
+                       fa = (u_int)&vmmap[m68k_page_offset(f->f_fa) & ~0xF];
                        bcopy((caddr_t)&f->f_pd0, (caddr_t)fa, 16);
                        (void) pmap_extract(pmap_kernel(), (vaddr_t)fa, &pa);
                        DCFL(pa);
diff -r bd9e1df2f594 -r 80640fd0578f sys/arch/news68k/news68k/vm_machdep.c
--- a/sys/arch/news68k/news68k/vm_machdep.c     Sun Feb 25 12:58:36 2001 +0000
+++ b/sys/arch/news68k/news68k/vm_machdep.c     Sun Feb 25 13:28:31 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vm_machdep.c,v 1.6 2001/02/17 18:29:55 tsutsui Exp $   */
+/*     $NetBSD: vm_machdep.c,v 1.7 2001/02/25 13:28:32 tsutsui Exp $   */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -212,7 +212,7 @@
        boolean_t rv;
 
 #ifdef DEBUG
-       if (size & PGOFSET)
+       if (m68k_page_offset(size))
                panic("pagemove");
 #endif
        while (size > 0) {