xnu-2782.10.72.tar.gz

[apple/xnu.git] / bsd / dev / dtrace / systrace.h

diff --git a/bsd/dev/dtrace/systrace.h b/bsd/dev/dtrace/systrace.h
index 454b71515319e86158db5f62d9e1d89a4e8df7e5..e9af96363e386f1be962b85e54fc4a74fc2247e0 100644 (file)
--- a/bsd/dev/dtrace/systrace.h
+++ b/bsd/dev/dtrace/systrace.h
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the

- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.

  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.


@@ -19,17 +18,17 @@
  *
  * CDDL HEADER END
  */
  *
  * CDDL HEADER END
  */

+

 /*
 /*

- * Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.

  * Use is subject to license terms.
  */
 
 #ifndef _SYS_SYSTRACE_H
 #define        _SYS_SYSTRACE_H
 
  * Use is subject to license terms.
  */
 
 #ifndef _SYS_SYSTRACE_H
 #define        _SYS_SYSTRACE_H
 

-/* #pragma ident       "@(#)systrace.h 1.2     05/06/08 SMI" */
+/* #pragma ident       "@(#)systrace.h 1.3     06/09/19 SMI" */

 
 

-#if defined(__APPLE__)

 #ifdef KERNEL
 #ifndef _KERNEL
 #define _KERNEL /* Solaris vs. Darwin */
 #ifdef KERNEL
 #ifndef _KERNEL
 #define _KERNEL /* Solaris vs. Darwin */


@@ -38,9 +37,6 @@
 
 #include <sys/dtrace.h>
 
 
 #include <sys/dtrace.h>
 

-#endif /* __APPLE__ */
-#include <sys/dtrace.h>
-

 #ifdef __cplusplus
 extern "C" {
 #endif
 #ifdef __cplusplus
 extern "C" {
 #endif


@@ -50,26 +46,13 @@ extern "C" {
 typedef struct systrace_sysent {
        dtrace_id_t     stsy_entry;
        dtrace_id_t     stsy_return;
 typedef struct systrace_sysent {
        dtrace_id_t     stsy_entry;
        dtrace_id_t     stsy_return;

-#if !defined(__APPLE__)
-       int64_t         (*stsy_underlying)();
-#else
-       int32_t         (*stsy_underlying)();
+       int32_t         (*stsy_underlying)(struct proc *, void *, int *);

        int32_t         stsy_return_type;
        int32_t         stsy_return_type;

-#endif /* __APPLE__ */

 } systrace_sysent_t;
 
 extern systrace_sysent_t *systrace_sysent;
 extern systrace_sysent_t *systrace_sysent32;
 
 } systrace_sysent_t;
 
 extern systrace_sysent_t *systrace_sysent;
 extern systrace_sysent_t *systrace_sysent32;
 

-#if !defined(__APPLE__)
-extern void (*systrace_probe)(dtrace_id_t, uintptr_t, uintptr_t,
-    uintptr_t, uintptr_t, uintptr_t);
-extern void systrace_stub(dtrace_id_t, uintptr_t, uintptr_t,
-    uintptr_t, uintptr_t, uintptr_t);
-
-extern int64_t dtrace_systrace_syscall(uintptr_t arg0, uintptr_t arg1,
-    uintptr_t arg2, uintptr_t arg3, uintptr_t arg4, uintptr_t arg5);
-#else

 extern void (*systrace_probe)(dtrace_id_t, uint64_t, uint64_t,
     uint64_t, uint64_t, uint64_t);
 extern void systrace_stub(dtrace_id_t, uint64_t, uint64_t,
 extern void (*systrace_probe)(dtrace_id_t, uint64_t, uint64_t,
     uint64_t, uint64_t, uint64_t);
 extern void systrace_stub(dtrace_id_t, uint64_t, uint64_t,


@@ -78,14 +61,13 @@ extern void systrace_stub(dtrace_id_t, uint64_t, uint64_t,
 extern int32_t dtrace_systrace_syscall(struct proc *, void *, int *);
 
 extern void dtrace_systrace_syscall_return(unsigned short, int, int *);
 extern int32_t dtrace_systrace_syscall(struct proc *, void *, int *);
 
 extern void dtrace_systrace_syscall_return(unsigned short, int, int *);

-#endif /* __APPLE__ */

 
 #ifdef _SYSCALL32_IMPL
 extern int64_t dtrace_systrace_syscall32(uintptr_t arg0, uintptr_t arg1,
     uintptr_t arg2, uintptr_t arg3, uintptr_t arg4, uintptr_t arg5);
 #endif
 
 
 #ifdef _SYSCALL32_IMPL
 extern int64_t dtrace_systrace_syscall32(uintptr_t arg0, uintptr_t arg1,
     uintptr_t arg2, uintptr_t arg3, uintptr_t arg4, uintptr_t arg5);
 #endif
 

-#endif
+#endif /* _KERNEL */

 
 #ifdef __cplusplus
 }
 
 #ifdef __cplusplus
 }