xnu-792.tar.gz

[apple/xnu.git] / bsd / sys / ktrace.h

diff --git a/bsd/sys/ktrace.h b/bsd/sys/ktrace.h
index ce39adb2d3832855dc07ad7bd07bbd77ea83bd19..f07a9a8d11847d5f2c753de4f93d7870b0b9ddf5 100644 (file)
--- a/bsd/sys/ktrace.h
+++ b/bsd/sys/ktrace.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
@@ -61,15 +61,12 @@
 
 #include <sys/appleapiopts.h>
 
-#if defined(MACH_KERNEL_PRIVATE)
+#ifdef MACH_KERNEL_PRIVATE
 
-#ifdef __APPLE_API_PRIVATE
-void ktrsyscall(void *, int, int, void *, int);
+void ktrsyscall(void *, int, int, u_int64_t *, int);
 void ktrsysret(void *, int, int, int, int);
-#endif /* __APPLE_API_PRIVATE */
 
 #else
-
 #ifdef __APPLE_API_UNSTABLE
 /*
  * operations to ktrace system call  (KTROP(op))
@@ -85,6 +82,8 @@ void ktrsysret(void *, int, int, int, int);
 
 /*
  * ktrace record header
+ *
+ * LP64todo: not 64-bit safe
  */
 struct ktr_header {
        int     ktr_len;                /* length of buf */
@@ -115,7 +114,7 @@ struct ktr_syscall {
        /*
         * followed by ktr_narg register_t
         */
-       register_t      ktr_args[1];
+       u_int64_t       ktr_args[1];
 };
 
 /*
@@ -194,21 +193,20 @@ struct ktr_csw {
 
 #ifdef KERNEL
 #ifdef __APPLE_API_PRIVATE
-void   ktrnamei __P((struct vnode *,char *));
-void   ktrcsw __P((struct vnode *, int, int, int));
-void   ktrpsig __P((struct vnode *, int, sig_t, sigset_t *, int, int));
-void   ktrgenio __P((struct vnode *, int, enum uio_rw,
-           struct uio *, int, int));
-void   ktrsyscall __P((struct proc *, int, int, register_t args[], int));
-void   ktrsysret __P((struct proc *, int, int, register_t, int));
+void   ktrnamei(struct vnode *,char *);
+void   ktrcsw(struct vnode *, int, int);
+void   ktrpsig(struct vnode *, int, sig_t, sigset_t *, int);
+void   ktrgenio(struct vnode *, int, enum uio_rw, struct uio *, int);
+void   ktrsyscall(struct proc *, int, int, u_int64_t args[]);
+void   ktrsysret(struct proc *, int, int, register_t);
 #endif /* __APPLE_API_PRIVATE */
 #else
 
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-int    ktrace __P((const char *, int, int, pid_t));
-int    utrace __P((const void *, size_t));
+int    ktrace(const char *, int, int, pid_t);
+int    utrace(const void *, size_t);
 __END_DECLS
 
 #endif /* !KERNEL */