[src/trunk]: src/sys/arch/i386 Mirror cleanup wrt. procfs-centric naming made...

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

details:   https://anonhg.NetBSD.org/src/rev/7af20d5201f9
branches:  trunk
changeset: 526750:7af20d5201f9
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Thu May 09 16:28:11 2002 +0000

description:
Mirror cleanup wrt. procfs-centric naming made to the MI ptrace code.

diffstat:

 sys/arch/i386/i386/process_machdep.c |  25 +++++++++----------------
 sys/arch/i386/i386/procfs_machdep.c  |  19 +++++++++++++++++--
 sys/arch/i386/include/ptrace.h       |  15 +++++++--------
 3 files changed, 33 insertions(+), 26 deletions(-)

diffs (144 lines):

diff -r 2572b6a28b6c -r 7af20d5201f9 sys/arch/i386/i386/process_machdep.c
--- a/sys/arch/i386/i386/process_machdep.c      Thu May 09 15:44:44 2002 +0000
+++ b/sys/arch/i386/i386/process_machdep.c      Thu May 09 16:28:11 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: process_machdep.c,v 1.42 2002/05/09 15:44:46 thorpej Exp $     */
+/*     $NetBSD: process_machdep.c,v 1.43 2002/05/09 16:28:11 thorpej Exp $     */
 
 /*-
  * Copyright (c) 1998, 2000, 2001 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: process_machdep.c,v 1.42 2002/05/09 15:44:46 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: process_machdep.c,v 1.43 2002/05/09 16:28:11 thorpej Exp $");
 
 #include "opt_vm86.h"
 #include "npx.h"
@@ -411,10 +411,8 @@
 }
 
 #ifdef __HAVE_PTRACE_MACHDEP
-int
-process_machdep_read_xmmregs(p, regs)
-       struct proc *p;
-       struct xmmregs *regs;
+static int
+process_machdep_read_xmmregs(struct proc *p, struct xmmregs *regs)
 {
        union savefpu *frame = process_fpframe(p);
 
@@ -451,10 +449,8 @@
        return (0);
 }
 
-int
-process_machdep_write_xmmregs(p, regs)
-       struct proc *p;
-       struct xmmregs *regs;
+static int
+process_machdep_write_xmmregs(struct proc *p, struct xmmregs *regs)
 {
        union savefpu *frame = process_fpframe(p);
 
@@ -517,15 +513,13 @@
 }
 
 /*
- * The following functions have procfs-centric names, but are in
- * fact used by both ptrace(2) and procfs.
+ * The following functions are used by both ptrace(2) and procfs.
  */
 
 int
-procfs_machdep_doxmmregs(curp, p, pfs, uio)
+process_machdep_doxmmregs(curp, p, uio)
        struct proc *curp;              /* tracer */
        struct proc *p;                 /* traced */
-       struct pfsnode *pfs;
        struct uio *uio;
 {
        int error;
@@ -566,9 +560,8 @@
 }
 
 int
-procfs_machdep_validxmmregs(p, mp)
+process_machdep_validxmmregs(p)
        struct proc *p;
-       struct mount *mp;
 {
 
        if (p->p_flag & P_SYSTEM)
diff -r 2572b6a28b6c -r 7af20d5201f9 sys/arch/i386/i386/procfs_machdep.c
--- a/sys/arch/i386/i386/procfs_machdep.c       Thu May 09 15:44:44 2002 +0000
+++ b/sys/arch/i386/i386/procfs_machdep.c       Thu May 09 16:28:11 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: procfs_machdep.c,v 1.8 2001/12/05 00:58:06 thorpej Exp $       */
+/*     $NetBSD: procfs_machdep.c,v 1.9 2002/05/09 16:28:11 thorpej Exp $       */
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.8 2001/12/05 00:58:06 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.9 2002/05/09 16:28:11 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -208,4 +208,19 @@
 
        return (0);
 }
+
+int
+procfs_machdep_doxmmregs(struct proc *curp, struct proc *p,
+    struct pfsnode *pfs, struct uio *uio)
+{
+
+       return (process_machdep_doxmmregs(curp, p, uio));
+}
+
+int
+procfs_machdep_validxmmregs(struct proc *p, struct mount *mp)
+{
+
+       return (process_machdep_validxmmregs(p));
+}
 #endif
diff -r 2572b6a28b6c -r 7af20d5201f9 sys/arch/i386/include/ptrace.h
--- a/sys/arch/i386/include/ptrace.h    Thu May 09 15:44:44 2002 +0000
+++ b/sys/arch/i386/include/ptrace.h    Thu May 09 16:28:11 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ptrace.h,v 1.7 2001/12/05 00:58:06 thorpej Exp $       */
+/*     $NetBSD: ptrace.h,v 1.8 2002/05/09 16:28:12 thorpej Exp $       */
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -124,17 +124,16 @@
 
 struct xmmregs;
 
+/* Functions used by both ptrace(2) and procfs. */
+int    process_machdep_doxmmregs(struct proc *, struct proc *, struct uio *);
+int    process_machdep_validxmmregs(struct proc *);
+
+/* Functions used by procfs. */
 struct mount;
 struct pfsnode;
-
-/* Functions used by both ptrace(2) and procfs. */
-int    process_machdep_read_xmmregs(struct proc *, struct xmmregs *);
-int    process_machdep_write_xmmregs(struct proc *, struct xmmregs *);
-
-int    procfs_machdep_validxmmregs(struct proc *, struct mount *);
-
 int    procfs_machdep_doxmmregs(struct proc *, struct proc *,
            struct pfsnode *, struct uio *);
+int    procfs_machdep_validxmmregs(struct proc *, struct mount *);
 
 #endif /* _KERNEL */