Module Name: src
Committed By: jym
Date: Sun Sep 19 02:07:01 UTC 2010
Modified Files:
src/lib/libkvm: kvm_alpha.c kvm_arm.c kvm_file.c kvm_getloadavg.c
kvm_i386.c kvm_m68k.c kvm_m68k.h kvm_m68k_cmn.c kvm_mips.c
kvm_powerpc.c kvm_powerpc64.c kvm_private.h kvm_proc.c kvm_sh3.c
kvm_sparc.c kvm_sparc64.c kvm_sun2.c kvm_sun3.c kvm_sun3x.c
kvm_vax.c kvm_x86_64.c
Log Message:
Ansify and KNF all functions within kvm(3). No objection on current-us...@.
Used as ground for u_long => vaddr_t/paddr_t replacements in kvm(3)
private functions.
Compile tested for all arches. See also:
http://mail-index.netbsd.org/current-users/2010/09/07/msg014249.html
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/lib/libkvm/kvm_alpha.c
cvs rdiff -u -r1.4 -r1.5 src/lib/libkvm/kvm_arm.c src/lib/libkvm/kvm_m68k.h
cvs rdiff -u -r1.26 -r1.27 src/lib/libkvm/kvm_file.c \
src/lib/libkvm/kvm_i386.c
cvs rdiff -u -r1.8 -r1.9 src/lib/libkvm/kvm_getloadavg.c
cvs rdiff -u -r1.16 -r1.17 src/lib/libkvm/kvm_m68k.c \
src/lib/libkvm/kvm_private.h src/lib/libkvm/kvm_vax.c
cvs rdiff -u -r1.13 -r1.14 src/lib/libkvm/kvm_m68k_cmn.c \
src/lib/libkvm/kvm_sparc64.c
cvs rdiff -u -r1.18 -r1.19 src/lib/libkvm/kvm_mips.c
cvs rdiff -u -r1.9 -r1.10 src/lib/libkvm/kvm_powerpc.c \
src/lib/libkvm/kvm_sun3x.c
cvs rdiff -u -r1.2 -r1.3 src/lib/libkvm/kvm_powerpc64.c
cvs rdiff -u -r1.84 -r1.85 src/lib/libkvm/kvm_proc.c
cvs rdiff -u -r1.6 -r1.7 src/lib/libkvm/kvm_sh3.c src/lib/libkvm/kvm_x86_64.c
cvs rdiff -u -r1.30 -r1.31 src/lib/libkvm/kvm_sparc.c
cvs rdiff -u -r1.3 -r1.4 src/lib/libkvm/kvm_sun2.c
cvs rdiff -u -r1.12 -r1.13 src/lib/libkvm/kvm_sun3.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libkvm/kvm_alpha.c
diff -u src/lib/libkvm/kvm_alpha.c:1.23 src/lib/libkvm/kvm_alpha.c:1.24
--- src/lib/libkvm/kvm_alpha.c:1.23 Tue Jan 15 13:57:41 2008
+++ src/lib/libkvm/kvm_alpha.c Sun Sep 19 02:07:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kvm_alpha.c,v 1.23 2008/01/15 13:57:41 ad Exp $ */
+/* $NetBSD: kvm_alpha.c,v 1.24 2010/09/19 02:07:00 jym Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -51,25 +51,20 @@
/*ARGSUSED*/
void
-_kvm_freevtop(kd)
- kvm_t *kd;
+_kvm_freevtop(kvm_t *kd)
{
return;
}
/*ARGSUSED*/
int
-_kvm_initvtop(kd)
- kvm_t *kd;
+_kvm_initvtop(kvm_t *kd)
{
return (0);
}
int
-_kvm_kvatop(kd, va, pa)
- kvm_t *kd;
- u_long va;
- u_long *pa;
+_kvm_kvatop(kvm_t *kd, u_long va, u_long *pa)
{
cpu_kcore_hdr_t *cpu_kh;
alpha_pt_entry_t pte;
@@ -156,9 +151,7 @@
* Translate a physical address to a file-offset in the crash dump.
*/
off_t
-_kvm_pa2off(kd, pa)
- kvm_t *kd;
- u_long pa;
+_kvm_pa2off(kvm_t *kd, u_long pa)
{
cpu_kcore_hdr_t *cpu_kh;
phys_ram_seg_t *ramsegs;
@@ -187,8 +180,7 @@
* have to deal with these NOT being constants! (i.e. m68k)
*/
int
-_kvm_mdopen(kd)
- kvm_t *kd;
+_kvm_mdopen(kvm_t *kd)
{
kd->usrstack = USRSTACK;
Index: src/lib/libkvm/kvm_arm.c
diff -u src/lib/libkvm/kvm_arm.c:1.4 src/lib/libkvm/kvm_arm.c:1.5
--- src/lib/libkvm/kvm_arm.c:1.4 Tue Jan 15 13:57:42 2008
+++ src/lib/libkvm/kvm_arm.c Sun Sep 19 02:07:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kvm_arm.c,v 1.4 2008/01/15 13:57:42 ad Exp $ */
+/* $NetBSD: kvm_arm.c,v 1.5 2010/09/19 02:07:00 jym Exp $ */
/*-
* Copyright (C) 1996 Wolfgang Solfrank.
@@ -39,7 +39,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: kvm_arm.c,v 1.4 2008/01/15 13:57:42 ad Exp $");
+__RCSID("$NetBSD: kvm_arm.c,v 1.5 2010/09/19 02:07:00 jym Exp $");
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
@@ -71,7 +71,7 @@
}
int
-_kvm_kvatop(kvm_t * kd, u_long va, u_long * pa)
+_kvm_kvatop(kvm_t * kd, u_long va, u_long *pa)
{
cpu_kcore_hdr_t *cpu_kh;
pd_entry_t pde;
Index: src/lib/libkvm/kvm_m68k.h
diff -u src/lib/libkvm/kvm_m68k.h:1.4 src/lib/libkvm/kvm_m68k.h:1.5
--- src/lib/libkvm/kvm_m68k.h:1.4 Mon Apr 28 20:23:01 2008
+++ src/lib/libkvm/kvm_m68k.h Sun Sep 19 02:07:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kvm_m68k.h,v 1.4 2008/04/28 20:23:01 martin Exp $ */
+/* $NetBSD: kvm_m68k.h,v 1.5 2010/09/19 02:07:00 jym Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -30,10 +30,10 @@
*/
struct kvm_ops {
- int (*initvtop) __P((kvm_t *));
- void (*freevtop) __P((kvm_t *));
- int (*kvatop) __P((kvm_t *, u_long, u_long *));
- off_t (*pa2off) __P((kvm_t *, u_long));
+ int (*initvtop)(kvm_t *);
+ void (*freevtop)(kvm_t *);
+ int (*kvatop) (kvm_t *, u_long, u_long *);
+ off_t (*pa2off) (kvm_t *, u_long);
};
struct vmstate {
Index: src/lib/libkvm/kvm_file.c
diff -u src/lib/libkvm/kvm_file.c:1.26 src/lib/libkvm/kvm_file.c:1.27
--- src/lib/libkvm/kvm_file.c:1.26 Wed Mar 12 05:57:28 2008
+++ src/lib/libkvm/kvm_file.c Sun Sep 19 02:07:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kvm_file.c,v 1.26 2008/03/12 05:57:28 mrg Exp $ */
+/* $NetBSD: kvm_file.c,v 1.27 2010/09/19 02:07:00 jym Exp $ */
/*-
* Copyright (c) 1989, 1992, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)kvm_file.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: kvm_file.c,v 1.26 2008/03/12 05:57:28 mrg Exp $");
+__RCSID("$NetBSD: kvm_file.c,v 1.27 2010/09/19 02:07:00 jym Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -76,17 +76,14 @@
(kvm_read(kd, (u_long) addr, obj, sizeof(*obj)) != sizeof(*obj))
static int
-kvm_deadfiles __P((kvm_t *, int, int, long, int));
+kvm_deadfiles(kvm_t *, int, int, long, int);
/*
* Get file structures.
*/
/*ARGSUSED*/
static int
-kvm_deadfiles(kd, op, arg, ofhead, numfiles)
- kvm_t *kd;
- int op, arg, numfiles;
- long ofhead;
+kvm_deadfiles(kvm_t *kd, int op, int arg, long ofhead, int numfiles)
{
size_t buflen = kd->argspc_len, n = 0;
struct file *fp;
@@ -128,10 +125,7 @@
}
char *
-kvm_getfiles(kd, op, arg, cnt)
- kvm_t *kd;
- int op, arg;
- int *cnt;
+kvm_getfiles(kvm_t *kd, int op, int arg, int *cnt)
{
size_t size;
int mib[2], st;
Index: src/lib/libkvm/kvm_i386.c
diff -u src/lib/libkvm/kvm_i386.c:1.26 src/lib/libkvm/kvm_i386.c:1.27
--- src/lib/libkvm/kvm_i386.c:1.26 Sat Oct 25 23:59:06 2008
+++ src/lib/libkvm/kvm_i386.c Sun Sep 19 02:07:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kvm_i386.c,v 1.26 2008/10/25 23:59:06 mrg Exp $ */
+/* $NetBSD: kvm_i386.c,v 1.27 2010/09/19 02:07:00 jym Exp $ */
/*-
* Copyright (c) 1989, 1992, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)kvm_hp300.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: kvm_i386.c,v 1.26 2008/10/25 23:59:06 mrg Exp $");
+__RCSID("$NetBSD: kvm_i386.c,v 1.27 2010/09/19 02:07:00 jym Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -73,8 +73,7 @@
#endif
void
-_kvm_freevtop(kd)
- kvm_t *kd;
+_kvm_freevtop(kvm_t *kd)
{
/* Not actually used for anything right now, but safe. */
@@ -84,21 +83,17 @@
/*ARGSUSED*/
int
-_kvm_initvtop(kd)
- kvm_t *kd;
+_kvm_initvtop(kvm_t *kd)
{
- return (0);
+ return 0;
}
/*
* Translate a kernel virtual address to a physical address.
*/
int
-_kvm_kvatop(kd, va, pa)
- kvm_t *kd;
- u_long va;
- u_long *pa;
+_kvm_kvatop(kvm_t *kd, u_long va, u_long *pa)
{
cpu_kcore_hdr_t *cpu_kh;
u_long page_off;
@@ -165,9 +160,7 @@
* Translate a physical address to a file-offset in the crash dump.
*/
off_t
-_kvm_pa2off(kd, pa)
- kvm_t *kd;
- u_long pa;
+_kvm_pa2off(kvm_t *kd, u_long pa)
{
cpu_kcore_hdr_t *cpu_kh;
phys_ram_seg_t *ramsegs;
@@ -196,13 +189,12 @@
* have to deal with these NOT being constants! (i.e. m68k)
*/
int
-_kvm_mdopen(kd)
- kvm_t *kd;
+_kvm_mdopen(kvm_t *kd)
{
kd->usrstack = USRSTACK;
kd->min_uva = VM_MIN_ADDRESS;
kd->max_uva = VM_MAXUSER_ADDRESS;
- return (0);
+ return 0;
}
Index: src/lib/libkvm/kvm_getloadavg.c
diff -u src/lib/libkvm/kvm_getloadavg.c:1.8 src/lib/libkvm/kvm_getloadavg.c:1.9
--- src/lib/libkvm/kvm_getloadavg.c:1.8 Thu Aug 7 16:44:37 2003
+++ src/lib/libkvm/kvm_getloadavg.c Sun Sep 19 02:07:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kvm_getloadavg.c,v 1.8 2003/08/07 16:44:37 agc Exp $ */
+/* $NetBSD: kvm_getloadavg.c,v 1.9 2010/09/19 02:07:00 jym Exp $ */
/*-
* Copyright (c) 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)kvm_getloadavg.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: kvm_getloadavg.c,v 1.8 2003/08/07 16:44:37 agc Exp $");
+__RCSID("$NetBSD: kvm_getloadavg.c,v 1.9 2010/09/19 02:07:00 jym Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -70,10 +70,7 @@
* Return number of samples retrieved, or -1 on error.
*/
int
-kvm_getloadavg(kd, loadavg, nelem)
- kvm_t *kd;
- double loadavg[];
- int nelem;
+kvm_getloadavg(kvm_t *kd, double loadavg[], int nelem)
{
struct loadavg loadinfo;
struct nlist *p;
Index: src/lib/libkvm/kvm_m68k.c
diff -u src/lib/libkvm/kvm_m68k.c:1.16 src/lib/libkvm/kvm_m68k.c:1.17
--- src/lib/libkvm/kvm_m68k.c:1.16 Mon Apr 28 20:23:01 2008
+++ src/lib/libkvm/kvm_m68k.c Sun Sep 19 02:07:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kvm_m68k.c,v 1.16 2008/04/28 20:23:01 martin Exp $ */
+/* $NetBSD: kvm_m68k.c,v 1.17 2010/09/19 02:07:00 jym Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -78,8 +78,7 @@
* into crash dump files. This is where we do the dispatch work.
*/
int
-_kvm_initvtop(kd)
- kvm_t *kd;
+_kvm_initvtop(kvm_t *kd)
{
cpu_kcore_hdr_t *h;
struct name_ops *nop;
@@ -125,26 +124,20 @@
}
void
-_kvm_freevtop(kd)
- kvm_t *kd;
+_kvm_freevtop(kvm_t *kd)
{
(kd->vmst->ops->freevtop)(kd);
free(kd->vmst);
}
int
-_kvm_kvatop(kd, va, pap)
- kvm_t *kd;
- u_long va;
- u_long *pap;
+_kvm_kvatop(kvm_t *kd, u_long va, u_long *pap)
{
return ((kd->vmst->ops->kvatop)(kd, va, pap));
}
off_t
-_kvm_pa2off(kd, pa)
- kvm_t *kd;
- u_long pa;
+_kvm_pa2off(kvm_t *kd, u_long pa)
{
return ((kd->vmst->ops->pa2off)(kd, pa));
}
@@ -155,8 +148,7 @@
* have to deal with these NOT being constants! (i.e. m68k)
*/
int
-_kvm_mdopen(kd)
- kvm_t *kd;
+_kvm_mdopen(kvm_t *kd)
{
u_long max_uva;
extern struct ps_strings *__ps_strings;
Index: src/lib/libkvm/kvm_private.h
diff -u src/lib/libkvm/kvm_private.h:1.16 src/lib/libkvm/kvm_private.h:1.17
--- src/lib/libkvm/kvm_private.h:1.16 Tue Jan 15 13:57:42 2008
+++ src/lib/libkvm/kvm_private.h Sun Sep 19 02:07:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kvm_private.h,v 1.16 2008/01/15 13:57:42 ad Exp $ */
+/* $NetBSD: kvm_private.h,v 1.17 2010/09/19 02:07:00 jym Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -104,19 +104,18 @@
/*
* Functions used internally by kvm, but across kvm modules.
*/
-void _kvm_err __P((kvm_t *kd, const char *program, const char *fmt, ...))
- __attribute__((__format__(__printf__, 3, 4)));
-int _kvm_dump_mkheader __P((kvm_t *kd_live, kvm_t *kd_dump));
-void _kvm_freeprocs __P((kvm_t *kd));
-void _kvm_freevtop __P((kvm_t *));
-int _kvm_mdopen __P((kvm_t *));
-int _kvm_initvtop __P((kvm_t *));
-int _kvm_kvatop __P((kvm_t *, u_long, u_long *));
-void *_kvm_malloc __P((kvm_t *kd, size_t));
-off_t _kvm_pa2off __P((kvm_t *, u_long));
-void *_kvm_realloc __P((kvm_t *kd, void *, size_t));
-void _kvm_syserr
- __P((kvm_t *kd, const char *program, const char *fmt, ...))
+void _kvm_err(kvm_t *, const char *, const char *, ...)
+ __attribute__((__format__(__printf__, 3, 4)));
+int _kvm_dump_mkheader(kvm_t *, kvm_t *);
+void _kvm_freeprocs(kvm_t *);
+void _kvm_freevtop(kvm_t *);
+int _kvm_mdopen(kvm_t *);
+int _kvm_initvtop(kvm_t *);
+int _kvm_kvatop(kvm_t *, u_long, u_long *);
+void *_kvm_malloc(kvm_t *, size_t);
+off_t _kvm_pa2off(kvm_t *, u_long);
+void *_kvm_realloc(kvm_t *, void *, size_t);
+void _kvm_syserr(kvm_t *, const char *, const char *, ...)
__attribute__((__format__(__printf__, 3, 4)));
ssize_t _kvm_pread(kvm_t *, int, void *, size_t, off_t);
Index: src/lib/libkvm/kvm_vax.c
diff -u src/lib/libkvm/kvm_vax.c:1.16 src/lib/libkvm/kvm_vax.c:1.17
--- src/lib/libkvm/kvm_vax.c:1.16 Thu Aug 7 16:44:40 2003
+++ src/lib/libkvm/kvm_vax.c Sun Sep 19 02:07:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kvm_vax.c,v 1.16 2003/08/07 16:44:40 agc Exp $ */
+/* $NetBSD: kvm_vax.c,v 1.17 2010/09/19 02:07:00 jym Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -64,16 +64,14 @@
};
void
-_kvm_freevtop(kd)
- kvm_t *kd;
+_kvm_freevtop(kvm_t *kd)
{
if (kd->vmst != 0)
free(kd->vmst);
}
int
-_kvm_initvtop(kd)
- kvm_t *kd;
+_kvm_initvtop(kvm_t *kd)
{
struct vmstate *vm;
struct stat st;
@@ -109,10 +107,7 @@
* physical address. This routine is used only for crash dumps.
*/
int
-_kvm_kvatop(kd, va, pa)
- kvm_t *kd;
- u_long va;
- u_long *pa;
+_kvm_kvatop(kvm_t *kd, u_long va, u_long *pa)
{
u_long end;
@@ -136,9 +131,7 @@
* XXX - crash dump doesn't work anyway.
*/
off_t
-_kvm_pa2off(kd, pa)
- kvm_t *kd;
- u_long pa;
+_kvm_pa2off(kvm_t *kd, u_long pa)
{
return(kd->dump_off + pa);
}
@@ -150,8 +143,7 @@
* have to deal with these NOT being constants! (i.e. m68k)
*/
int
-_kvm_mdopen(kd)
- kvm_t *kd;
+_kvm_mdopen(kvm_t *kd)
{
kd->usrstack = USRSTACK;
Index: src/lib/libkvm/kvm_m68k_cmn.c
diff -u src/lib/libkvm/kvm_m68k_cmn.c:1.13 src/lib/libkvm/kvm_m68k_cmn.c:1.14
--- src/lib/libkvm/kvm_m68k_cmn.c:1.13 Tue Jan 15 13:57:42 2008
+++ src/lib/libkvm/kvm_m68k_cmn.c Sun Sep 19 02:07:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kvm_m68k_cmn.c,v 1.13 2008/01/15 13:57:42 ad Exp $ */
+/* $NetBSD: kvm_m68k_cmn.c,v 1.14 2010/09/19 02:07:00 jym Exp $ */
/*-
* Copyright (c) 1989, 1992, 1993
@@ -74,7 +74,7 @@
#if 0
static char sccsid[] = "@(#)kvm_hp300.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: kvm_m68k_cmn.c,v 1.13 2008/01/15 13:57:42 ad Exp $");
+__RCSID("$NetBSD: kvm_m68k_cmn.c,v 1.14 2010/09/19 02:07:00 jym Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -100,10 +100,10 @@
#include "kvm_private.h"
#include "kvm_m68k.h"
-int _kvm_cmn_initvtop __P((kvm_t *));
-void _kvm_cmn_freevtop __P((kvm_t *));
-int _kvm_cmn_kvatop __P((kvm_t *, u_long, u_long *));
-off_t _kvm_cmn_pa2off __P((kvm_t *, u_long));
+int _kvm_cmn_initvtop(kvm_t *);
+void _kvm_cmn_freevtop(kvm_t *);
+int _kvm_cmn_kvatop(kvm_t *, u_long, u_long *);
+off_t _kvm_cmn_pa2off(kvm_t *, u_long);
struct kvm_ops _kvm_ops_cmn = {
_kvm_cmn_initvtop,
@@ -111,8 +111,8 @@
_kvm_cmn_kvatop,
_kvm_cmn_pa2off };
-static int vatop_030 __P((kvm_t *, u_int32_t, u_long, u_long *));
-static int vatop_040 __P((kvm_t *, u_int32_t, u_long, u_long *));
+static int vatop_030(kvm_t *, uint32_t, u_long, u_long *);
+static int vatop_040(kvm_t *, uint32_t, u_long, u_long *);
#define _kvm_btop(v, a) (((unsigned)(a)) >> (v)->pgshift)
@@ -120,29 +120,24 @@
(kvm_read(kd, addr, (char *)(p), sizeof(*(p))) != sizeof(*(p)))
void
-_kvm_cmn_freevtop(kd)
- kvm_t *kd;
+_kvm_cmn_freevtop(kvm_t *kd)
{
/* No private state information to keep. */
}
int
-_kvm_cmn_initvtop(kd)
- kvm_t *kd;
+_kvm_cmn_initvtop(kvm_t *kd)
{
/* No private state information to keep. */
return (0);
}
int
-_kvm_cmn_kvatop(kd, va, pa)
- kvm_t *kd;
- u_long va;
- u_long *pa;
+_kvm_cmn_kvatop(kvm_t *kd, u_long va, u_long *pa)
{
cpu_kcore_hdr_t *h = kd->cpu_data;
struct m68k_kcore_hdr *m = &h->un._m68k;
- int (*vtopf) __P((kvm_t *, u_int32_t, u_long, u_long *));
+ int (*vtopf)(kvm_t *, uint32_t, u_long, u_long *);
if (ISALIVE(kd)) {
_kvm_err(kd, 0, "vatop called in live kernel!");
@@ -165,9 +160,7 @@
* Translate a physical address to a file-offset in the crash dump.
*/
off_t
-_kvm_cmn_pa2off(kd, pa)
- kvm_t *kd;
- u_long pa;
+_kvm_cmn_pa2off(kvm_t *kd, u_long pa)
{
cpu_kcore_hdr_t *h = kd->cpu_data;
struct m68k_kcore_hdr *m = &h->un._m68k;
@@ -193,17 +186,13 @@
*/
static int
-vatop_030(kd, stpa, va, pa)
- kvm_t *kd;
- u_int32_t stpa;
- u_long va;
- u_long *pa;
+vatop_030(kvm_t *kd, uint32_t stpa, u_long va, u_long *pa)
{
cpu_kcore_hdr_t *h = kd->cpu_data;
struct m68k_kcore_hdr *m = &h->un._m68k;
struct vmstate *vm = kd->vmst;
u_long addr;
- u_int32_t ste, pte;
+ uint32_t ste, pte;
u_int p, offset;
offset = va & vm->pgofset;
@@ -258,18 +247,14 @@
}
static int
-vatop_040(kd, stpa, va, pa)
- kvm_t *kd;
- u_int32_t stpa;
- u_long va;
- u_long *pa;
+vatop_040(kvm_t *kd, uint32_t stpa, u_long va, u_long *pa)
{
cpu_kcore_hdr_t *h = kd->cpu_data;
struct m68k_kcore_hdr *m = &h->un._m68k;
struct vmstate *vm = kd->vmst;
u_long addr;
- u_int32_t stpa2;
- u_int32_t ste, pte;
+ uint32_t stpa2;
+ uint32_t ste, pte;
u_int offset;
offset = va & vm->pgofset;
Index: src/lib/libkvm/kvm_sparc64.c
diff -u src/lib/libkvm/kvm_sparc64.c:1.13 src/lib/libkvm/kvm_sparc64.c:1.14
--- src/lib/libkvm/kvm_sparc64.c:1.13 Fri Jan 18 16:26:09 2008
+++ src/lib/libkvm/kvm_sparc64.c Sun Sep 19 02:07:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kvm_sparc64.c,v 1.13 2008/01/18 16:26:09 martin Exp $ */
+/* $NetBSD: kvm_sparc64.c,v 1.14 2010/09/19 02:07:00 jym Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)kvm_sparc.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: kvm_sparc64.c,v 1.13 2008/01/18 16:26:09 martin Exp $");
+__RCSID("$NetBSD: kvm_sparc64.c,v 1.14 2010/09/19 02:07:00 jym Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -69,11 +69,8 @@
#include "kvm_private.h"
-int _kvm_kvatop __P((kvm_t *, u_long, u_long *));
-
void
-_kvm_freevtop(kd)
- kvm_t *kd;
+_kvm_freevtop(kvm_t *kd)
{
if (kd->vmst != 0) {
_kvm_err(kd, kd->program, "_kvm_freevtop: internal error");
@@ -89,8 +86,7 @@
* We should read in and cache the ksegs here to speed up operations...
*/
int
-_kvm_initvtop(kd)
- kvm_t *kd;
+_kvm_initvtop(kvm_t *kd)
{
kd->nbpg = 0x2000;
@@ -104,10 +100,7 @@
* physical address. This routine is used only for crash dumps.
*/
int
-_kvm_kvatop(kd, va, pa)
- kvm_t *kd;
- u_long va;
- u_long *pa;
+_kvm_kvatop(kvm_t *kd, u_long va, u_long *pa)
{
cpu_kcore_hdr_t *cpup = kd->cpu_data;
u_long kernbase = cpup->kernbase;
@@ -236,9 +229,7 @@
* Translate a physical address to a file-offset in the crash dump.
*/
off_t
-_kvm_pa2off(kd, pa)
- kvm_t *kd;
- u_long pa;
+_kvm_pa2off(kvm_t *kd, u_long pa)
{
cpu_kcore_hdr_t *cpup = kd->cpu_data;
phys_ram_seg_t *mp;
@@ -274,8 +265,7 @@
* have to deal with these NOT being constants! (i.e. m68k)
*/
int
-_kvm_mdopen(kd)
- kvm_t *kd;
+_kvm_mdopen(kvm_t *kd)
{
u_long max_uva;
extern struct ps_strings *__ps_strings;
Index: src/lib/libkvm/kvm_mips.c
diff -u src/lib/libkvm/kvm_mips.c:1.18 src/lib/libkvm/kvm_mips.c:1.19
--- src/lib/libkvm/kvm_mips.c:1.18 Tue Jan 15 13:57:42 2008
+++ src/lib/libkvm/kvm_mips.c Sun Sep 19 02:07:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kvm_mips.c,v 1.18 2008/01/15 13:57:42 ad Exp $ */
+/* $NetBSD: kvm_mips.c,v 1.19 2010/09/19 02:07:00 jym Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: kvm_mips.c,v 1.18 2008/01/15 13:57:42 ad Exp $");
+__RCSID("$NetBSD: kvm_mips.c,v 1.19 2010/09/19 02:07:00 jym Exp $");
#endif /* LIBC_SCCS and not lint */
/*
@@ -63,8 +63,7 @@
#include <mips/vmparam.h>
void
-_kvm_freevtop(kd)
- kvm_t *kd;
+_kvm_freevtop(kvm_t *kd)
{
/* Not actually used for anything right now, but safe. */
@@ -73,8 +72,7 @@
}
int
-_kvm_initvtop(kd)
- kvm_t *kd;
+_kvm_initvtop(kvm_t *kd)
{
return (0);
@@ -84,10 +82,7 @@
* Translate a kernel virtual address to a physical address.
*/
int
-_kvm_kvatop(kd, va, pa)
- kvm_t *kd;
- u_long va;
- u_long *pa;
+_kvm_kvatop(kvm_t *kd, u_long va, u_long *pa)
{
cpu_kcore_hdr_t *cpu_kh;
int page_off;
@@ -172,9 +167,7 @@
* Translate a physical address to a file-offset in the crash dump.
*/
off_t
-_kvm_pa2off(kd, pa)
- kvm_t *kd;
- u_long pa;
+_kvm_pa2off(kvm_t *kd, u_long pa)
{
cpu_kcore_hdr_t *cpu_kh;
phys_ram_seg_t *ramsegs;
@@ -203,8 +196,7 @@
* have to deal with these NOT being constants! (i.e. m68k)
*/
int
-_kvm_mdopen(kd)
- kvm_t *kd;
+_kvm_mdopen(kvm_t *kd)
{
kd->usrstack = USRSTACK;
Index: src/lib/libkvm/kvm_powerpc.c
diff -u src/lib/libkvm/kvm_powerpc.c:1.9 src/lib/libkvm/kvm_powerpc.c:1.10
--- src/lib/libkvm/kvm_powerpc.c:1.9 Thu Feb 25 23:35:29 2010
+++ src/lib/libkvm/kvm_powerpc.c Sun Sep 19 02:07:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kvm_powerpc.c,v 1.9 2010/02/25 23:35:29 matt Exp $ */
+/* $NetBSD: kvm_powerpc.c,v 1.10 2010/09/19 02:07:00 jym Exp $ */
/*
* Copyright (c) 2005 Wasabi Systems, Inc.
@@ -97,8 +97,7 @@
uint32_t api, int secondary);
void
-_kvm_freevtop(kd)
- kvm_t *kd;
+_kvm_freevtop(kvm_t *kd)
{
if (kd->vmst != 0)
free(kd->vmst);
@@ -106,8 +105,7 @@
/*ARGSUSED*/
int
-_kvm_initvtop(kd)
- kvm_t *kd;
+_kvm_initvtop(kvm_t *kd)
{
return 0;
@@ -116,11 +114,7 @@
#define BAT601_SIZE(b) ((((b) << 17) | ~BAT601_BLPI) + 1)
static int
-_kvm_match_601bat(kd, va, pa, off)
- kvm_t *kd;
- u_long va;
- u_long *pa;
- int *off;
+_kvm_match_601bat(kvm_t *kd, u_long va, u_long *pa, int *off)
{
cpu_kcore_hdr_t *cpu_kh;
u_long pgoff;
@@ -148,11 +142,7 @@
#define BAT_SIZE(b) ((((b) << 15) | ~BAT_EPI) + 1)
static int
-_kvm_match_bat(kd, va, pa, off)
- kvm_t *kd;
- u_long va;
- u_long *pa;
- int *off;
+_kvm_match_bat(kvm_t *kd, u_long va, u_long *pa, int *off)
{
cpu_kcore_hdr_t *cpu_kh;
u_long pgoff;
@@ -182,11 +172,7 @@
#define SR_VSID_HASH_MASK 0x0007ffff
static struct pte *
-_kvm_scan_pteg(pteg, vsid, api, secondary)
- struct pteg *pteg;
- uint32_t vsid;
- uint32_t api;
- int secondary;
+_kvm_scan_pteg(struct pteg *pteg, uint32_t vsid, uint32_t api, int secondary)
{
struct pte *pte;
u_long ptehi;
@@ -211,11 +197,7 @@
#define HASH_MASK 0x0007ffff
static int
-_kvm_match_sr(kd, va, pa, off)
- kvm_t *kd;
- u_long va;
- u_long *pa;
- int *off;
+_kvm_match_sr(kvm_t *kd, u_long va, u_long *pa, int *off)
{
cpu_kcore_hdr_t *cpu_kh;
struct pteg pteg;
@@ -283,10 +265,7 @@
* Translate a KVA to a PA
*/
int
-_kvm_kvatop(kd, va, pa)
- kvm_t *kd;
- u_long va;
- u_long *pa;
+_kvm_kvatop(kvm_t *kd, u_long va, u_long *pa)
{
cpu_kcore_hdr_t *cpu_kh;
int offs;
@@ -351,9 +330,7 @@
}
off_t
-_kvm_pa2off(kd, pa)
- kvm_t *kd;
- u_long pa;
+_kvm_pa2off(kvm_t *kd, u_long pa)
{
cpu_kcore_hdr_t *cpu_kh;
phys_ram_seg_t *ram;
@@ -382,8 +359,7 @@
* have to deal with these NOT being constants! (i.e. m68k)
*/
int
-_kvm_mdopen(kd)
- kvm_t *kd;
+_kvm_mdopen(kvm_t *kd)
{
uintptr_t max_uva;
extern struct ps_strings *__ps_strings;
Index: src/lib/libkvm/kvm_sun3x.c
diff -u src/lib/libkvm/kvm_sun3x.c:1.9 src/lib/libkvm/kvm_sun3x.c:1.10
--- src/lib/libkvm/kvm_sun3x.c:1.9 Mon Apr 28 20:23:01 2008
+++ src/lib/libkvm/kvm_sun3x.c Sun Sep 19 02:07:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kvm_sun3x.c,v 1.9 2008/04/28 20:23:01 martin Exp $ */
+/* $NetBSD: kvm_sun3x.c,v 1.10 2010/09/19 02:07:00 jym Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)kvm_sparc.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: kvm_sun3x.c,v 1.9 2008/04/28 20:23:01 martin Exp $");
+__RCSID("$NetBSD: kvm_sun3x.c,v 1.10 2010/09/19 02:07:00 jym Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -59,10 +59,10 @@
#include "kvm_private.h"
#include "kvm_m68k.h"
-int _kvm_sun3x_initvtop __P((kvm_t *));
-void _kvm_sun3x_freevtop __P((kvm_t *));
-int _kvm_sun3x_kvatop __P((kvm_t *, u_long, u_long *));
-off_t _kvm_sun3x_pa2off __P((kvm_t *, u_long));
+int _kvm_sun3x_initvtop(kvm_t *);
+void _kvm_sun3x_freevtop(kvm_t *);
+int _kvm_sun3x_kvatop (kvm_t *, u_long, u_long *);
+off_t _kvm_sun3x_pa2off (kvm_t *, u_long);
struct kvm_ops _kvm_ops_sun3x = {
_kvm_sun3x_initvtop,
@@ -82,15 +82,13 @@
* into crash dump files. Nothing to do here.
*/
int
-_kvm_sun3x_initvtop(kd)
- kvm_t *kd;
+_kvm_sun3x_initvtop(kvm_t *kd)
{
- return (0);
+ return 0;
}
void
-_kvm_sun3x_freevtop(kd)
- kvm_t *kd;
+_kvm_sun3x_freevtop(kvm_t *kd)
{
}
@@ -101,10 +99,7 @@
* physical address. This routine is used only for crash dumps.
*/
int
-_kvm_sun3x_kvatop(kd, va, pap)
- kvm_t *kd;
- u_long va;
- u_long *pap;
+_kvm_sun3x_kvatop(kvm_t *kd, u_long va, u_long *pap)
{
cpu_kcore_hdr_t *h = kd->cpu_data;
struct sun3x_kcore_hdr *s = &h->un._sun3x;
@@ -161,9 +156,7 @@
* Translate a physical address to a file-offset in the crash dump.
*/
off_t
-_kvm_sun3x_pa2off(kd, pa)
- kvm_t *kd;
- u_long pa;
+_kvm_sun3x_pa2off(kvm_t *kd, u_long pa)
{
off_t off;
phys_ram_seg_t *rsp;
Index: src/lib/libkvm/kvm_powerpc64.c
diff -u src/lib/libkvm/kvm_powerpc64.c:1.2 src/lib/libkvm/kvm_powerpc64.c:1.3
--- src/lib/libkvm/kvm_powerpc64.c:1.2 Wed Jul 5 18:33:18 2006
+++ src/lib/libkvm/kvm_powerpc64.c Sun Sep 19 02:07:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kvm_powerpc64.c,v 1.2 2006/07/05 18:33:18 ross Exp $ */
+/* $NetBSD: kvm_powerpc64.c,v 1.3 2010/09/19 02:07:00 jym Exp $ */
/*
* Copyright (c) 2005 Wasabi Systems, Inc.
@@ -90,8 +90,7 @@
#include <powerpc/oea/pte.h>
void
-_kvm_freevtop(kd)
- kvm_t *kd;
+_kvm_freevtop(kvm_t *kd)
{
if (kd->vmst != 0)
free(kd->vmst);
@@ -99,8 +98,7 @@
/*ARGSUSED*/
int
-_kvm_initvtop(kd)
- kvm_t *kd;
+_kvm_initvtop(kvm_t *kd)
{
return 0;
@@ -114,10 +112,7 @@
* Translate a KVA to a PA
*/
int
-_kvm_kvatop(kd, va, pa)
- kvm_t *kd;
- u_long va;
- u_long *pa;
+_kvm_kvatop(kvm_t *kd, u_long va, u_long *pa)
{
cpu_kcore_hdr_t *cpu_kh;
uint32_t pvr;
@@ -138,9 +133,7 @@
}
off_t
-_kvm_pa2off(kd, pa)
- kvm_t *kd;
- u_long pa;
+_kvm_pa2off(kvm_t *kd, u_long pa)
{
cpu_kcore_hdr_t *cpu_kh;
phys_ram_seg_t *ram;
@@ -169,8 +162,7 @@
* have to deal with these NOT being constants! (i.e. m68k)
*/
int
-_kvm_mdopen(kd)
- kvm_t *kd;
+_kvm_mdopen(kvm_t *kd)
{
uintptr_t max_uva;
extern struct ps_strings *__ps_strings;
Index: src/lib/libkvm/kvm_proc.c
diff -u src/lib/libkvm/kvm_proc.c:1.84 src/lib/libkvm/kvm_proc.c:1.85
--- src/lib/libkvm/kvm_proc.c:1.84 Wed Oct 21 21:11:58 2009
+++ src/lib/libkvm/kvm_proc.c Sun Sep 19 02:07:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kvm_proc.c,v 1.84 2009/10/21 21:11:58 rmind Exp $ */
+/* $NetBSD: kvm_proc.c,v 1.85 2010/09/19 02:07:00 jym Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
#if 0
static char sccsid[] = "@(#)kvm_proc.c 8.3 (Berkeley) 9/23/93";
#else
-__RCSID("$NetBSD: kvm_proc.c,v 1.84 2009/10/21 21:11:58 rmind Exp $");
+__RCSID("$NetBSD: kvm_proc.c,v 1.85 2010/09/19 02:07:00 jym Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -173,35 +173,29 @@
(kvm_read(kd, addr, (obj), sizeof(*obj)) != sizeof(*obj))
/* XXX: What uses these two functions? */
-char *_kvm_uread __P((kvm_t *, const struct proc *, u_long,
- u_long *));
-ssize_t kvm_uread __P((kvm_t *, const struct proc *, u_long, char *,
- size_t));
-
-static char *_kvm_ureadm __P((kvm_t *, const struct miniproc *, u_long,
- u_long *));
-static ssize_t kvm_ureadm __P((kvm_t *, const struct miniproc *, u_long,
- char *, size_t));
-
-static char **kvm_argv __P((kvm_t *, const struct miniproc *, u_long, int,
- int));
-static int kvm_deadprocs __P((kvm_t *, int, int, u_long, u_long, int));
-static char **kvm_doargv __P((kvm_t *, const struct miniproc *, int,
- void (*)(struct ps_strings *, u_long *, int *)));
-static char **kvm_doargv2 __P((kvm_t *, pid_t, int, int));
-static int kvm_proclist __P((kvm_t *, int, int, struct proc *,
- struct kinfo_proc *, int));
-static int proc_verify __P((kvm_t *, u_long, const struct miniproc *));
-static void ps_str_a __P((struct ps_strings *, u_long *, int *));
-static void ps_str_e __P((struct ps_strings *, u_long *, int *));
+char *_kvm_uread(kvm_t *, const struct proc *, u_long, u_long *);
+ssize_t kvm_uread(kvm_t *, const struct proc *, u_long, char *,
+ size_t);
+
+static char *_kvm_ureadm(kvm_t *, const struct miniproc *, u_long,
+ u_long *);
+static ssize_t kvm_ureadm(kvm_t *, const struct miniproc *, u_long,
+ char *, size_t);
+
+static char **kvm_argv(kvm_t *, const struct miniproc *, u_long, int, int);
+static int kvm_deadprocs(kvm_t *, int, int, u_long, u_long, int);
+static char **kvm_doargv(kvm_t *, const struct miniproc *, int,
+ void (*)(struct ps_strings *, u_long *, int *));
+static char **kvm_doargv2(kvm_t *, pid_t, int, int);
+static int kvm_proclist(kvm_t *, int, int, struct proc *,
+ struct kinfo_proc *, int);
+static int proc_verify(kvm_t *, u_long, const struct miniproc *);
+static void ps_str_a(struct ps_strings *, u_long *, int *);
+static void ps_str_e(struct ps_strings *, u_long *, int *);
static char *
-_kvm_ureadm(kd, p, va, cnt)
- kvm_t *kd;
- const struct miniproc *p;
- u_long va;
- u_long *cnt;
+_kvm_ureadm(kvm_t *kd, const struct miniproc *p, u_long va, u_long *cnt)
{
u_long addr, head;
u_long offset;
@@ -283,11 +277,7 @@
}
char *
-_kvm_uread(kd, p, va, cnt)
- kvm_t *kd;
- const struct proc *p;
- u_long va;
- u_long *cnt;
+_kvm_uread(kvm_t *kd, const struct proc *p, u_long va, u_long *cnt)
{
struct miniproc mp;
@@ -334,12 +324,8 @@
* at most maxcnt procs.
*/
static int
-kvm_proclist(kd, what, arg, p, bp, maxcnt)
- kvm_t *kd;
- int what, arg;
- struct proc *p;
- struct kinfo_proc *bp;
- int maxcnt;
+kvm_proclist(kvm_t *kd, int what, int arg, struct proc *p,
+ struct kinfo_proc *bp, int maxcnt)
{
int cnt = 0;
int nlwps;
@@ -472,12 +458,8 @@
* Return number of procs read. maxcnt is the max we will read.
*/
static int
-kvm_deadprocs(kd, what, arg, a_allproc, a_zombproc, maxcnt)
- kvm_t *kd;
- int what, arg;
- u_long a_allproc;
- u_long a_zombproc;
- int maxcnt;
+kvm_deadprocs(kvm_t *kd, int what, int arg, u_long a_allproc,
+ u_long a_zombproc, int maxcnt)
{
struct kinfo_proc *bp = kd->procbase;
int acnt, zcnt;
@@ -504,11 +486,7 @@
}
struct kinfo_proc2 *
-kvm_getproc2(kd, op, arg, esize, cnt)
- kvm_t *kd;
- int op, arg;
- size_t esize;
- int *cnt;
+kvm_getproc2(kvm_t *kd, int op, int arg, size_t esize, int *cnt)
{
size_t size;
int mib[6], st, nprocs;
@@ -747,12 +725,7 @@
}
struct kinfo_lwp *
-kvm_getlwps(kd, pid, paddr, esize, cnt)
- kvm_t *kd;
- int pid;
- u_long paddr;
- size_t esize;
- int *cnt;
+kvm_getlwps(kvm_t *kd, int pid, u_long paddr, size_t esize, int *cnt)
{
size_t size;
int mib[5], nlwps;
@@ -852,10 +825,7 @@
}
struct kinfo_proc *
-kvm_getprocs(kd, op, arg, cnt)
- kvm_t *kd;
- int op, arg;
- int *cnt;
+kvm_getprocs(kvm_t *kd, int op, int arg, int *cnt)
{
size_t size;
int mib[4], st, nprocs;
@@ -920,10 +890,7 @@
}
void *
-_kvm_realloc(kd, p, n)
- kvm_t *kd;
- void *p;
- size_t n;
+_kvm_realloc(kvm_t *kd, void *p, size_t n)
{
void *np = realloc(p, n);
@@ -939,12 +906,8 @@
* environment strings. Read at most maxcnt characters of strings.
*/
static char **
-kvm_argv(kd, p, addr, narg, maxcnt)
- kvm_t *kd;
- const struct miniproc *p;
- u_long addr;
- int narg;
- int maxcnt;
+kvm_argv(kvm_t *kd, const struct miniproc *p, u_long addr, int narg,
+ int maxcnt)
{
char *np, *cp, *ep, *ap;
u_long oaddr = (u_long)~0L;
@@ -1056,10 +1019,7 @@
}
static void
-ps_str_a(p, addr, n)
- struct ps_strings *p;
- u_long *addr;
- int *n;
+ps_str_a(struct ps_strings *p, u_long *addr, int *n)
{
*addr = (u_long)p->ps_argvstr;
@@ -1067,10 +1027,7 @@
}
static void
-ps_str_e(p, addr, n)
- struct ps_strings *p;
- u_long *addr;
- int *n;
+ps_str_e(struct ps_strings *p, u_long *addr, int *n)
{
*addr = (u_long)p->ps_envstr;
@@ -1083,10 +1040,7 @@
* being wrong are very low.
*/
static int
-proc_verify(kd, kernp, p)
- kvm_t *kd;
- u_long kernp;
- const struct miniproc *p;
+proc_verify(kvm_t *kd, u_long kernp, const struct miniproc *p)
{
struct proc kernproc;
@@ -1102,11 +1056,8 @@
}
static char **
-kvm_doargv(kd, p, nchr, info)
- kvm_t *kd;
- const struct miniproc *p;
- int nchr;
- void (*info)(struct ps_strings *, u_long *, int *);
+kvm_doargv(kvm_t *kd, const struct miniproc *p, int nchr,
+ void (*info)(struct ps_strings *, u_long *, int *))
{
char **ap;
u_long addr;
@@ -1140,10 +1091,7 @@
* Get the command args. This code is now machine independent.
*/
char **
-kvm_getargv(kd, kp, nchr)
- kvm_t *kd;
- const struct kinfo_proc *kp;
- int nchr;
+kvm_getargv(kvm_t *kd, const struct kinfo_proc *kp, int nchr)
{
struct miniproc p;
@@ -1152,10 +1100,7 @@
}
char **
-kvm_getenvv(kd, kp, nchr)
- kvm_t *kd;
- const struct kinfo_proc *kp;
- int nchr;
+kvm_getenvv(kvm_t *kd, const struct kinfo_proc *kp, int nchr)
{
struct miniproc p;
@@ -1164,11 +1109,7 @@
}
static char **
-kvm_doargv2(kd, pid, type, nchr)
- kvm_t *kd;
- pid_t pid;
- int type;
- int nchr;
+kvm_doargv2(kvm_t *kd, pid_t pid, int type, int nchr)
{
size_t bufs;
int narg, mib[4];
@@ -1246,20 +1187,14 @@
}
char **
-kvm_getargv2(kd, kp, nchr)
- kvm_t *kd;
- const struct kinfo_proc2 *kp;
- int nchr;
+kvm_getargv2(kvm_t *kd, const struct kinfo_proc2 *kp, int nchr)
{
return (kvm_doargv2(kd, kp->p_pid, KERN_PROC_ARGV, nchr));
}
char **
-kvm_getenvv2(kd, kp, nchr)
- kvm_t *kd;
- const struct kinfo_proc2 *kp;
- int nchr;
+kvm_getenvv2(kvm_t *kd, const struct kinfo_proc2 *kp, int nchr)
{
return (kvm_doargv2(kd, kp->p_pid, KERN_PROC_ENV, nchr));
@@ -1269,12 +1204,8 @@
* Read from user space. The user context is given by p.
*/
static ssize_t
-kvm_ureadm(kd, p, uva, buf, len)
- kvm_t *kd;
- const struct miniproc *p;
- u_long uva;
- char *buf;
- size_t len;
+kvm_ureadm(kvm_t *kd, const struct miniproc *p, u_long uva,
+ char *buf, size_t len)
{
char *cp;
@@ -1299,12 +1230,7 @@
}
ssize_t
-kvm_uread(kd, p, uva, buf, len)
- kvm_t *kd;
- const struct proc *p;
- u_long uva;
- char *buf;
- size_t len;
+kvm_uread(kvm_t *kd, const struct proc *p, u_long uva, char *buf, size_t len)
{
struct miniproc mp;
Index: src/lib/libkvm/kvm_sh3.c
diff -u src/lib/libkvm/kvm_sh3.c:1.6 src/lib/libkvm/kvm_sh3.c:1.7
--- src/lib/libkvm/kvm_sh3.c:1.6 Thu Aug 7 16:44:39 2003
+++ src/lib/libkvm/kvm_sh3.c Sun Sep 19 02:07:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kvm_sh3.c,v 1.6 2003/08/07 16:44:39 agc Exp $ */
+/* $NetBSD: kvm_sh3.c,v 1.7 2010/09/19 02:07:00 jym Exp $ */
/*-
* Copyright (c) 1989, 1992, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)kvm_hp300.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: kvm_sh3.c,v 1.6 2003/08/07 16:44:39 agc Exp $");
+__RCSID("$NetBSD: kvm_sh3.c,v 1.7 2010/09/19 02:07:00 jym Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -72,8 +72,7 @@
#endif
void
-_kvm_freevtop(kd)
- kvm_t *kd;
+_kvm_freevtop(kvm_t *kd)
{
/* Not actually used for anything right now, but safe. */
@@ -83,8 +82,7 @@
/*ARGSUSED*/
int
-_kvm_initvtop(kd)
- kvm_t *kd;
+_kvm_initvtop(kvm_t *kd)
{
return (0);
@@ -94,10 +92,7 @@
* Translate a kernel virtual address to a physical address.
*/
int
-_kvm_kvatop(kd, va, pa)
- kvm_t *kd;
- u_long va;
- u_long *pa;
+_kvm_kvatop(kvm_t *kd, u_long va, u_long *pa)
{
_kvm_err(kd, 0, "vatop not yet implemented!");
return 0;
@@ -107,9 +102,7 @@
* Translate a physical address to a file-offset in the crash dump.
*/
off_t
-_kvm_pa2off(kd, pa)
- kvm_t *kd;
- u_long pa;
+_kvm_pa2off(kvm_t *kd, u_long pa)
{
_kvm_err(kd, 0, "pa2off not yet implemented!");
return 0;
@@ -121,8 +114,7 @@
* have to deal with these NOT being constants! (i.e. m68k)
*/
int
-_kvm_mdopen(kd)
- kvm_t *kd;
+_kvm_mdopen(kvm_t *kd)
{
kd->usrstack = USRSTACK;
Index: src/lib/libkvm/kvm_x86_64.c
diff -u src/lib/libkvm/kvm_x86_64.c:1.6 src/lib/libkvm/kvm_x86_64.c:1.7
--- src/lib/libkvm/kvm_x86_64.c:1.6 Tue Jan 15 13:57:42 2008
+++ src/lib/libkvm/kvm_x86_64.c Sun Sep 19 02:07:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kvm_x86_64.c,v 1.6 2008/01/15 13:57:42 ad Exp $ */
+/* $NetBSD: kvm_x86_64.c,v 1.7 2010/09/19 02:07:00 jym Exp $ */
/*-
* Copyright (c) 1989, 1992, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)kvm_hp300.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: kvm_x86_64.c,v 1.6 2008/01/15 13:57:42 ad Exp $");
+__RCSID("$NetBSD: kvm_x86_64.c,v 1.7 2010/09/19 02:07:00 jym Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -69,8 +69,7 @@
#include <machine/vmparam.h>
void
-_kvm_freevtop(kd)
- kvm_t *kd;
+_kvm_freevtop(kvm_t *kd)
{
/* Not actually used for anything right now, but safe. */
@@ -80,8 +79,7 @@
/*ARGSUSED*/
int
-_kvm_initvtop(kd)
- kvm_t *kd;
+_kvm_initvtop(kvm_t *kd)
{
return (0);
@@ -91,10 +89,7 @@
* Translate a kernel virtual address to a physical address.
*/
int
-_kvm_kvatop(kd, va, pa)
- kvm_t *kd;
- u_long va;
- u_long *pa;
+_kvm_kvatop(kvm_t *kd, u_long va, u_long *pa)
{
cpu_kcore_hdr_t *cpu_kh;
u_long page_off;
@@ -185,9 +180,7 @@
* Translate a physical address to a file-offset in the crash dump.
*/
off_t
-_kvm_pa2off(kd, pa)
- kvm_t *kd;
- u_long pa;
+_kvm_pa2off(kvm_t *kd, u_long pa)
{
cpu_kcore_hdr_t *cpu_kh;
phys_ram_seg_t *ramsegs;
@@ -216,8 +209,7 @@
* have to deal with these NOT being constants! (i.e. m68k)
*/
int
-_kvm_mdopen(kd)
- kvm_t *kd;
+_kvm_mdopen(kvm_t *kd)
{
kd->usrstack = USRSTACK;
Index: src/lib/libkvm/kvm_sparc.c
diff -u src/lib/libkvm/kvm_sparc.c:1.30 src/lib/libkvm/kvm_sparc.c:1.31
--- src/lib/libkvm/kvm_sparc.c:1.30 Sat Oct 25 19:09:10 2008
+++ src/lib/libkvm/kvm_sparc.c Sun Sep 19 02:07:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kvm_sparc.c,v 1.30 2008/10/25 19:09:10 mrg Exp $ */
+/* $NetBSD: kvm_sparc.c,v 1.31 2010/09/19 02:07:00 jym Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)kvm_sparc.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: kvm_sparc.c,v 1.30 2008/10/25 19:09:10 mrg Exp $");
+__RCSID("$NetBSD: kvm_sparc.c,v 1.31 2010/09/19 02:07:00 jym Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -81,9 +81,9 @@
#undef VA_OFF
#define VA_OFF(va) (va & (kd->nbpg - 1))
-int _kvm_kvatop44c __P((kvm_t *, u_long, u_long *));
-int _kvm_kvatop4m __P((kvm_t *, u_long, u_long *));
-int _kvm_kvatop4u __P((kvm_t *, u_long, u_long *));
+int _kvm_kvatop44c(kvm_t *, u_long, u_long *);
+int _kvm_kvatop4m (kvm_t *, u_long, u_long *);
+int _kvm_kvatop4u (kvm_t *, u_long, u_long *);
/*
* XXX
@@ -108,8 +108,7 @@
} sparc64_cpu_kcore_hdr_t;
void
-_kvm_freevtop(kd)
- kvm_t *kd;
+_kvm_freevtop(kvm_t *kd)
{
if (kd->vmst != 0) {
_kvm_err(kd, kd->program, "_kvm_freevtop: internal error");
@@ -123,8 +122,7 @@
* front of the crash dump by pmap_dumpmmu().
*/
int
-_kvm_initvtop(kd)
- kvm_t *kd;
+_kvm_initvtop(kvm_t *kd)
{
sparc64_cpu_kcore_hdr_t *cpup = kd->cpu_data;
@@ -154,10 +152,7 @@
* physical address. This routine is used only for crash dumps.
*/
int
-_kvm_kvatop(kd, va, pa)
- kvm_t *kd;
- u_long va;
- u_long *pa;
+_kvm_kvatop(kvm_t *kd, u_long va, u_long *pa)
{
if (cputyp == -1)
if (_kvm_initvtop(kd) != 0)
@@ -181,10 +176,7 @@
* (note: sun4 3-level MMU not yet supported)
*/
int
-_kvm_kvatop44c(kd, va, pa)
- kvm_t *kd;
- u_long va;
- u_long *pa;
+_kvm_kvatop44c(kvm_t *kd, u_long va, u_long *pa)
{
int vr, vs, pte;
sparc64_cpu_kcore_hdr_t *cpup = kd->cpu_data;
@@ -231,10 +223,7 @@
}
int
-_kvm_kvatop4m(kd, va, pa)
- kvm_t *kd;
- u_long va;
- u_long *pa;
+_kvm_kvatop4m(kvm_t *kd, u_long va, u_long *pa)
{
sparc64_cpu_kcore_hdr_t *cpup = kd->cpu_data;
int vr, vs;
@@ -291,10 +280,7 @@
* sparc64 pmap's 32-bit page table format
*/
int
-_kvm_kvatop4u(kd, va, pa)
- kvm_t *kd;
- u_long va;
- u_long *pa;
+_kvm_kvatop4u(kvm_t *kd, u_long va, u_long *pa)
{
sparc64_cpu_kcore_hdr_t *cpup = kd->cpu_data;
int64_t **segmaps;
@@ -356,9 +342,7 @@
* Translate a physical address to a file-offset in the crash dump.
*/
off_t
-_kvm_pa2off(kd, pa)
- kvm_t *kd;
- u_long pa;
+_kvm_pa2off(kvm_t *kd, u_long pa)
{
sparc64_cpu_kcore_hdr_t *cpup = kd->cpu_data;
phys_ram_seg_t *mp;
@@ -394,8 +378,7 @@
* have to deal with these NOT being constants! (i.e. m68k)
*/
int
-_kvm_mdopen(kd)
- kvm_t *kd;
+_kvm_mdopen(kvm_t *kd)
{
u_long max_uva;
extern struct ps_strings *__ps_strings;
Index: src/lib/libkvm/kvm_sun2.c
diff -u src/lib/libkvm/kvm_sun2.c:1.3 src/lib/libkvm/kvm_sun2.c:1.4
--- src/lib/libkvm/kvm_sun2.c:1.3 Thu Aug 7 16:44:40 2003
+++ src/lib/libkvm/kvm_sun2.c Sun Sep 19 02:07:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kvm_sun2.c,v 1.3 2003/08/07 16:44:40 agc Exp $ */
+/* $NetBSD: kvm_sun2.c,v 1.4 2010/09/19 02:07:00 jym Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)kvm_sparc.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: kvm_sun2.c,v 1.3 2003/08/07 16:44:40 agc Exp $");
+__RCSID("$NetBSD: kvm_sun2.c,v 1.4 2010/09/19 02:07:00 jym Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -63,10 +63,10 @@
#include "kvm_private.h"
#include "kvm_m68k.h"
-int _kvm_sun2_initvtop __P((kvm_t *));
-void _kvm_sun2_freevtop __P((kvm_t *));
-int _kvm_sun2_kvatop __P((kvm_t *, u_long, u_long *));
-off_t _kvm_sun2_pa2off __P((kvm_t *, u_long));
+int _kvm_sun2_initvtop(kvm_t *);
+void _kvm_sun2_freevtop(kvm_t *);
+int _kvm_sun2_kvatop (kvm_t *, u_long, u_long *);
+off_t _kvm_sun2_pa2off (kvm_t *, u_long);
struct kvm_ops _kvm_ops_sun2 = {
_kvm_sun2_initvtop,
@@ -103,8 +103,7 @@
* Note: sun2 MMU specific!
*/
int
-_kvm_sun2_initvtop(kd)
- kvm_t *kd;
+_kvm_sun2_initvtop(kvm_t *kd)
{
cpu_kcore_hdr_t *h = kd->cpu_data;
char *p;
@@ -117,8 +116,7 @@
}
void
-_kvm_sun2_freevtop(kd)
- kvm_t *kd;
+_kvm_sun2_freevtop(kvm_t *kd)
{
/* This was set by pointer arithmetic, not allocation. */
kd->vmst->private = (void*)0;
@@ -131,10 +129,7 @@
* physical address. This routine is used only for crash dumps.
*/
int
-_kvm_sun2_kvatop(kd, va, pap)
- kvm_t *kd;
- u_long va;
- u_long *pap;
+_kvm_sun2_kvatop(kvm_t *kd, u_long va, u_long *pap)
{
cpu_kcore_hdr_t *h = kd->cpu_data;
struct sun2_kcore_hdr *s = &h->un._sun2;
@@ -180,9 +175,7 @@
* Translate a physical address to a file-offset in the crash dump.
*/
off_t
-_kvm_sun2_pa2off(kd, pa)
- kvm_t *kd;
- u_long pa;
+_kvm_sun2_pa2off(kvm_t *kd, u_long pa)
{
return(kd->dump_off + pa);
}
Index: src/lib/libkvm/kvm_sun3.c
diff -u src/lib/libkvm/kvm_sun3.c:1.12 src/lib/libkvm/kvm_sun3.c:1.13
--- src/lib/libkvm/kvm_sun3.c:1.12 Thu Aug 7 16:44:40 2003
+++ src/lib/libkvm/kvm_sun3.c Sun Sep 19 02:07:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kvm_sun3.c,v 1.12 2003/08/07 16:44:40 agc Exp $ */
+/* $NetBSD: kvm_sun3.c,v 1.13 2010/09/19 02:07:00 jym Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)kvm_sparc.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: kvm_sun3.c,v 1.12 2003/08/07 16:44:40 agc Exp $");
+__RCSID("$NetBSD: kvm_sun3.c,v 1.13 2010/09/19 02:07:00 jym Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -63,10 +63,10 @@
#include "kvm_private.h"
#include "kvm_m68k.h"
-int _kvm_sun3_initvtop __P((kvm_t *));
-void _kvm_sun3_freevtop __P((kvm_t *));
-int _kvm_sun3_kvatop __P((kvm_t *, u_long, u_long *));
-off_t _kvm_sun3_pa2off __P((kvm_t *, u_long));
+int _kvm_sun3_initvtop(kvm_t *);
+void _kvm_sun3_freevtop(kvm_t *);
+int _kvm_sun3_kvatop (kvm_t *, u_long, u_long *);
+off_t _kvm_sun3_pa2off (kvm_t *, u_long);
struct kvm_ops _kvm_ops_sun3 = {
_kvm_sun3_initvtop,
@@ -103,8 +103,7 @@
* Note: sun3 MMU specific!
*/
int
-_kvm_sun3_initvtop(kd)
- kvm_t *kd;
+_kvm_sun3_initvtop(kvm_t *kd)
{
cpu_kcore_hdr_t *h = kd->cpu_data;
char *p;
@@ -117,8 +116,7 @@
}
void
-_kvm_sun3_freevtop(kd)
- kvm_t *kd;
+_kvm_sun3_freevtop(kvm_t *kd)
{
/* This was set by pointer arithmetic, not allocation. */
kd->vmst->private = (void*)0;
@@ -131,10 +129,7 @@
* physical address. This routine is used only for crash dumps.
*/
int
-_kvm_sun3_kvatop(kd, va, pap)
- kvm_t *kd;
- u_long va;
- u_long *pap;
+_kvm_sun3_kvatop(kvm_t *kd, u_long va, u_long *pap)
{
cpu_kcore_hdr_t *h = kd->cpu_data;
struct sun3_kcore_hdr *s = &h->un._sun3;
@@ -180,9 +175,7 @@
* Translate a physical address to a file-offset in the crash dump.
*/
off_t
-_kvm_sun3_pa2off(kd, pa)
- kvm_t *kd;
- u_long pa;
+_kvm_sun3_pa2off(kvm_t *kd, u_long pa)
{
return(kd->dump_off + pa);
}
