Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/sun3/sun3 - vm_offset_t -> vaddr_t, vsize_t, paddr_t
details: https://anonhg.NetBSD.org/src/rev/c11eab84a225
branches: trunk
changeset: 514555:c11eab84a225
user: tsutsui <tsutsui%NetBSD.org@localhost>
date: Wed Sep 05 13:21:09 2001 +0000
description:
- vm_offset_t -> vaddr_t, vsize_t, paddr_t
- vm_size_t -> vsize_t
- remove register prefixes
- misc cleanup
diffstat:
sys/arch/sun3/sun3/autoconf.c | 20 ++++++++++----------
sys/arch/sun3/sun3/bus_subr.c | 16 ++++++++--------
sys/arch/sun3/sun3/cache.c | 30 +++++++++++++++---------------
sys/arch/sun3/sun3/clock.c | 6 +++---
sys/arch/sun3/sun3/control.c | 10 +++++-----
sys/arch/sun3/sun3/control.h | 22 ++++++++--------------
sys/arch/sun3/sun3/db_memrw.c | 26 +++++++++++++-------------
sys/arch/sun3/sun3/dvma.c | 34 ++++++++++++++++++----------------
sys/arch/sun3/sun3/idprom.c | 4 ++--
sys/arch/sun3/sun3/intreg.c | 6 +++---
sys/arch/sun3/sun3/isr.c | 6 +++---
sys/arch/sun3/sun3/kgdb_machdep.c | 4 ++--
sys/arch/sun3/sun3/leds.c | 4 ++--
sys/arch/sun3/sun3/locore2.c | 4 ++--
sys/arch/sun3/sun3/machdep.c | 24 ++++++++++++------------
sys/arch/sun3/sun3/machdep.h | 28 ++++++++++++++--------------
sys/arch/sun3/sun3/mem.c | 14 +++++++-------
sys/arch/sun3/sun3/obio.c | 22 ++++++++++++----------
sys/arch/sun3/sun3/trap.c | 14 +++++++-------
sys/arch/sun3/sun3/vm_machdep.c | 36 ++++++++++++++++++------------------
20 files changed, 164 insertions(+), 166 deletions(-)
diffs (truncated from 988 to 300 lines):
diff -r baeb302fd587 -r c11eab84a225 sys/arch/sun3/sun3/autoconf.c
--- a/sys/arch/sun3/sun3/autoconf.c Wed Sep 05 12:37:25 2001 +0000
+++ b/sys/arch/sun3/sun3/autoconf.c Wed Sep 05 13:21:09 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.55 2001/04/25 17:53:25 bouyer Exp $ */
+/* $NetBSD: autoconf.c,v 1.56 2001/09/05 13:21:09 tsutsui Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -363,10 +363,10 @@
/* from hp300: badbaddr() */
int
peek_byte(addr)
- register caddr_t addr;
+ caddr_t addr;
{
- label_t faultbuf;
- register int x;
+ label_t faultbuf;
+ int x;
nofault = &faultbuf;
if (setjmp(&faultbuf))
@@ -380,10 +380,10 @@
int
peek_word(addr)
- register caddr_t addr;
+ caddr_t addr;
{
- label_t faultbuf;
- register int x;
+ label_t faultbuf;
+ int x;
nofault = &faultbuf;
if (setjmp(&faultbuf))
@@ -397,10 +397,10 @@
int
peek_long(addr)
- register caddr_t addr;
+ caddr_t addr;
{
- label_t faultbuf;
- register int x;
+ label_t faultbuf;
+ int x;
nofault = &faultbuf;
if (setjmp(&faultbuf))
diff -r baeb302fd587 -r c11eab84a225 sys/arch/sun3/sun3/bus_subr.c
--- a/sys/arch/sun3/sun3/bus_subr.c Wed Sep 05 12:37:25 2001 +0000
+++ b/sys/arch/sun3/sun3/bus_subr.c Wed Sep 05 13:21:09 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_subr.c,v 1.9 2000/06/29 07:19:04 mrg Exp $ */
+/* $NetBSD: bus_subr.c,v 1.10 2001/09/05 13:21:09 tsutsui Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
label_t *nofault;
/* These are defined in pmap.c */
-extern vm_offset_t tmp_vpages[];
+extern vaddr_t tmp_vpages[];
extern int tmp_vpages_inuse;
#define OBIO_MASK 0xFFffff
@@ -93,7 +93,7 @@
bus_tmapin(bustype, pa)
int bustype, pa;
{
- vm_offset_t pgva;
+ vaddr_t pgva;
int off, pte;
if ((bustype < 0) || (bustype >= BUS__NTYPES))
@@ -122,7 +122,7 @@
void bus_tmapout(vp)
void *vp;
{
- vm_offset_t pgva;
+ vaddr_t pgva;
pgva = m68k_trunc_page(vp);
if (pgva != tmp_vpages[1])
@@ -139,7 +139,7 @@
bus_mapin(bustype, pa, sz)
int bustype, pa, sz;
{
- vm_offset_t va;
+ vaddr_t va;
int off;
if ((bustype < 0) || (bustype >= BUS__NTYPES))
@@ -152,7 +152,7 @@
/* Borrow PROM mappings if we can. */
if (bustype == BUS_OBIO) {
- va = (vm_offset_t) obio_find_mapping(pa, sz);
+ va = (vaddr_t) obio_find_mapping(pa, sz);
if (va != 0)
goto done;
}
@@ -179,10 +179,10 @@
void *ptr;
int sz;
{
- vm_offset_t va;
+ vaddr_t va;
int off;
- va = (vm_offset_t)ptr;
+ va = (vaddr_t)ptr;
/* If it was a PROM mapping, do NOT free it! */
if ((va >= SUN3_MONSTART) && (va < SUN3_MONEND))
diff -r baeb302fd587 -r c11eab84a225 sys/arch/sun3/sun3/cache.c
--- a/sys/arch/sun3/sun3/cache.c Wed Sep 05 12:37:25 2001 +0000
+++ b/sys/arch/sun3/sun3/cache.c Wed Sep 05 13:21:09 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cache.c,v 1.13 2001/02/22 07:11:11 chs Exp $ */
+/* $NetBSD: cache.c,v 1.14 2001/09/05 13:21:09 tsutsui Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -68,11 +68,11 @@
void
cache_flush_page(pgva)
- vm_offset_t pgva;
+ vaddr_t pgva;
{
- register char *va, *endva;
- register int old_dfc, ctl_dfc;
- register int data;
+ char *va, *endva;
+ int old_dfc, ctl_dfc;
+ int data;
pgva &= (VADDR_MASK & ~PGOFSET);
pgva |= VAC_FLUSH_BASE;
@@ -98,11 +98,11 @@
void
cache_flush_segment(sgva)
- vm_offset_t sgva;
+ vaddr_t sgva;
{
- register char *va, *endva;
- register int old_dfc, ctl_dfc;
- register int data;
+ char *va, *endva;
+ int old_dfc, ctl_dfc;
+ int data;
sgva &= (VADDR_MASK & ~SEGOFSET);
sgva |= VAC_FLUSH_BASE;
@@ -129,9 +129,9 @@
void
cache_flush_context()
{
- register char *va, *endva;
- register int old_dfc, ctl_dfc;
- register int data;
+ char *va, *endva;
+ int old_dfc, ctl_dfc;
+ int data;
/* Set up for writes to control space. */
__asm __volatile ("movc %%dfc, %0" : "=d" (old_dfc));
@@ -155,9 +155,9 @@
static void
cache_clear_tags()
{
- register char *va, *endva;
- register int old_dfc, ctl_dfc;
- register int data;
+ char *va, *endva;
+ int old_dfc, ctl_dfc;
+ int data;
/* Set up for writes to control space. */
__asm __volatile ("movc %%dfc, %0" : "=d" (old_dfc));
diff -r baeb302fd587 -r c11eab84a225 sys/arch/sun3/sun3/clock.c
--- a/sys/arch/sun3/sun3/clock.c Wed Sep 05 12:37:25 2001 +0000
+++ b/sys/arch/sun3/sun3/clock.c Wed Sep 05 13:21:09 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.45 2001/02/03 12:40:58 tsutsui Exp $ */
+/* $NetBSD: clock.c,v 1.46 2001/09/05 13:21:09 tsutsui Exp $ */
/*
* Copyright (c) 1994 Gordon W. Ross
@@ -164,7 +164,7 @@
u_char on, off;
int enable_clk;
{
- register u_char interreg;
+ u_char interreg;
/*
* If we have not yet mapped the register,
@@ -303,7 +303,7 @@
*/
void
microtime(tvp)
- register struct timeval *tvp;
+ struct timeval *tvp;
{
int s = splhigh();
static struct timeval lasttime;
diff -r baeb302fd587 -r c11eab84a225 sys/arch/sun3/sun3/control.c
--- a/sys/arch/sun3/sun3/control.c Wed Sep 05 12:37:25 2001 +0000
+++ b/sys/arch/sun3/sun3/control.c Wed Sep 05 13:21:09 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: control.c,v 1.18 2001/08/04 04:06:29 chs Exp $ */
+/* $NetBSD: control.c,v 1.19 2001/09/05 13:21:09 tsutsui Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -56,14 +56,14 @@
u_int
get_pte(va)
- vm_offset_t va;
+ vaddr_t va;
{
return (get_control_word(CONTROL_ADDR_BUILD(PGMAP_BASE, va)));
}
void
set_pte(va, pte)
- vm_offset_t va;
+ vaddr_t va;
u_int pte;
{
set_control_word(CONTROL_ADDR_BUILD(PGMAP_BASE, va), pte);
@@ -71,14 +71,14 @@
int
get_segmap(va)
- vm_offset_t va;
+ vaddr_t va;
{
return (get_control_byte(CONTROL_ADDR_BUILD(SEGMAP_BASE, va)));
}
void
set_segmap(va, sme)
- vm_offset_t va;
+ vaddr_t va;
int sme;
{
set_control_byte(CONTROL_ADDR_BUILD(SEGMAP_BASE, va), sme);
diff -r baeb302fd587 -r c11eab84a225 sys/arch/sun3/sun3/control.h
--- a/sys/arch/sun3/sun3/control.h Wed Sep 05 12:37:25 2001 +0000
+++ b/sys/arch/sun3/sun3/control.h Wed Sep 05 13:21:09 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: control.h,v 1.19 1998/02/05 04:57:30 gwr Exp $ */
+/* $NetBSD: control.h,v 1.20 2001/09/05 13:21:09 tsutsui Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -66,23 +66,17 @@
#if defined(_KERNEL) || defined(_STANDALONE)
/* ctrlsp.S */
-int get_control_byte __P((vm_offset_t));
-void set_control_byte __P((vm_offset_t, int));
-u_int get_control_word __P((vm_offset_t));
-void set_control_word __P((vm_offset_t, u_int));
+int get_control_byte __P((vaddr_t));
+void set_control_byte __P((vaddr_t, int));
+u_int get_control_word __P((vaddr_t));
+void set_control_word __P((vaddr_t, u_int));
/* control.c */
int get_context __P((void));
void set_context __P((int));
-int get_segmap __P((vm_offset_t));
-void set_segmap __P((vm_offset_t, int));
-void set_segmap_allctx __P((vm_offset_t, int));
-
-#if 0
-/* Moved to pte.h (now a common interface). */
-int get_pte __P((vm_offset_t));
-void set_pte __P((vm_offset_t, int));
-#endif
+int get_segmap __P((vaddr_t));
+void set_segmap __P((vaddr_t, int));
+void set_segmap_allctx __P((vaddr_t, int));
#endif /* _KERNEL | _STANDALONE */
diff -r baeb302fd587 -r c11eab84a225 sys/arch/sun3/sun3/db_memrw.c
--- a/sys/arch/sun3/sun3/db_memrw.c Wed Sep 05 12:37:25 2001 +0000
+++ b/sys/arch/sun3/sun3/db_memrw.c Wed Sep 05 13:21:09 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: db_memrw.c,v 1.20 2000/06/29 07:19:05 mrg Exp $ */
Home |
Main Index |
Thread Index |
Old Index