vm_offset_t -> {v,p}addr_t and vm_size_t -> {v,p}size_t

remove "register" keywords
Various cleanups.

4 files changed, 78 insertions, 90 deletions

diff --git a/sys/arch/sparc/include/db_machdep.h b/sys/arch/sparc/include/db_machdep.h
index 02bf55ac08a..3b59a39846c 100644
--- a/sys/arch/sparc/include/db_machdep.h
+++ b/sys/arch/sparc/include/db_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_machdep.h,v 1.5 1997/09/17 06:47:13 downsj Exp $	*/
+/*	$OpenBSD: db_machdep.h,v 1.6 1999/07/09 21:33:37 art Exp $	*/
 /*	$NetBSD: db_machdep.h,v 1.10 1997/08/31 21:23:40 pk Exp $ */
 
 /*
@@ -43,7 +43,7 @@
 
 /* end of mangling */
 
-typedef	vm_offset_t	db_addr_t;	/* address - unsigned */
+typedef	vaddr_t		db_addr_t;	/* address - unsigned */
 typedef	long		db_expr_t;	/* expression - signed */
 
 typedef struct {
diff --git a/sys/arch/sparc/include/param.h b/sys/arch/sparc/include/param.h
index 4d02dd0ff37..756be97264b 100644
--- a/sys/arch/sparc/include/param.h
+++ b/sys/arch/sparc/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.10 1998/08/18 05:08:50 millert Exp $	*/
+/*	$OpenBSD: param.h,v 1.11 1999/07/09 21:33:37 art Exp $	*/
 /*	$NetBSD: param.h,v 1.29 1997/03/10 22:50:37 pk Exp $ */
 
 /*
@@ -169,8 +169,8 @@ extern int nbpg, pgofset, pgshift;
  */
 #ifdef _KERNEL
 #ifndef _LOCORE
-extern vm_offset_t	dvma_base;
-extern vm_offset_t	dvma_end;
+extern vaddr_t		dvma_base;
+extern vaddr_t		dvma_end;
 extern struct map	*dvmamap;
 /*
  * The dvma resource map is defined in page units, which are numbered 1 to N.
diff --git a/sys/arch/sparc/include/pmap.h b/sys/arch/sparc/include/pmap.h
index 59adaaa581b..59354a85bcf 100644
--- a/sys/arch/sparc/include/pmap.h
+++ b/sys/arch/sparc/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.h,v 1.9 1999/04/22 20:36:20 art Exp $	*/
+/*	$OpenBSD: pmap.h,v 1.10 1999/07/09 21:33:37 art Exp $	*/
 /*	$NetBSD: pmap.h,v 1.30 1997/08/04 20:00:47 pk Exp $ */
 
 /*
@@ -187,7 +187,7 @@ struct kvm_cpustate {
 #define PMAP_NULL	((pmap_t)0)
 
 extern struct pmap	kernel_pmap_store;
-extern vm_offset_t	vm_first_phys, vm_num_phys;
+extern vaddr_t	vm_first_phys, vm_num_phys;
 
 /*
  * Since PTEs also contain type bits, we have to have some way
@@ -224,12 +224,6 @@ extern vm_offset_t	vm_first_phys, vm_num_phys;
 /* Encode IO space for pmap_enter() */
 #define PMAP_IOENC(io)	(CPU_ISSUN4M ? PMAP_IOENC_SRMMU(io) : PMAP_IOENC_4(io))
 
-#if xxx
-void		pmap_bootstrap __P((int nmmu, int nctx, int nregion));
-int		pmap_count_ptes __P((struct pmap *));
-void		pmap_prefer __P((vm_offset_t, vm_offset_t *));
-int		pmap_pa_exists __P((vm_offset_t));
-#endif
 int             pmap_dumpsize __P((void));
 int             pmap_dumpmmu __P((int (*)__P((dev_t, daddr_t, caddr_t, size_t)),
                                  daddr_t));
@@ -251,81 +245,75 @@ void		pmap_activate __P((struct proc *));
 void		pmap_deactivate __P((struct proc *));
 void		pmap_bootstrap __P((int nmmu, int nctx, int nregion));
 int		pmap_count_ptes __P((struct pmap *));
-void		pmap_prefer __P((vm_offset_t, vm_offset_t *));
-int		pmap_pa_exists __P((vm_offset_t));
+void		pmap_prefer __P((vaddr_t, vaddr_t *));
+int		pmap_pa_exists __P((paddr_t));
 void		*pmap_bootstrap_alloc __P((int));
-void            pmap_change_wiring __P((pmap_t, vm_offset_t, boolean_t));
-void            pmap_collect __P((pmap_t));
-void            pmap_copy __P((pmap_t,
-			       pmap_t, vm_offset_t, vm_size_t, vm_offset_t));
-pmap_t          pmap_create __P((vm_size_t));
-void            pmap_destroy __P((pmap_t));
-void            pmap_init __P((void));
-vm_offset_t     pmap_map __P((vm_offset_t, vm_offset_t, vm_offset_t, int));
-void            pmap_pageable __P((pmap_t,
-				   vm_offset_t, vm_offset_t, boolean_t));
-vm_offset_t     pmap_phys_address __P((int));
-void            pmap_pinit __P((pmap_t));
-void            pmap_reference __P((pmap_t));
-void            pmap_release __P((pmap_t));
-void            pmap_remove __P((pmap_t, vm_offset_t, vm_offset_t));
-void            pmap_update __P((void));
-void            pmap_init __P((void));
-int		pmap_page_index __P((vm_offset_t));
-void            pmap_virtual_space __P((vm_offset_t *, vm_offset_t *));
+void		pmap_change_wiring __P((pmap_t, vaddr_t, boolean_t));
+void		pmap_collect __P((pmap_t));
+void		pmap_copy __P((pmap_t, pmap_t, vaddr_t, vsize_t, vaddr_t));
+pmap_t		pmap_create __P((vsize_t));
+void		pmap_destroy __P((pmap_t));
+void		pmap_init __P((void));
+vaddr_t		pmap_map __P((vaddr_t, paddr_t, paddr_t, int));
+void		pmap_pageable __P((pmap_t, paddr_t, paddr_t, boolean_t));
+vaddr_t		pmap_phys_address __P((int));
+void		pmap_pinit __P((pmap_t));
+void		pmap_reference __P((pmap_t));
+void		pmap_release __P((pmap_t));
+void		pmap_remove __P((pmap_t, vaddr_t, vaddr_t));
+void		pmap_update __P((void));
+void		pmap_init __P((void));
+int		pmap_page_index __P((paddr_t));
+void		pmap_virtual_space __P((vaddr_t *, vaddr_t *));
 void		pmap_redzone __P((void));
 void		kvm_uncache __P((caddr_t, int));
 struct user;
 void		switchexit __P((vm_map_t, struct user *, int));
-int		mmu_pagein __P((struct pmap *pm, int, int));
+int		mmu_pagein __P((struct pmap *pm, vaddr_t, int));
 void		pmap_writetext __P((unsigned char *, int));
 
 #ifndef MACHINE_NEW_NONCONTIG
-u_int           pmap_free_pages __P((void));
-boolean_t       pmap_next_page __P((vm_offset_t *));
+u_int		pmap_free_pages __P((void));
+boolean_t	pmap_next_page __P((paddr_t *));
 #endif
 
 /* SUN4/SUN4C SPECIFIC DECLARATIONS */
 
 #if defined(SUN4) || defined(SUN4C)
-void            pmap_clear_modify4_4c __P((vm_offset_t pa));
-void            pmap_clear_reference4_4c __P((vm_offset_t pa));
-void            pmap_copy_page4_4c __P((vm_offset_t, vm_offset_t));
-void            pmap_enter4_4c __P((pmap_t,
-                    vm_offset_t, vm_offset_t, vm_prot_t, boolean_t));
-vm_offset_t     pmap_extract4_4c __P((pmap_t, vm_offset_t));
-boolean_t       pmap_is_modified4_4c __P((vm_offset_t pa));
-boolean_t       pmap_is_referenced4_4c __P((vm_offset_t pa));
-void            pmap_page_protect4_4c __P((vm_offset_t, vm_prot_t));
-void            pmap_protect4_4c __P((pmap_t,
-                    vm_offset_t, vm_offset_t, vm_prot_t));
-void            pmap_zero_page4_4c __P((vm_offset_t));
-void		pmap_changeprot4_4c __P((pmap_t, vm_offset_t, vm_prot_t, int));
-
+void		pmap_clear_modify4_4c __P((paddr_t pa));
+void		pmap_clear_reference4_4c __P((paddr_t pa));
+void		pmap_copy_page4_4c __P((paddr_t, paddr_t));
+void		pmap_enter4_4c __P((pmap_t, vaddr_t, paddr_t, vm_prot_t,
+				    boolean_t));
+paddr_t		pmap_extract4_4c __P((pmap_t, vaddr_t));
+boolean_t	pmap_is_modified4_4c __P((paddr_t pa));
+boolean_t	pmap_is_referenced4_4c __P((paddr_t pa));
+void		pmap_page_protect4_4c __P((paddr_t, vm_prot_t));
+void		pmap_protect4_4c __P((pmap_t, vaddr_t, vaddr_t, vm_prot_t));
+void		pmap_zero_page4_4c __P((paddr_t));
+void		pmap_changeprot4_4c __P((pmap_t, vaddr_t, vm_prot_t, int));
 #endif
 
 /* SIMILAR DECLARATIONS FOR SUN4M MODULE */
 
 #if defined(SUN4M)
-void            pmap_clear_modify4m __P((vm_offset_t pa));
-void            pmap_clear_reference4m __P((vm_offset_t pa));
-void            pmap_copy_page4m __P((vm_offset_t, vm_offset_t));
-void            pmap_enter4m __P((pmap_t,
-                    vm_offset_t, vm_offset_t, vm_prot_t, boolean_t));
-vm_offset_t     pmap_extract4m __P((pmap_t, vm_offset_t));
-boolean_t       pmap_is_modified4m __P((vm_offset_t pa));
-boolean_t       pmap_is_referenced4m __P((vm_offset_t pa));
-void            pmap_page_protect4m __P((vm_offset_t, vm_prot_t));
-void            pmap_protect4m __P((pmap_t,
-                    vm_offset_t, vm_offset_t, vm_prot_t));
-void            pmap_zero_page4m __P((vm_offset_t));
-void		pmap_changeprot4m __P((pmap_t, vm_offset_t, vm_prot_t, int));
-
+void		pmap_clear_modify4m __P((paddr_t pa));
+void		pmap_clear_reference4m __P((paddr_t pa));
+void		pmap_copy_page4m __P((paddr_t, paddr_t));
+void		pmap_enter4m __P((pmap_t, vaddr_t, paddr_t, vm_prot_t,
+				  boolean_t));
+paddr_t		pmap_extract4m __P((pmap_t, vaddr_t));
+boolean_t	pmap_is_modified4m __P((paddr_t pa));
+boolean_t	pmap_is_referenced4m __P((paddr_t pa));
+void		pmap_page_protect4m __P((paddr_t, vm_prot_t));
+void		pmap_protect4m __P((pmap_t, vaddr_t, vaddr_t, vm_prot_t));
+void		pmap_zero_page4m __P((paddr_t));
+void		pmap_changeprot4m __P((pmap_t, vaddr_t, vm_prot_t, int));
 #endif /* defined SUN4M */
 
 #if !defined(SUN4M) && (defined(SUN4) || defined(SUN4C))
 
-#define	  	pmap_clear_modify	pmap_clear_modify4_4c
+#define		pmap_clear_modify	pmap_clear_modify4_4c
 #define		pmap_clear_reference	pmap_clear_reference4_4c
 #define		pmap_copy_page		pmap_copy_page4_4c
 #define		pmap_enter		pmap_enter4_4c
@@ -353,22 +341,22 @@ void		pmap_changeprot4m __P((pmap_t, vm_offset_t, vm_prot_t, int));
 
 #else  /* must use function pointers */
 
-extern void            	(*pmap_clear_modify_p) __P((vm_offset_t pa));
-extern void            	(*pmap_clear_reference_p) __P((vm_offset_t pa));
-extern void            	(*pmap_copy_page_p) __P((vm_offset_t, vm_offset_t));
-extern void            	(*pmap_enter_p) __P((pmap_t,
-		            vm_offset_t, vm_offset_t, vm_prot_t, boolean_t));
-extern vm_offset_t     	(*pmap_extract_p) __P((pmap_t, vm_offset_t));
-extern boolean_t       	(*pmap_is_modified_p) __P((vm_offset_t pa));
-extern boolean_t       	(*pmap_is_referenced_p) __P((vm_offset_t pa));
-extern void            	(*pmap_page_protect_p) __P((vm_offset_t, vm_prot_t));
-extern void            	(*pmap_protect_p) __P((pmap_t,
-		            vm_offset_t, vm_offset_t, vm_prot_t));
-extern void            	(*pmap_zero_page_p) __P((vm_offset_t));
-extern void	       	(*pmap_changeprot_p) __P((pmap_t, vm_offset_t,
-		            vm_prot_t, int));
-
-#define	  	pmap_clear_modify	(*pmap_clear_modify_p)
+extern void		(*pmap_clear_modify_p) __P((paddr_t pa));
+extern void		(*pmap_clear_reference_p) __P((paddr_t pa));
+extern void		(*pmap_copy_page_p) __P((paddr_t, paddr_t));
+extern void		(*pmap_enter_p) __P((pmap_t, vaddr_t, paddr_t,
+					     vm_prot_t, boolean_t));
+extern paddr_t		(*pmap_extract_p) __P((pmap_t, vaddr_t));
+extern boolean_t	(*pmap_is_modified_p) __P((paddr_t pa));
+extern boolean_t	(*pmap_is_referenced_p) __P((paddr_t pa));
+extern void		(*pmap_page_protect_p) __P((paddr_t, vm_prot_t));
+extern void		(*pmap_protect_p) __P((pmap_t, vaddr_t, vaddr_t,
+					       vm_prot_t));
+extern void		(*pmap_zero_page_p) __P((paddr_t));
+extern void		(*pmap_changeprot_p) __P((pmap_t, vaddr_t,
+						  vm_prot_t, int));
+
+#define		pmap_clear_modify	(*pmap_clear_modify_p)
 #define		pmap_clear_reference	(*pmap_clear_reference_p)
 #define		pmap_copy_page		(*pmap_copy_page_p)
 #define		pmap_enter		(*pmap_enter_p)
diff --git a/sys/arch/sparc/include/vmparam.h b/sys/arch/sparc/include/vmparam.h
index a6bbf4edcdb..f552d0c6034 100644
--- a/sys/arch/sparc/include/vmparam.h
+++ b/sys/arch/sparc/include/vmparam.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmparam.h,v 1.10 1999/06/06 20:32:26 deraadt Exp $	*/
+/*	$OpenBSD: vmparam.h,v 1.11 1999/07/09 21:33:37 art Exp $	*/
 /*	$NetBSD: vmparam.h,v 1.13 1997/07/12 16:20:03 perry Exp $	*/
 
 /*
@@ -133,11 +133,11 @@
  * IO space virtual base, which must be the same as VM_MAX_KERNEL_ADDRESS:
  * tread with care.
  */
-#define VM_MIN_ADDRESS		((vm_offset_t)0)
-#define VM_MAX_ADDRESS		((vm_offset_t)KERNBASE)
-#define VM_MAXUSER_ADDRESS	((vm_offset_t)KERNBASE)
-#define VM_MIN_KERNEL_ADDRESS	((vm_offset_t)KERNBASE)
-#define VM_MAX_KERNEL_ADDRESS	((vm_offset_t)0xfe000000)
+#define VM_MIN_ADDRESS		((vaddr_t)0)
+#define VM_MAX_ADDRESS		((vaddr_t)KERNBASE)
+#define VM_MAXUSER_ADDRESS	((vaddr_t)KERNBASE)
+#define VM_MIN_KERNEL_ADDRESS	((vaddr_t)KERNBASE)
+#define VM_MAX_KERNEL_ADDRESS	((vaddr_t)0xfe000000)
 
 /* virtual sizes (bytes) for various kernel submaps */
 #define VM_MBUF_SIZE		(NMBCLUSTERS*MCLBYTES)
@@ -171,6 +171,6 @@ struct pmap_physseg {
 
 #if defined (_KERNEL) && !defined(_LOCORE)
 struct vm_map;
-vm_offset_t	dvma_mapin __P((struct vm_map *, vm_offset_t, int, int));
-void		dvma_mapout __P((vm_offset_t, vm_offset_t, int));
+vaddr_t		dvma_mapin __P((struct vm_map *, vaddr_t, int, int));
+void		dvma_mapout __P((vaddr_t, vaddr_t, int));
 #endif