Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys Merge parts of chs-ubc2 into the trunk:
details: https://anonhg.NetBSD.org/src/rev/b3f37bdb2855
branches: trunk
changeset: 484141:b3f37bdb2855
user: kleink <kleink%NetBSD.org@localhost>
date: Sun Mar 26 20:42:21 2000 +0000
description:
Merge parts of chs-ubc2 into the trunk:
* Remove the casts to vaddr_t from the round_page() and trunc_page() macros to
make them type-generic, which is necessary i.e. to operate on file offsets
without truncating them.
* In due course, cast pointer arguments to these macros to an appropriate
integral type (paddr_t, vaddr_t).
Originally done by Chuck Silvers, updated by myself.
diffstat:
sys/arch/alpha/alpha/machdep.c | 10 +++++-----
sys/arch/alpha/alpha/pmap.c | 8 ++++----
sys/arch/alpha/alpha/vm_machdep.c | 8 ++++----
sys/arch/amiga/amiga/pmap.c | 8 ++++----
sys/arch/arm32/arm32/machdep.c | 4 ++--
sys/arch/arm32/arm32/pmap.c | 6 +++---
sys/arch/arm32/arm32/vm_machdep.c | 6 +++---
sys/arch/atari/atari/pmap.c | 14 ++++++++------
sys/arch/hp300/hp300/pmap.c | 14 +++++++-------
sys/arch/i386/i386/vm_machdep.c | 6 +++---
sys/arch/luna68k/luna68k/machdep.c | 10 +++++-----
sys/arch/luna68k/luna68k/pmap.c | 15 ++++++++-------
sys/arch/m68k/m68k/mappedcopy.c | 8 +++++---
sys/arch/mac68k/mac68k/pmap.c | 15 ++++++++-------
sys/arch/macppc/macppc/machdep.c | 4 ++--
sys/arch/mips/mips/vm_machdep.c | 8 ++++----
sys/arch/mvme68k/mvme68k/machdep.c | 8 ++++----
sys/arch/mvme68k/mvme68k/pmap.c | 15 ++++++++-------
sys/arch/news68k/news68k/pmap.c | 15 ++++++++-------
sys/arch/next68k/next68k/machdep.c | 8 ++++----
sys/arch/next68k/next68k/pmap.c | 15 ++++++++-------
sys/arch/pc532/pc532/vm_machdep.c | 6 +++---
sys/arch/pmax/dev/px.c | 6 +++---
sys/arch/powerpc/powerpc/pmap.c | 6 +++---
sys/arch/powerpc/powerpc/vm_machdep.c | 6 +++---
sys/arch/sh3/sh3/vm_machdep.c | 6 +++---
sys/arch/sparc/sparc/vm_machdep.c | 6 +++---
sys/arch/sparc64/sparc64/vm_machdep.c | 6 +++---
sys/arch/vax/vax/pmap.c | 6 +++---
sys/arch/vax/vax/vm_machdep.c | 6 +++---
sys/arch/x68k/x68k/pmap.c | 15 ++++++++-------
sys/compat/ibcs2/ibcs2_misc.c | 4 ++--
sys/compat/osf1/osf1_mmap.c | 4 ++--
sys/compat/sunos/sunos_misc.c | 6 +++---
sys/compat/svr4/svr4_misc.c | 8 ++++----
sys/compat/ultrix/ultrix_misc.c | 6 +++---
sys/dev/ic/bhavar.h | 4 ++--
sys/kern/sysv_shm.c | 5 +++--
sys/vm/vm_param.h | 6 +++---
39 files changed, 164 insertions(+), 153 deletions(-)
diffs (truncated from 1337 to 300 lines):
diff -r 6edf65c25d5f -r b3f37bdb2855 sys/arch/alpha/alpha/machdep.c
--- a/sys/arch/alpha/alpha/machdep.c Sun Mar 26 20:24:12 2000 +0000
+++ b/sys/arch/alpha/alpha/machdep.c Sun Mar 26 20:42:21 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.200 2000/03/23 01:04:10 thorpej Exp $ */
+/* $NetBSD: machdep.c,v 1.201 2000/03/26 20:42:21 kleink Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -79,7 +79,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.200 2000/03/23 01:04:10 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.201 2000/03/26 20:42:21 kleink Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -466,13 +466,13 @@
* bit of space before the beginning for the bootstrap
* stack).
*/
- kernstart = trunc_page(kernel_text) - 2 * PAGE_SIZE;
+ kernstart = trunc_page((vaddr_t)kernel_text) - 2 * PAGE_SIZE;
#ifdef DDB
ksym_start = (void *)bootinfo.ssym;
ksym_end = (void *)bootinfo.esym;
- kernend = (vaddr_t)round_page(ksym_end);
+ kernend = (vaddr_t)round_page((vaddr_t)ksym_end);
#else
- kernend = (vaddr_t)round_page(_end);
+ kernend = (vaddr_t)round_page((vaddr_t)_end);
#endif
kernstartpfn = atop(ALPHA_K0SEG_TO_PHYS(kernstart));
diff -r 6edf65c25d5f -r b3f37bdb2855 sys/arch/alpha/alpha/pmap.c
--- a/sys/arch/alpha/alpha/pmap.c Sun Mar 26 20:24:12 2000 +0000
+++ b/sys/arch/alpha/alpha/pmap.c Sun Mar 26 20:42:21 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.127 2000/03/01 18:29:04 thorpej Exp $ */
+/* $NetBSD: pmap.c,v 1.128 2000/03/26 20:42:22 kleink Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -154,7 +154,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.127 2000/03/01 18:29:04 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.128 2000/03/26 20:42:22 kleink Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -3317,7 +3317,7 @@
paddr_t pa;
int rval;
- pa = ALPHA_K0SEG_TO_PHYS(trunc_page(kva));
+ pa = ALPHA_K0SEG_TO_PHYS(trunc_page((vaddr_t)kva));
pvh = pa_to_pvh(pa);
simple_lock(&pvh->pvh_slock);
@@ -3345,7 +3345,7 @@
paddr_t pa;
int rval;
- pa = ALPHA_K0SEG_TO_PHYS(trunc_page(kva));
+ pa = ALPHA_K0SEG_TO_PHYS(trunc_page((vaddr_t)kva));
pvh = pa_to_pvh(pa);
simple_lock(&pvh->pvh_slock);
diff -r 6edf65c25d5f -r b3f37bdb2855 sys/arch/alpha/alpha/vm_machdep.c
--- a/sys/arch/alpha/alpha/vm_machdep.c Sun Mar 26 20:24:12 2000 +0000
+++ b/sys/arch/alpha/alpha/vm_machdep.c Sun Mar 26 20:42:21 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.53 2000/01/20 22:18:54 sommerfeld Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.54 2000/03/26 20:42:23 kleink Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.53 2000/01/20 22:18:54 sommerfeld Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.54 2000/03/26 20:42:23 kleink Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -372,7 +372,7 @@
if ((bp->b_flags & B_PHYS) == 0)
panic("vmapbuf");
p = bp->b_proc;
- faddr = trunc_page(bp->b_saveaddr = bp->b_data);
+ faddr = trunc_page((vaddr_t)bp->b_saveaddr = bp->b_data);
off = (vaddr_t)bp->b_data - faddr;
len = round_page(off + len);
taddr = uvm_km_valloc_wait(phys_map, len);
@@ -401,7 +401,7 @@
if ((bp->b_flags & B_PHYS) == 0)
panic("vunmapbuf");
- addr = trunc_page(bp->b_data);
+ addr = trunc_page((vaddr_t)bp->b_data);
off = (vaddr_t)bp->b_data - addr;
len = round_page(off + len);
uvm_km_free_wakeup(phys_map, addr, len);
diff -r 6edf65c25d5f -r b3f37bdb2855 sys/arch/amiga/amiga/pmap.c
--- a/sys/arch/amiga/amiga/pmap.c Sun Mar 26 20:24:12 2000 +0000
+++ b/sys/arch/amiga/amiga/pmap.c Sun Mar 26 20:42:21 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.74 1999/11/13 00:30:26 thorpej Exp $ */
+/* $NetBSD: pmap.c,v 1.75 2000/03/26 20:42:24 kleink Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -749,7 +749,7 @@
{
struct pv_page *pvp;
- pvp = (struct pv_page *) trunc_page(pv);
+ pvp = (struct pv_page *) trunc_page((vaddr_t)pv);
switch (++pvp->pvp_pgi.pgi_nfree) {
case 1:
TAILQ_INSERT_TAIL(&pv_page_freelist, pvp, pvp_pgi.pgi_list);
@@ -1236,7 +1236,7 @@
* is a valid mapping in the page.
*/
if (pmap != pmap_kernel())
- pmap_ptpage_addref(trunc_page(pte));
+ pmap_ptpage_addref(trunc_page((vaddr_t)pte));
/*
* Enter on the PV list if part of our managed memory
@@ -2029,7 +2029,7 @@
* the PT page.
*/
if (pmap != pmap_kernel()) {
- vaddr_t ptpva = trunc_page(pte);
+ vaddr_t ptpva = trunc_page((vaddr_t)pte);
int refs = pmap_ptpage_delref(ptpva);
#ifdef DEBUG
if (pmapdebug & PDB_WIRING)
diff -r 6edf65c25d5f -r b3f37bdb2855 sys/arch/arm32/arm32/machdep.c
--- a/sys/arch/arm32/arm32/machdep.c Sun Mar 26 20:24:12 2000 +0000
+++ b/sys/arch/arm32/arm32/machdep.c Sun Mar 26 20:42:21 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.76 2000/03/24 17:05:30 ws Exp $ */
+/* $NetBSD: machdep.c,v 1.77 2000/03/26 20:42:24 kleink Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -386,7 +386,7 @@
* and then give everything true virtual addresses.
*/
size = allocsys(NULL, NULL);
- sysbase = (caddr_t)uvm_km_zalloc(kernel_map, round_page(size));
+ sysbase = (caddr_t)uvm_km_zalloc(kernel_map, round_page((vaddr_t)size));
if (sysbase == 0)
panic(
"cpu_startup: no room for system tables; %d bytes required",
diff -r 6edf65c25d5f -r b3f37bdb2855 sys/arch/arm32/arm32/pmap.c
--- a/sys/arch/arm32/arm32/pmap.c Sun Mar 26 20:24:12 2000 +0000
+++ b/sys/arch/arm32/arm32/pmap.c Sun Mar 26 20:42:21 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.66 1999/11/17 08:43:53 mrg Exp $ */
+/* $NetBSD: pmap.c,v 1.67 2000/03/26 20:42:25 kleink Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -337,7 +337,7 @@
{
struct pv_page *pvp;
- pvp = (struct pv_page *) trunc_page(pv);
+ pvp = (struct pv_page *) trunc_page((vaddr_t)pv);
switch (++pvp->pvp_pgi.pgi_nfree) {
case 1:
TAILQ_INSERT_TAIL(&pv_page_freelist, pvp, pvp_pgi.pgi_list);
@@ -386,7 +386,7 @@
continue;
s = splimp();
for (ppv = ph; (pv = ppv->pv_next) != 0; ) {
- pvp = (struct pv_page *) trunc_page(pv);
+ pvp = (struct pv_page *) trunc_page((vaddr_t)pv);
if (pvp->pvp_pgi.pgi_nfree == -1) {
pvp = pv_page_freelist.tqh_first;
if (--pvp->pvp_pgi.pgi_nfree == 0) {
diff -r 6edf65c25d5f -r b3f37bdb2855 sys/arch/arm32/arm32/vm_machdep.c
--- a/sys/arch/arm32/arm32/vm_machdep.c Sun Mar 26 20:24:12 2000 +0000
+++ b/sys/arch/arm32/arm32/vm_machdep.c Sun Mar 26 20:42:21 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.48 2000/01/20 22:18:55 sommerfeld Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.49 2000/03/26 20:42:26 kleink Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -345,7 +345,7 @@
taddr = uvm_km_valloc_wait(phys_map, len);
- faddr = trunc_page(bp->b_data);
+ faddr = trunc_page((vaddr_t)bp->b_data);
off = (vm_offset_t)bp->b_data - faddr;
len = round_page(off + len);
bp->b_saveaddr = bp->b_data;
@@ -402,7 +402,7 @@
* Make sure the cache does not have dirty data for the
* pages we had mapped.
*/
- addr = trunc_page(bp->b_data);
+ addr = trunc_page((vaddr_t)bp->b_data);
off = (vm_offset_t)bp->b_data - addr;
len = round_page(off + len);
bp->b_data = bp->b_saveaddr;
diff -r 6edf65c25d5f -r b3f37bdb2855 sys/arch/atari/atari/pmap.c
--- a/sys/arch/atari/atari/pmap.c Sun Mar 26 20:24:12 2000 +0000
+++ b/sys/arch/atari/atari/pmap.c Sun Mar 26 20:42:21 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.54 1999/11/13 00:30:30 thorpej Exp $ */
+/* $NetBSD: pmap.c,v 1.55 2000/03/26 20:42:26 kleink Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -709,7 +709,7 @@
{
register struct pv_page *pvp;
- pvp = (struct pv_page *) trunc_page(pv);
+ pvp = (struct pv_page *) trunc_page((vaddr_t)pv);
switch (++pvp->pvp_pgi.pgi_nfree) {
case 1:
TAILQ_INSERT_TAIL(&pv_page_freelist, pvp, pvp_pgi.pgi_list);
@@ -1189,7 +1189,7 @@
* is a valid mapping in the page.
*/
if (pmap != pmap_kernel())
- pmap_ptpage_addref(trunc_page(pte));
+ pmap_ptpage_addref(trunc_page((vaddr_t)pte));
/*
* Enter on the PV list if part of our managed memory
@@ -1335,7 +1335,8 @@
#ifdef DEBUG
if ((pmapdebug & PDB_WIRING) && pmap != pmap_kernel()) {
va -= PAGE_SIZE;
- pmap_check_wiring("enter", trunc_page(pmap_pte(pmap, va)));
+ pmap_check_wiring("enter",
+ trunc_page((vaddr_t)pmap_pte(pmap, va)));
}
#endif
@@ -1971,7 +1972,7 @@
* the PT page.
*/
if (pmap != pmap_kernel()) {
- vaddr_t ptpva = trunc_page(pte);
+ vaddr_t ptpva = trunc_page((vaddr_t)pte);
int refs = pmap_ptpage_delref(ptpva);
#ifdef DEBUG
if (pmapdebug & PDB_WIRING)
@@ -2111,7 +2112,8 @@
ptpmap->pm_stab,
ptpmap->pm_sref - 1);
if ((pmapdebug & PDB_PARANOIA) &&
- ptpmap->pm_stab != (st_entry_t *)trunc_page(ste))
+ ptpmap->pm_stab !=
+ (st_entry_t *)trunc_page((vaddr_t)ste))
panic("remove: bogus ste");
#endif
if (--(ptpmap->pm_sref) == 0) {
diff -r 6edf65c25d5f -r b3f37bdb2855 sys/arch/hp300/hp300/pmap.c
--- a/sys/arch/hp300/hp300/pmap.c Sun Mar 26 20:24:12 2000 +0000
+++ b/sys/arch/hp300/hp300/pmap.c Sun Mar 26 20:42:21 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.82 1999/11/14 19:20:27 thorpej Exp $ */
+/* $NetBSD: pmap.c,v 1.83 2000/03/26 20:42:27 kleink Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -609,7 +609,7 @@
{
struct pv_page *pvp;
- pvp = (struct pv_page *) trunc_page(pv);
+ pvp = (struct pv_page *) trunc_page((vaddr_t)pv);
switch (++pvp->pvp_pgi.pgi_nfree) {
case 1:
TAILQ_INSERT_TAIL(&pv_page_freelist, pvp, pvp_pgi.pgi_list);
@@ -662,7 +662,7 @@
continue;
s = splimp();
for (ppv = ph; (pv = ppv->pv_next) != 0; ) {
- pvp = (struct pv_page *) trunc_page(pv);
+ pvp = (struct pv_page *) trunc_page((vaddr_t)pv);
if (pvp->pvp_pgi.pgi_nfree == -1) {
pvp = pv_page_freelist.tqh_first;
if (--pvp->pvp_pgi.pgi_nfree == 0) {
@@ -1243,7 +1243,7 @@
* is a valid mapping in the page.
Home |
Main Index |
Thread Index |
Old Index