xnu-2050.22.13.tar.gz

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

diff --git a/bsd/sys/kdebug.h b/bsd/sys/kdebug.h
index 1cc5d2979c68b362483f0baa2a0e859b2fe84441..ae8970aa43feced0288deb80dae14b1bff3e1ced 100644 (file)
--- a/bsd/sys/kdebug.h
+++ b/bsd/sys/kdebug.h
@@ -1,16 +1,19 @@
 /*
 /*

- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2010 Apple Inc. All rights reserved.

  *
  *

- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in

- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.

  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER


@@ -20,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 

- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
 
 /*     Copyright (c) 1997 Apple Computer, Inc.  All rights reserved. 
  */
 
 /*     Copyright (c) 1997 Apple Computer, Inc.  All rights reserved. 


@@ -39,10 +42,16 @@ __BEGIN_DECLS
 #ifdef __APPLE_API_UNSTABLE
 
 #include <mach/clock_types.h>
 #ifdef __APPLE_API_UNSTABLE
 
 #include <mach/clock_types.h>

+#include <stdint.h>

 #if    defined(KERNEL_BUILD)
 #include <kdebug.h>
 #endif /* KERNEL_BUILD */
 
 #if    defined(KERNEL_BUILD)
 #include <kdebug.h>
 #endif /* KERNEL_BUILD */
 

+#ifdef XNU_KERNEL_PRIVATE
+#include <stdint.h>
+#include <mach/branch_predicates.h>
+#endif
+

 /*
  * types of faults that vm_fault handles
  * and creates trace entries for
 /*
  * types of faults that vm_fault handles
  * and creates trace entries for


@@ -51,6 +60,10 @@ __BEGIN_DECLS
 #define DBG_PAGEIN_FAULT      2
 #define DBG_COW_FAULT         3
 #define DBG_CACHE_HIT_FAULT   4
 #define DBG_PAGEIN_FAULT      2
 #define DBG_COW_FAULT         3
 #define DBG_CACHE_HIT_FAULT   4

+#define DBG_NZF_PAGE_FAULT    5
+#define DBG_GUARD_FAULT              6 
+#define DBG_PAGEINV_FAULT     7
+#define DBG_PAGEIND_FAULT     8

 
 
 /* The debug code consists of the following 
 
 
 /* The debug code consists of the following 


@@ -75,28 +88,41 @@ __BEGIN_DECLS
 #define DBG_BSD                        4
 #define DBG_IOKIT              5
 #define DBG_DRIVERS            6
 #define DBG_BSD                        4
 #define DBG_IOKIT              5
 #define DBG_DRIVERS            6

-#define DBG_TRACE               7
+#define DBG_TRACE              7

 #define DBG_DLIL               8
 #define DBG_DLIL               8

+#define DBG_SECURITY           9
+#define DBG_CORESTORAGE                10
+#define DBG_CG                         11

 #define DBG_MISC               20
 #define DBG_MISC               20

-#define DBG_DYLD                31
+#define DBG_DYLD               31
+#define DBG_QT                 32
+#define DBG_APPS               33
+#define DBG_LAUNCHD            34
+#define DBG_PERF                37

 #define DBG_MIG                        255
 
 /* **** The Kernel Debug Sub Classes for Mach (DBG_MACH) **** */
 #define DBG_MIG                        255
 
 /* **** The Kernel Debug Sub Classes for Mach (DBG_MACH) **** */

+#define        DBG_MACH_EXCP_KTRAP_x86 0x02    /* Kernel Traps on x86 */

 #define        DBG_MACH_EXCP_DFLT      0x03    /* Data Translation Fault */
 #define        DBG_MACH_EXCP_IFLT      0x04    /* Inst Translation Fault */
 #define        DBG_MACH_EXCP_INTR      0x05    /* Interrupts */
 #define        DBG_MACH_EXCP_ALNG      0x06    /* Alignment Exception */
 #define        DBG_MACH_EXCP_DFLT      0x03    /* Data Translation Fault */
 #define        DBG_MACH_EXCP_IFLT      0x04    /* Inst Translation Fault */
 #define        DBG_MACH_EXCP_INTR      0x05    /* Interrupts */
 #define        DBG_MACH_EXCP_ALNG      0x06    /* Alignment Exception */

-#define        DBG_MACH_EXCP_TRAP      0x07    /* Traps */
+#define        DBG_MACH_EXCP_UTRAP_x86 0x07    /* User Traps on x86 */

 #define        DBG_MACH_EXCP_FP        0x08    /* FP Unavail */
 #define        DBG_MACH_EXCP_DECI      0x09    /* Decrementer Interrupt */
 #define        DBG_MACH_EXCP_FP        0x08    /* FP Unavail */
 #define        DBG_MACH_EXCP_DECI      0x09    /* Decrementer Interrupt */

+#define        DBG_MACH_CHUD           0x0A    /* CHUD */

 #define        DBG_MACH_EXCP_SC        0x0C    /* System Calls */
 #define        DBG_MACH_EXCP_TRACE     0x0D    /* Trace exception */
 #define        DBG_MACH_EXCP_EMUL      0x0E    /* Instruction emulated */
 #define        DBG_MACH_IHDLR          0x10    /* Interrupt Handlers */
 #define        DBG_MACH_IPC            0x20    /* Inter Process Comm */
 #define        DBG_MACH_VM             0x30    /* Virtual Memory */
 #define        DBG_MACH_EXCP_SC        0x0C    /* System Calls */
 #define        DBG_MACH_EXCP_TRACE     0x0D    /* Trace exception */
 #define        DBG_MACH_EXCP_EMUL      0x0E    /* Instruction emulated */
 #define        DBG_MACH_IHDLR          0x10    /* Interrupt Handlers */
 #define        DBG_MACH_IPC            0x20    /* Inter Process Comm */
 #define        DBG_MACH_VM             0x30    /* Virtual Memory */

+#define        DBG_MACH_LEAKS          0x31    /* alloc/free */

 #define        DBG_MACH_SCHED          0x40    /* Scheduler */
 #define        DBG_MACH_MSGID_INVALID  0x50    /* Messages - invalid */
 #define        DBG_MACH_SCHED          0x40    /* Scheduler */
 #define        DBG_MACH_MSGID_INVALID  0x50    /* Messages - invalid */

+#define DBG_MACH_LOCKS         0x60    /* new lock APIs */
+#define DBG_MACH_PMAP          0x70    /* pmap */
+#define DBG_MACH_MP            0x90    /* MP related */

 
 /* Codes for Scheduler (DBG_MACH_SCHED) */     
 #define MACH_SCHED              0x0     /* Scheduler */
 
 /* Codes for Scheduler (DBG_MACH_SCHED) */     
 #define MACH_SCHED              0x0     /* Scheduler */


@@ -106,8 +132,37 @@ __BEGIN_DECLS
 #define MACH_CALLOUT            0x4     /* callouts */
 #define MACH_STACK_DETACH       0x5
 #define MACH_MAKE_RUNNABLE      0x6     /* make thread runnable */
 #define MACH_CALLOUT            0x4     /* callouts */
 #define MACH_STACK_DETACH       0x5
 #define MACH_MAKE_RUNNABLE      0x6     /* make thread runnable */

-#define        MACH_PROMOTE                    0x7             /* promoted due to resource */
-#define        MACH_DEMOTE                             0x8             /* promotion undone */
+#define        MACH_PROMOTE            0x7     /* promoted due to resource */
+#define        MACH_DEMOTE             0x8     /* promotion undone */
+#define MACH_IDLE               0x9    /* processor idling */
+#define MACH_STACK_DEPTH        0xa    /* stack depth at switch */
+#define MACH_MOVED              0xb    /* did not use original scheduling decision */
+#define MACH_FAIRSHARE_ENTER    0xc    /* move to fairshare band */
+#define MACH_FAIRSHARE_EXIT     0xd    /* exit fairshare band */
+#define MACH_FAILSAFE           0xe    /* tripped fixed-pri/RT failsafe */
+#define MACH_BLOCK              0xf    /* thread block */
+#define MACH_WAIT              0x10    /* thread wait assertion */
+#define        MACH_GET_URGENCY        0x14    /* Urgency queried by platform */
+#define        MACH_URGENCY            0x15    /* Urgency (RT/BG/NORMAL) communicated
+                                        * to platform
+                                        */
+#define        MACH_REDISPATCH         0x16    /* "next thread" thread redispatched */
+#define        MACH_REMOTE_AST         0x17    /* AST signal issued to remote processor */
+
+#define        MACH_SCHED_LPA_BROKEN   0x18    /* last_processor affinity broken in choose_processor */
+
+/* Codes for pmap (DBG_MACH_PMAP) */     
+#define PMAP__CREATE           0x0
+#define PMAP__DESTROY          0x1
+#define PMAP__PROTECT          0x2
+#define PMAP__PAGE_PROTECT     0x3
+#define PMAP__ENTER            0x4
+#define PMAP__REMOVE           0x5
+#define PMAP__NEST             0x6
+#define PMAP__UNNEST           0x7
+#define PMAP__FLUSH_TLBS       0x8
+#define PMAP__UPDATE_INTERRUPT 0x9
+#define PMAP__ATTRIBUTE_CLEAR  0xa

 
 /* **** The Kernel Debug Sub Classes for Network (DBG_NETWORK) **** */
 #define DBG_NETIP      1       /* Internet Protocol */
 
 /* **** The Kernel Debug Sub Classes for Network (DBG_NETWORK) **** */
 #define DBG_NETIP      1       /* Internet Protocol */


@@ -133,35 +188,72 @@ __BEGIN_DECLS
 #define        DBG_NETAFP      107     /* Apple Filing Protocol */
 #define        DBG_NETRTMP     108     /* Routing Table Maintenance Protocol */
 #define        DBG_NETAURP     109     /* Apple Update Routing Protocol */
 #define        DBG_NETAFP      107     /* Apple Filing Protocol */
 #define        DBG_NETRTMP     108     /* Routing Table Maintenance Protocol */
 #define        DBG_NETAURP     109     /* Apple Update Routing Protocol */

+#define        DBG_NETIPSEC    128     /* IPsec Protocol  */

 
 /* **** The Kernel Debug Sub Classes for IOKIT (DBG_IOKIT) **** */
 
 /* **** The Kernel Debug Sub Classes for IOKIT (DBG_IOKIT) **** */

-#define DBG_IOSCSI     1       /* SCSI */
-#define DBG_IODISK     2       /* Disk layers */
-#define        DBG_IONETWORK   3       /* Network layers */
-#define        DBG_IOKEYBOARD  4       /* Keyboard */
-#define        DBG_IOPOINTING  5       /* Pointing Devices */
-#define        DBG_IOAUDIO     6       /* Audio */
-#define        DBG_IOFLOPPY    7       /* Floppy */
-#define        DBG_IOSERIAL    8       /* Serial */
-#define        DBG_IOTTY       9       /* TTY layers */
-#define DBG_IOWORKLOOP 10      /* Work from work loop */
-#define DBG_IOINTES    11      /* Interrupt event source */
-#define DBG_IOCLKES    12      /* Clock event source */
-#define DBG_IOCMDQ     13      /* Command queue latencies */
-#define DBG_IOMCURS    14      /* Memory Cursor */
-#define DBG_IOMDESC    15      /* Memory Descriptors */
-#define DBG_IOPOWER    16      /* Power Managerment */
+#define DBG_IOINTC                     0       /* Interrupt controller */
+#define DBG_IOWORKLOOP         1       /* Work from work loop */
+#define DBG_IOINTES                    2       /* Interrupt event source */
+#define DBG_IOCLKES                    3       /* Clock event source */
+#define DBG_IOCMDQ                     4       /* Command queue latencies */
+#define DBG_IOMCURS                    5       /* Memory Cursor */
+#define DBG_IOMDESC                    6       /* Memory Descriptors */
+#define DBG_IOPOWER                    7       /* Power Managerment */
+#define DBG_IOSERVICE          8       /* Matching etc. */
+
+/* **** 9-32 reserved for internal IOKit usage **** */
+
+#define DBG_IOSTORAGE          32      /* Storage layers */
+#define        DBG_IONETWORK           33      /* Network layers */
+#define        DBG_IOKEYBOARD          34      /* Keyboard */
+#define        DBG_IOHID               35      /* HID Devices */
+#define        DBG_IOAUDIO             36      /* Audio */
+#define        DBG_IOSERIAL            37      /* Serial */
+#define        DBG_IOTTY               38      /* TTY layers */
+#define DBG_IOSAM              39      /* SCSI Architecture Model layers */
+#define DBG_IOPARALLELATA      40      /* Parallel ATA */
+#define DBG_IOPARALLELSCSI     41      /* Parallel SCSI */
+#define DBG_IOSATA             42      /* Serial-ATA */
+#define DBG_IOSAS              43      /* SAS */
+#define DBG_IOFIBRECHANNEL     44      /* FiberChannel */
+#define DBG_IOUSB              45      /* USB */
+#define DBG_IOBLUETOOTH                46      /* Bluetooth */
+#define DBG_IOFIREWIRE         47      /* FireWire */
+#define DBG_IOINFINIBAND       48      /* Infiniband */
+#define DBG_IOCPUPM            49      /* CPU Power Management */
+#define DBG_IOGRAPHICS         50      /* Graphics */
+#define DBG_HIBERNATE          51      /* hibernation related events */
+
+
+/* Backwards compatibility */
+#define        DBG_IOPOINTING          DBG_IOHID                       /* OBSOLETE: Use DBG_IOHID instead */
+#define DBG_IODISK                     DBG_IOSTORAGE           /* OBSOLETE: Use DBG_IOSTORAGE instead */

 
 /* **** The Kernel Debug Sub Classes for Device Drivers (DBG_DRIVERS) **** */
 
 /* **** The Kernel Debug Sub Classes for Device Drivers (DBG_DRIVERS) **** */

-#define DBG_DRVSCSI    1       /* SCSI */
-#define DBG_DRVDISK    2       /* Disk layers */
-#define        DBG_DRVNETWORK  3       /* Network layers */
-#define        DBG_DRVKEYBOARD 4       /* Keyboard */
-#define        DBG_DRVPOINTING 5       /* Pointing Devices */
-#define        DBG_DRVAUDIO    6       /* Audio */
-#define        DBG_DRVFLOPPY   7       /* Floppy */
-#define        DBG_DRVSERIAL   8       /* Serial */
-#define DBG_DRVSPLT     9
+#define DBG_DRVSTORAGE         1       /* Storage layers */
+#define        DBG_DRVNETWORK          2       /* Network layers */
+#define        DBG_DRVKEYBOARD         3       /* Keyboard */
+#define        DBG_DRVHID                      4       /* HID Devices */
+#define        DBG_DRVAUDIO            5       /* Audio */
+#define        DBG_DRVSERIAL           7       /* Serial */
+#define DBG_DRVSAM                     8       /* SCSI Architecture Model layers */
+#define DBG_DRVPARALLELATA  9  /* Parallel ATA */
+#define DBG_DRVPARALLELSCSI    10      /* Parallel SCSI */
+#define DBG_DRVSATA                    11      /* Serial ATA */
+#define DBG_DRVSAS                     12      /* SAS */
+#define DBG_DRVFIBRECHANNEL    13      /* FiberChannel */
+#define DBG_DRVUSB                     14      /* USB */
+#define DBG_DRVBLUETOOTH       15      /* Bluetooth */
+#define DBG_DRVFIREWIRE                16      /* FireWire */
+#define DBG_DRVINFINIBAND      17      /* Infiniband */
+#define DBG_DRVGRAPHICS                18  /* Graphics */
+#define DBG_DRVSD              19      /* Secure Digital */
+#define DBG_DRVNAND            20      /* NAND drivers and layers */
+#define DBG_SSD                        21      /* SSD */
+
+/* Backwards compatibility */
+#define        DBG_DRVPOINTING         DBG_DRVHID              /* OBSOLETE: Use DBG_DRVHID instead */
+#define DBG_DRVDISK                    DBG_DRVSTORAGE  /* OBSOLETE: Use DBG_DRVSTORAGE instead */

 
 /* **** The Kernel Debug Sub Classes for the DLIL Layer (DBG_DLIL) **** */
 #define DBG_DLIL_STATIC 1       /* Static DLIL code */
 
 /* **** The Kernel Debug Sub Classes for the DLIL Layer (DBG_DLIL) **** */
 #define DBG_DLIL_STATIC 1       /* Static DLIL code */


@@ -170,16 +262,43 @@ __BEGIN_DECLS
 #define DBG_DLIL_PR_FLT 4       /* DLIL Protocol Filter */
 #define DBG_DLIL_IF_FLT 5       /* DLIL Interface FIlter */
 
 #define DBG_DLIL_PR_FLT 4       /* DLIL Protocol Filter */
 #define DBG_DLIL_IF_FLT 5       /* DLIL Interface FIlter */
 

-/* The Kernel Debug Sub Classes for File System */
+/* The Kernel Debug Sub Classes for File System (DBG_FSYSTEM) */

 #define DBG_FSRW      1       /* reads and writes to the filesystem */
 #define DBG_DKRW      2       /* reads and writes to the disk */
 #define DBG_FSRW      1       /* reads and writes to the filesystem */
 #define DBG_DKRW      2       /* reads and writes to the disk */

+#define DBG_FSVN      3       /* vnode operations (inc. locking/unlocking) */
+#define DBG_FSLOOOKUP 4       /* namei and other lookup-related operations */
+#define DBG_JOURNAL   5       /* journaling operations */
+#define DBG_IOCTL     6       /* ioctl to the disk */
+#define DBG_BOOTCACHE 7       /* bootcache operations */
+#define DBG_HFS       8       /* HFS-specific events; see bsd/hfs/hfs_kdebug.h */
+#define DBG_EXFAT     0xE     /* ExFAT-specific events; see the exfat project */
+#define DBG_MSDOS     0xF     /* FAT-specific events; see the msdosfs project */

 
 /* The Kernel Debug Sub Classes for BSD */
 
 /* The Kernel Debug Sub Classes for BSD */

-#define        DBG_BSD_EXCP_SC 0x0C    /* System Calls */
+#define DBG_BSD_PROC           0x01    /* process/signals related */
+#define        DBG_BSD_EXCP_SC         0x0C    /* System Calls */
+#define        DBG_BSD_AIO             0x0D    /* aio (POSIX async IO) */
+#define DBG_BSD_SC_EXTENDED_INFO 0x0E  /* System Calls, extended info */
+#define DBG_BSD_SC_EXTENDED_INFO2 0x0F /* System Calls, extended info */
+
+
+/* The Codes for BSD subcode class DBG_BSD_PROC */
+#define BSD_PROC_EXIT          1       /* process exit */
+#define BSD_PROC_FRCEXIT       2       /* Kernel force termination */

 
 /* The Kernel Debug Sub Classes for DBG_TRACE */
 #define DBG_TRACE_DATA      0
 #define DBG_TRACE_STRING    1
 
 /* The Kernel Debug Sub Classes for DBG_TRACE */
 #define DBG_TRACE_DATA      0
 #define DBG_TRACE_STRING    1

+#define        DBG_TRACE_INFO      2
+
+/* The Kernel Debug Sub Classes for DBG_CORESTORAGE */
+#define DBG_CS_IO      0
+
+/* Sub-class codes for CoreGraphics (DBG_CG) are defined in its component. */
+
+/* The Kernel Debug Sub Classes for DBG_MISC */
+#define DBG_EVENT      0x10
+#define        DBG_BUFFER      0x20

 
 /* The Kernel Debug Sub Classes for DBG_DYLD */
 #define DBG_DYLD_STRING   5
 
 /* The Kernel Debug Sub Classes for DBG_DYLD */
 #define DBG_DYLD_STRING   5


@@ -190,6 +309,14 @@ __BEGIN_DECLS
 #define DKIO_ASYNC     0x04
 #define DKIO_META      0x08
 #define DKIO_PAGING    0x10
 #define DKIO_ASYNC     0x04
 #define DKIO_META      0x08
 #define DKIO_PAGING    0x10

+#define DKIO_THROTTLE  0x20
+#define DKIO_PASSIVE   0x40
+#define DKIO_NOCACHE   0x80
+
+/* Kernel Debug Sub Classes for Applications (DBG_APPS) */
+#define DBG_APP_LOGINWINDOW     0x03
+#define DBG_APP_SAMBA           0x80
+

 
 /**********************************************************************/
 
 
 /**********************************************************************/
 


@@ -206,7 +333,23 @@ __BEGIN_DECLS
 #define TRACEDBG_CODE(SubClass,code) KDBG_CODE(DBG_TRACE, SubClass, code)
 #define MISCDBG_CODE(SubClass,code) KDBG_CODE(DBG_MISC, SubClass, code)
 #define DLILDBG_CODE(SubClass,code) KDBG_CODE(DBG_DLIL, SubClass, code)
 #define TRACEDBG_CODE(SubClass,code) KDBG_CODE(DBG_TRACE, SubClass, code)
 #define MISCDBG_CODE(SubClass,code) KDBG_CODE(DBG_MISC, SubClass, code)
 #define DLILDBG_CODE(SubClass,code) KDBG_CODE(DBG_DLIL, SubClass, code)

+#define SECURITYDBG_CODE(SubClass,code) KDBG_CODE(DBG_SECURITY, SubClass, code)

 #define DYLDDBG_CODE(SubClass,code) KDBG_CODE(DBG_DYLD, SubClass, code)
 #define DYLDDBG_CODE(SubClass,code) KDBG_CODE(DBG_DYLD, SubClass, code)

+#define QTDBG_CODE(SubClass,code) KDBG_CODE(DBG_QT, SubClass, code)
+#define APPSDBG_CODE(SubClass,code) KDBG_CODE(DBG_APPS, SubClass, code)
+#define CPUPM_CODE(code) IOKDBG_CODE(DBG_IOCPUPM, code)
+
+#define KMEM_ALLOC_CODE MACHDBG_CODE(DBG_MACH_LEAKS, 0)
+#define KMEM_ALLOC_CODE_2 MACHDBG_CODE(DBG_MACH_LEAKS, 1)
+#define KMEM_FREE_CODE MACHDBG_CODE(DBG_MACH_LEAKS, 2)
+#define KMEM_FREE_CODE_2 MACHDBG_CODE(DBG_MACH_LEAKS, 3)
+#define ZALLOC_CODE MACHDBG_CODE(DBG_MACH_LEAKS, 4)
+#define ZALLOC_CODE_2 MACHDBG_CODE(DBG_MACH_LEAKS, 5)
+#define ZFREE_CODE MACHDBG_CODE(DBG_MACH_LEAKS, 6)
+#define ZFREE_CODE_2 MACHDBG_CODE(DBG_MACH_LEAKS, 7)
+
+#define PMAP_CODE(code) MACHDBG_CODE(DBG_MACH_PMAP, code)
+

 
 /*   Usage:
 * kernel_debug((KDBG_CODE(DBG_NETWORK, DNET_PROTOCOL, 51) | DBG_FUNC_START), 
 
 /*   Usage:
 * kernel_debug((KDBG_CODE(DBG_NETWORK, DNET_PROTOCOL, 51) | DBG_FUNC_START), 


@@ -239,76 +382,281 @@ extern unsigned int kdebug_enable;
 #define KDEBUG_ENABLE_TRACE   0x1
 #define KDEBUG_ENABLE_ENTROPY 0x2
 #define KDEBUG_ENABLE_CHUD    0x4
 #define KDEBUG_ENABLE_TRACE   0x1
 #define KDEBUG_ENABLE_ENTROPY 0x2
 #define KDEBUG_ENABLE_CHUD    0x4

+#define KDEBUG_ENABLE_PPT     0x8
+
+/*
+ * Infer the supported kernel debug event level from config option.
+ * Use (KDEBUG_LEVEL >= KDEBUG_LEVEL_STANDARD) as a guard to protect
+ * unaudited debug code. 
+ */
+#define KDEBUG_LEVEL_NONE     0
+#define KDEBUG_LEVEL_IST      1
+#define KDEBUG_LEVEL_STANDARD 2
+#define KDEBUG_LEVEL_FULL     3
+
+#if NO_KDEBUG
+#define KDEBUG_LEVEL KDEBUG_LEVEL_NONE    
+#elif IST_KDEBUG
+#define KDEBUG_LEVEL KDEBUG_LEVEL_IST
+#elif KDEBUG
+#define KDEBUG_LEVEL KDEBUG_LEVEL_FULL
+#else
+#define KDEBUG_LEVEL KDEBUG_LEVEL_STANDARD
+#endif

 
 

-#define KERNEL_DEBUG_CONSTANT(x,a,b,c,d,e)    \
-do {                                   \
-    if (kdebug_enable)                 \
-        kernel_debug(x,a,b,c,d,e);     \
+#if (KDEBUG_LEVEL >= KDEBUG_LEVEL_STANDARD)
+#ifdef XNU_KERNEL_PRIVATE
+#define KERNEL_DEBUG_CONSTANT(x,a,b,c,d,e)                             \
+do {                                                                   \
+       if (__improbable(kdebug_enable & ~KDEBUG_ENABLE_PPT))                                   \
+        kernel_debug(x,(uintptr_t)a,(uintptr_t)b,(uintptr_t)c,         \
+                      (uintptr_t)d,(uintptr_t)e);                      \

 } while(0)
 
 } while(0)
 

-#define KERNEL_DEBUG_CONSTANT1(x,a,b,c,d,e)    \
-do {                                   \
-    if (kdebug_enable)                 \
-        kernel_debug1(x,a,b,c,d,e);    \
+#define KERNEL_DEBUG_CONSTANT1(x,a,b,c,d,e)                            \
+do {                                                                   \
+       if (__improbable(kdebug_enable & ~KDEBUG_ENABLE_PPT))                                   \
+        kernel_debug1(x,(uintptr_t)a,(uintptr_t)b,(uintptr_t)c,                \
+                       (uintptr_t)d,(uintptr_t)e);                     \
+} while(0)
+#else  /* XNU_KERNEL_PRIVATE */
+#define KERNEL_DEBUG_CONSTANT(x,a,b,c,d,e)                             \
+do {                                                                   \
+       if (kdebug_enable & ~KDEBUG_ENABLE_PPT)                                         \
+        kernel_debug(x,(uintptr_t)a,(uintptr_t)b,(uintptr_t)c,         \
+                      (uintptr_t)d,(uintptr_t)e);                      \
+} while(0)
+
+#define KERNEL_DEBUG_CONSTANT1(x,a,b,c,d,e)                            \
+do {                                                                   \
+       if (kdebug_enable & ~KDEBUG_ENABLE_PPT)                                         \
+        kernel_debug1(x,(uintptr_t)a,(uintptr_t)b,(uintptr_t)c,                \
+                       (uintptr_t)d,(uintptr_t)e);                     \
+} while(0)
+#endif /* XNU_KERNEL_PRIVATE */
+#else /* (KDEBUG_LEVEL >= KDEBUG_LEVEL_STANDARD) */
+#define KERNEL_DEBUG_CONSTANT(x,a,b,c,d,e) do { } while(0)
+#define KERNEL_DEBUG_CONSTANT1(x,a,b,c,d,e) do { } while(0)
+#endif /* (KDEBUG_LEVEL >= KDEBUG_LEVEL_STANDARD) */
+
+/* 
+ * Specify KDEBUG_PPT to indicate that the event belongs to the
+ * limited PPT set.
+ */
+#define KDEBUG_COMMON (KDEBUG_ENABLE_TRACE|KDEBUG_ENABLE_ENTROPY|KDEBUG_ENABLE_CHUD|KDEBUG_ENABLE_PPT)
+#define KDEBUG_TRACE  (KDEBUG_ENABLE_TRACE|KDEBUG_ENABLE_ENTROPY|KDEBUG_ENABLE_CHUD)
+#define KDEBUG_PPT    (KDEBUG_ENABLE_PPT)
+
+/*
+ * KERNEL_DEBUG_CONSTANT_IST events provide an audited subset of
+ * tracepoints for userland system tracing tools.
+ */
+#if (KDEBUG_LEVEL >= KDEBUG_LEVEL_IST)
+#ifdef XNU_KERNEL_PRIVATE
+#define KERNEL_DEBUG_CONSTANT_IST(type,x,a,b,c,d,e)                            \
+do {                                                                   \
+       if (__improbable(kdebug_enable & type))                                 \
+        kernel_debug(x,(uintptr_t)a,(uintptr_t)b,(uintptr_t)c,         \
+                       (uintptr_t)d,(uintptr_t)e);                     \

 } while(0)
 } while(0)

+#else /* XNU_KERNEL_PRIVATE */
+#define KERNEL_DEBUG_CONSTANT_IST(type,x,a,b,c,d,e)                            \
+do {                                                                   \
+       if (kdebug_enable & type)                                               \
+        kernel_debug(x,(uintptr_t)a,(uintptr_t)b,(uintptr_t)c,         \
+                       (uintptr_t)d,(uintptr_t)e);                     \
+} while(0)
+#endif /* XNU_KERNEL_PRIVATE */
+#else /* (KDEBUG_LEVEL >= KDEBUG_LEVEL_IST) */
+#define KERNEL_DEBUG_CONSTANT_IST(type,x,a,b,c,d,e) do { } while(0)
+#endif /* (KDEBUG_LEVEL >= KDEBUG_LEVEL_IST) */

 
 

-extern void kernel_debug(unsigned int debugid, unsigned int arg1, unsigned int arg2, unsigned int arg3,  unsigned int arg4, unsigned int arg5);
+#if NO_KDEBUG
+#define __kdebug_constant_only __unused
+#endif

 
 

-extern void kernel_debug1(unsigned int debugid, unsigned int arg1, unsigned int arg2, unsigned int arg3,  unsigned int arg4, unsigned int arg5);
+extern void kernel_debug(
+               uint32_t  debugid,
+               uintptr_t arg1,
+               uintptr_t arg2,
+               uintptr_t arg3,
+               uintptr_t arg4,
+               uintptr_t arg5);
+
+extern void kernel_debug1(
+               uint32_t  debugid,
+               uintptr_t arg1,
+               uintptr_t arg2,
+               uintptr_t arg3,
+               uintptr_t arg4,
+               uintptr_t arg5);
+
+
+#if (KDEBUG_LEVEL >= KDEBUG_LEVEL_FULL)
+#ifdef XNU_KERNEL_PRIVATE
+#define KERNEL_DEBUG(x,a,b,c,d,e)                                      \
+do {                                                                   \
+       if (__improbable(kdebug_enable & ~KDEBUG_ENABLE_PPT))                   \
+        kernel_debug((uint32_t)x,  (uintptr_t)a, (uintptr_t)b,         \
+                    (uintptr_t)c, (uintptr_t)d, (uintptr_t)e);         \
+} while(0)

 
 

-#if    KDEBUG
+#define KERNEL_DEBUG1(x,a,b,c,d,e)                                     \
+do {                                                                   \
+       if (__improbable(kdebug_enable & ~KDEBUG_ENABLE_PPT))                   \
+        kernel_debug1((uint32_t)x,  (uintptr_t)a, (uintptr_t)b,                \
+                     (uintptr_t)c, (uintptr_t)d, (uintptr_t)e);        \
+} while(0)

 
 

-#define KERNEL_DEBUG(x,a,b,c,d,e)      \
-do {                                   \
-    if (kdebug_enable)                 \
-        kernel_debug(x,a,b,c,d,e);     \
+#define __kdebug_only
+#else /* !XNU_KERNEL_PRIVATE */
+#define KERNEL_DEBUG(x,a,b,c,d,e)                                      \
+do {                                                                   \
+       if (kdebug_enable & ~KDEBUG_ENABLE_PPT)                         \
+        kernel_debug((uint32_t)x,  (uintptr_t)a, (uintptr_t)b,         \
+                    (uintptr_t)c, (uintptr_t)d, (uintptr_t)e);         \

 } while(0)
 
 } while(0)
 

-#define KERNEL_DEBUG1(x,a,b,c,d,e)     \
-do {                                   \
-    if (kdebug_enable)                 \
-        kernel_debug1(x,a,b,c,d,e);    \
+#define KERNEL_DEBUG1(x,a,b,c,d,e)                                     \
+do {                                                                   \
+       if (kdebug_enable & ~KDEBUG_ENABLE_PPT)                         \
+        kernel_debug1((uint32_t)x,  (uintptr_t)a, (uintptr_t)b,                \
+                     (uintptr_t)c, (uintptr_t)d, (uintptr_t)e);        \

 } while(0)
 } while(0)

+#endif /* XNU_KERNEL_PRIVATE */
+#else /* (KDEBUG_LEVEL >= KDEBUG_LEVEL_FULL) */
+#define KERNEL_DEBUG(x,a,b,c,d,e) do {} while (0)
+#define KERNEL_DEBUG1(x,a,b,c,d,e) do {} while (0)

 
 

-#else
+#define __kdebug_only __unused
+#endif /* (KDEBUG_LEVEL >= KDEBUG_LEVEL_FULL) */

 
 

-#define KERNEL_DEBUG(x,a,b,c,d,e)
-#define KERNEL_DEBUG1(x,a,b,c,d,e)
+#ifdef KERNEL_PRIVATE
+#include <mach/boolean.h>
+struct proc;
+extern void kdbg_trace_data(struct proc *proc, long *arg_pid);
+
+extern void kdbg_trace_string(struct proc *proc, long *arg1, long *arg2, long *arg3, long *arg4);
+
+extern void kdbg_dump_trace_to_file(const char *);
+void start_kern_tracing(unsigned int);
+struct task;
+extern void kdbg_get_task_name(char*, int, struct task *task);
+void disable_wrap(uint32_t *old_slowcheck, uint32_t *old_flags);
+void enable_wrap(uint32_t old_slowcheck, boolean_t lostevents);
+void release_storage_unit(int cpu,  uint32_t storage_unit);
+int allocate_storage_unit(int cpu);
+
+void trace_handler_map_ctrl_page(uintptr_t addr, unsigned long ctrl_page_size, unsigned long storage_size, unsigned long kds_ptr_size);
+void trace_handler_map_bufinfo(uintptr_t addr, unsigned long size);
+void trace_handler_unmap_bufinfo(void);
+void trace_handler_map_buffer(int index, uintptr_t addr, unsigned long size);
+void trace_handler_unmap_buffer(int index);
+void trace_set_timebases(uint64_t tsc, uint64_t ns);
+
+
+#endif  /* KERNEL_PRIVATE */

 
 

-#endif

 
 #endif /* __APPLE_API_UNSTABLE */
 __END_DECLS
 
 
 
 #endif /* __APPLE_API_UNSTABLE */
 __END_DECLS
 
 

-#ifdef KERNEL_PRIVATE
+#ifdef PRIVATE

 #ifdef __APPLE_API_PRIVATE
 /*
  * private kernel_debug definitions
  */
 
 typedef struct {
 #ifdef __APPLE_API_PRIVATE
 /*
  * private kernel_debug definitions
  */
 
 typedef struct {

-mach_timespec_t        timestamp;
-unsigned int   arg1;
-unsigned int   arg2;
-unsigned int   arg3;
-unsigned int   arg4;
-unsigned int   arg5;       /* will hold current thread */
-unsigned int   debugid;
+       uint64_t        timestamp;
+       uintptr_t       arg1;
+       uintptr_t       arg2;
+       uintptr_t       arg3;
+       uintptr_t       arg4;
+       uintptr_t       arg5;       /* will hold current thread */
+       uint32_t        debugid;
+#if defined(__LP64__)
+       uint32_t        cpuid;
+       uintptr_t       unused;
+#endif

 } kd_buf;
 
 } kd_buf;
 

-#define KDBG_THREAD_MASK 0x7fffffff
-#define KDBG_CPU_MASK    0x80000000
+#if !defined(__LP64__)
+#define KDBG_TIMESTAMP_MASK            0x00ffffffffffffffULL
+#define KDBG_CPU_MASK                  0xff00000000000000ULL
+#define KDBG_CPU_SHIFT                 56
+static inline void
+kdbg_set_cpu(kd_buf *kp, int cpu)
+{
+       kp->timestamp = (kp->timestamp & KDBG_TIMESTAMP_MASK) | 
+                               (((uint64_t) cpu) << KDBG_CPU_SHIFT);
+}
+static inline int
+kdbg_get_cpu(kd_buf *kp)
+{
+       return (int) (((kp)->timestamp & KDBG_CPU_MASK) >> KDBG_CPU_SHIFT);
+}
+static inline void
+kdbg_set_timestamp(kd_buf *kp, uint64_t thetime)
+{
+       kp->timestamp = thetime & KDBG_TIMESTAMP_MASK;
+}
+static inline uint64_t
+kdbg_get_timestamp(kd_buf *kp)
+{
+       return kp->timestamp & KDBG_TIMESTAMP_MASK;
+}
+static inline void
+kdbg_set_timestamp_and_cpu(kd_buf *kp, uint64_t thetime, int cpu)
+{
+       kp->timestamp = (thetime & KDBG_TIMESTAMP_MASK) | 
+                               (((uint64_t) cpu) << KDBG_CPU_SHIFT);
+}
+#else
+#define KDBG_TIMESTAMP_MASK            0xffffffffffffffffULL
+static inline void
+kdbg_set_cpu(kd_buf *kp, int cpu)
+{
+       kp->cpuid = cpu;
+}
+static inline int
+kdbg_get_cpu(kd_buf *kp)
+{
+       return kp->cpuid;
+}
+static inline void
+kdbg_set_timestamp(kd_buf *kp, uint64_t thetime)
+{
+       kp->timestamp = thetime;
+}
+static inline uint64_t
+kdbg_get_timestamp(kd_buf *kp)
+{
+       return kp->timestamp;
+}
+static inline void
+kdbg_set_timestamp_and_cpu(kd_buf *kp, uint64_t thetime, int cpu)
+{
+       kdbg_set_timestamp(kp, thetime);
+       kdbg_set_cpu(kp, cpu);
+}
+#endif
+
+/* 2^16 bits (8 kilobytes), one for each possible class/subclass combination */
+#define KDBG_TYPEFILTER_BITMAP_SIZE            ( (256 * 256) / 8 )

 
 /* Debug Flags */
 
 /* Debug Flags */

-#define        KDBG_INIT       0x1
-#define        KDBG_NOWRAP     0x2
-#define        KDBG_FREERUN    0x4
-#define        KDBG_WRAPPED    0x8
+#define        KDBG_INIT       0x001
+#define        KDBG_NOWRAP     0x002
+#define        KDBG_FREERUN    0x004
+#define        KDBG_WRAPPED    0x008

 #define        KDBG_USERFLAGS  (KDBG_FREERUN|KDBG_NOWRAP|KDBG_INIT)
 #define        KDBG_USERFLAGS  (KDBG_FREERUN|KDBG_NOWRAP|KDBG_INIT)

-#define KDBG_PIDCHECK   0x10
-#define KDBG_MAPINIT    0x20
-#define KDBG_PIDEXCLUDE 0x40
+#define KDBG_PIDCHECK   0x010
+#define KDBG_MAPINIT    0x020
+#define KDBG_PIDEXCLUDE 0x040
+#define KDBG_LOCKINIT  0x080
+#define KDBG_LP64      0x100

 
 typedef struct {
        unsigned int    type;
 
 typedef struct {
        unsigned int    type;


@@ -321,20 +669,31 @@ typedef struct {
 
 typedef struct
 {
 
 typedef struct
 {

-    int nkdbufs;
-    int nolog;
-    int flags;
-    int nkdthreads;
-    int bufid;
+       int             nkdbufs;
+       int             nolog;
+       int             flags;
+       int             nkdthreads;
+       int             bufid;

 } kbufinfo_t;
 
 } kbufinfo_t;
 

-typedef struct
-{
-  unsigned int thread;
-  int          valid;
-  char         command[20];
+typedef struct {
+       uintptr_t       thread;
+       int             valid;
+       char            command[20];

 } kd_threadmap;
 
 } kd_threadmap;
 

+
+typedef struct {
+       int             version_no;
+       int             thread_count;
+       uint64_t        TOD_secs;
+       uint32_t        TOD_usecs;
+} RAW_header;
+
+#define RAW_VERSION0   0x55aa0000
+#define RAW_VERSION1   0x55aa0101
+
+

 #define        KDBG_CLASSTYPE          0x10000
 #define        KDBG_SUBCLSTYPE         0x20000
 #define        KDBG_RANGETYPE          0x40000
 #define        KDBG_CLASSTYPE          0x10000
 #define        KDBG_SUBCLSTYPE         0x20000
 #define        KDBG_RANGETYPE          0x40000


@@ -344,6 +703,8 @@ typedef struct
 #define        KDBG_RANGECHECK 0x100000
 #define        KDBG_VALCHECK   0x200000        /* Check up to 4 individual values */
 
 #define        KDBG_RANGECHECK 0x100000
 #define        KDBG_VALCHECK   0x200000        /* Check up to 4 individual values */
 

+#define        KDBG_TYPEFILTER_CHECK   ((uint32_t) 0x400000)        /* Check class and subclass against a bitmap */ 
+

 #define        KDBG_BUFINIT    0x80000000
 
 /* Control operations */
 #define        KDBG_BUFINIT    0x80000000
 
 /* Control operations */


@@ -366,32 +727,7 @@ typedef struct
 /* Minimum value allowed when setting decrementer ticks */
 #define KDBG_MINRTCDEC  2500
 
 /* Minimum value allowed when setting decrementer ticks */
 #define KDBG_MINRTCDEC  2500
 

-
-/* PCSAMPLES control operations */
-#define PCSAMPLE_DISABLE   1
-#define PCSAMPLE_SETNUMBUF 2
-#define PCSAMPLE_GETNUMBUF 3
-#define PCSAMPLE_SETUP    4
-#define PCSAMPLE_REMOVE           5
-#define        PCSAMPLE_READBUF   6
-#define        PCSAMPLE_SETREG    7
-#define PCSAMPLE_COMM      8
-
-#define MAX_PCSAMPLES    1000000     /* Maximum number of pc's in a single buffer */
-
-
-extern unsigned int pcsample_enable;
-
-typedef struct
-{
-    int npcbufs;
-    int bufsize;
-    int enable;
-    unsigned long pcsample_beg;
-    unsigned long pcsample_end;
-} pcinfo_t;
-

 #endif /* __APPLE_API_PRIVATE */
 #endif /* __APPLE_API_PRIVATE */

-#endif /* KERNEL_PRIVATE */
+#endif /* PRIVATE */

 
 #endif /* !BSD_SYS_KDEBUG_H */
 
 #endif /* !BSD_SYS_KDEBUG_H */