xnu-7195.101.1.tar.gz

[apple/xnu.git] / osfmk / mach / mach_traps.h

diff --git a/osfmk/mach/mach_traps.h b/osfmk/mach/mach_traps.h
index cfff70c094bc05f6fdce107fd5ad74b59a5e33f1..7341d83d24984c8072809ca08095def664d1a7ee 100644 (file)
--- a/osfmk/mach/mach_traps.h
+++ b/osfmk/mach/mach_traps.h
@@ -1,8 +1,8 @@
 /*
 /*

- * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
+ * Copyright (c) 2000-2019 Apple Inc. All rights reserved.

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  *
  * @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


@@ -11,10 +11,10 @@
  * 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.
  * 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.
  * 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
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,


@@ -22,34 +22,34 @@
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.

- * 
+ *

  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
  */
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
  */

-/* 
+/*

  * Mach Operating System
  * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
  * All Rights Reserved.
  * Mach Operating System
  * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
  * All Rights Reserved.

- * 
+ *

  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.

- * 
+ *

  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.

- * 
+ *

  * Carnegie Mellon requests users of this software to return to
  * Carnegie Mellon requests users of this software to return to

- * 
+ *

  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890

- * 
+ *

  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */


@@ -63,7 +63,7 @@
  *     Kernel RPC functions are defined in <mach/mach_interface.h>.
  */
 
  *     Kernel RPC functions are defined in <mach/mach_interface.h>.
  */
 

-#ifndef        _MACH_MACH_TRAPS_H_
+#ifndef _MACH_MACH_TRAPS_H_

 #define _MACH_MACH_TRAPS_H_
 
 #include <stdint.h>
 #define _MACH_MACH_TRAPS_H_
 
 #include <stdint.h>


@@ -81,264 +81,314 @@
 
 __BEGIN_DECLS
 
 
 __BEGIN_DECLS
 

-#ifndef        KERNEL
+#ifndef KERNEL

 
 

-#ifdef PRIVATE
+#ifdef  PRIVATE

 
 extern mach_port_name_t mach_reply_port(void);
 
 
 extern mach_port_name_t mach_reply_port(void);
 

+extern mach_port_name_t thread_get_special_reply_port(void);
+

 extern mach_port_name_t thread_self_trap(void);
 
 extern mach_port_name_t host_self_trap(void);
 
 extern mach_msg_return_t mach_msg_trap(
 extern mach_port_name_t thread_self_trap(void);
 
 extern mach_port_name_t host_self_trap(void);
 
 extern mach_msg_return_t mach_msg_trap(

-                               mach_msg_header_t *msg,
-                               mach_msg_option_t option,
-                               mach_msg_size_t send_size,
-                               mach_msg_size_t rcv_size,
-                               mach_port_name_t rcv_name,
-                               mach_msg_timeout_t timeout,
-                               mach_port_name_t notify);
+       mach_msg_header_t *msg,
+       mach_msg_option_t option,
+       mach_msg_size_t send_size,
+       mach_msg_size_t rcv_size,
+       mach_port_name_t rcv_name,
+       mach_msg_timeout_t timeout,
+       mach_port_name_t notify);

 
 extern mach_msg_return_t mach_msg_overwrite_trap(
 
 extern mach_msg_return_t mach_msg_overwrite_trap(

-                               mach_msg_header_t *msg,
-                               mach_msg_option_t option,
-                               mach_msg_size_t send_size,
-                               mach_msg_size_t rcv_size,
-                               mach_port_name_t rcv_name,
-                               mach_msg_timeout_t timeout,
-                               mach_port_name_t notify,
-                               mach_msg_header_t *rcv_msg,
-                               mach_msg_size_t rcv_limit);
+       mach_msg_header_t *msg,
+       mach_msg_option_t option,
+       mach_msg_size_t send_size,
+       mach_msg_size_t rcv_size,
+       mach_port_name_t rcv_name,
+       mach_msg_timeout_t timeout,
+       mach_msg_priority_t priority,
+       mach_msg_header_t *rcv_msg,
+       mach_msg_size_t rcv_limit);

 
 extern kern_return_t semaphore_signal_trap(
 
 extern kern_return_t semaphore_signal_trap(

-                               mach_port_name_t signal_name);
-                                             
+       mach_port_name_t signal_name);
+

 extern kern_return_t semaphore_signal_all_trap(
 extern kern_return_t semaphore_signal_all_trap(

-                               mach_port_name_t signal_name);
+       mach_port_name_t signal_name);

 
 extern kern_return_t semaphore_signal_thread_trap(
 
 extern kern_return_t semaphore_signal_thread_trap(

-                               mach_port_name_t signal_name,
-                               mach_port_name_t thread_name);
+       mach_port_name_t signal_name,
+       mach_port_name_t thread_name);

 
 extern kern_return_t semaphore_wait_trap(
 
 extern kern_return_t semaphore_wait_trap(

-                               mach_port_name_t wait_name);
+       mach_port_name_t wait_name);

 
 extern kern_return_t semaphore_wait_signal_trap(
 
 extern kern_return_t semaphore_wait_signal_trap(

-                               mach_port_name_t wait_name,
-                               mach_port_name_t signal_name);
+       mach_port_name_t wait_name,
+       mach_port_name_t signal_name);

 
 extern kern_return_t semaphore_timedwait_trap(
 
 extern kern_return_t semaphore_timedwait_trap(

-                               mach_port_name_t wait_name,
-                               unsigned int sec,
-                               clock_res_t nsec);
+       mach_port_name_t wait_name,
+       unsigned int sec,
+       clock_res_t nsec);

 
 extern kern_return_t semaphore_timedwait_signal_trap(
 
 extern kern_return_t semaphore_timedwait_signal_trap(

-                               mach_port_name_t wait_name,
-                               mach_port_name_t signal_name,
-                               unsigned int sec,
-                               clock_res_t nsec);
+       mach_port_name_t wait_name,
+       mach_port_name_t signal_name,
+       unsigned int sec,
+       clock_res_t nsec);

 
 

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

 
 extern kern_return_t clock_sleep_trap(
 
 extern kern_return_t clock_sleep_trap(

-                               mach_port_name_t clock_name,
-                               sleep_type_t sleep_type,
-                               int sleep_sec,
-                               int sleep_nsec,
-                               mach_timespec_t *wakeup_time);
+       mach_port_name_t clock_name,
+       sleep_type_t sleep_type,
+       int sleep_sec,
+       int sleep_nsec,
+       mach_timespec_t *wakeup_time);

 
 extern kern_return_t _kernelrpc_mach_vm_allocate_trap(
 
 extern kern_return_t _kernelrpc_mach_vm_allocate_trap(

-                               mach_port_name_t target,
-                               mach_vm_offset_t *addr,
-                               mach_vm_size_t size,
-                               int flags);
+       mach_port_name_t target,
+       mach_vm_offset_t *addr,
+       mach_vm_size_t size,
+       int flags);

 
 extern kern_return_t _kernelrpc_mach_vm_deallocate_trap(
 
 extern kern_return_t _kernelrpc_mach_vm_deallocate_trap(

-                               mach_port_name_t target,
-                               mach_vm_address_t address,
-                               mach_vm_size_t size
-);
+       mach_port_name_t target,
+       mach_vm_address_t address,
+       mach_vm_size_t size
+       );
+
+extern kern_return_t task_dyld_process_info_notify_get(
+       mach_port_name_array_t names_addr,
+       natural_t *names_count_addr
+       );

 
 extern kern_return_t _kernelrpc_mach_vm_protect_trap(
 
 extern kern_return_t _kernelrpc_mach_vm_protect_trap(

-                               mach_port_name_t target,
-                               mach_vm_address_t address,
-                               mach_vm_size_t size,
-                               boolean_t set_maximum,
-                               vm_prot_t new_protection
-);
+       mach_port_name_t target,
+       mach_vm_address_t address,
+       mach_vm_size_t size,
+       boolean_t set_maximum,
+       vm_prot_t new_protection
+       );

 
 extern kern_return_t _kernelrpc_mach_vm_map_trap(
 
 extern kern_return_t _kernelrpc_mach_vm_map_trap(

-                               mach_port_name_t target,
-                               mach_vm_offset_t *address,
-                               mach_vm_size_t size,
-                               mach_vm_offset_t mask,
-                               int flags,
-                               vm_prot_t cur_protection
-);
+       mach_port_name_t target,
+       mach_vm_offset_t *address,
+       mach_vm_size_t size,
+       mach_vm_offset_t mask,
+       int flags,
+       vm_prot_t cur_protection
+       );
+
+extern kern_return_t _kernelrpc_mach_vm_purgable_control_trap(
+       mach_port_name_t target,
+       mach_vm_offset_t address,
+       vm_purgable_t control,
+       int *state);

 
 extern kern_return_t _kernelrpc_mach_port_allocate_trap(
 
 extern kern_return_t _kernelrpc_mach_port_allocate_trap(

-                               mach_port_name_t target,
-                               mach_port_right_t right,
-                               mach_port_name_t *name
-);
-
-
-extern kern_return_t _kernelrpc_mach_port_destroy_trap(
-                               mach_port_name_t target,
-                               mach_port_name_t name
-);
+       mach_port_name_t target,
+       mach_port_right_t right,
+       mach_port_name_t *name
+       );

 
 extern kern_return_t _kernelrpc_mach_port_deallocate_trap(
 
 extern kern_return_t _kernelrpc_mach_port_deallocate_trap(

-                               mach_port_name_t target,
-                               mach_port_name_t name
-);
+       mach_port_name_t target,
+       mach_port_name_t name
+       );

 
 extern kern_return_t _kernelrpc_mach_port_mod_refs_trap(
 
 extern kern_return_t _kernelrpc_mach_port_mod_refs_trap(

-                               mach_port_name_t target,
-                               mach_port_name_t name,
-                               mach_port_right_t right,
-                               mach_port_delta_t delta
-);
+       mach_port_name_t target,
+       mach_port_name_t name,
+       mach_port_right_t right,
+       mach_port_delta_t delta
+       );

 
 extern kern_return_t _kernelrpc_mach_port_move_member_trap(
 
 extern kern_return_t _kernelrpc_mach_port_move_member_trap(

-                               mach_port_name_t target,
-                               mach_port_name_t member,
-                               mach_port_name_t after
-);
+       mach_port_name_t target,
+       mach_port_name_t member,
+       mach_port_name_t after
+       );

 
 extern kern_return_t _kernelrpc_mach_port_insert_right_trap(
 
 extern kern_return_t _kernelrpc_mach_port_insert_right_trap(

-                               mach_port_name_t target,
-                               mach_port_name_t name,
-                               mach_port_name_t poly,
-                               mach_msg_type_name_t polyPoly
-);
+       mach_port_name_t target,
+       mach_port_name_t name,
+       mach_port_name_t poly,
+       mach_msg_type_name_t polyPoly
+       );
+
+extern kern_return_t _kernelrpc_mach_port_get_attributes_trap(
+       mach_port_name_t target,
+       mach_port_name_t name,
+       mach_port_flavor_t flavor,
+       mach_port_info_t port_info_out,
+       mach_msg_type_number_t *port_info_outCnt
+       );

 
 extern kern_return_t _kernelrpc_mach_port_insert_member_trap(
 
 extern kern_return_t _kernelrpc_mach_port_insert_member_trap(

-                               mach_port_name_t target,
-                               mach_port_name_t name,
-                               mach_port_name_t pset
-);
+       mach_port_name_t target,
+       mach_port_name_t name,
+       mach_port_name_t pset
+       );

 
 extern kern_return_t _kernelrpc_mach_port_extract_member_trap(
 
 extern kern_return_t _kernelrpc_mach_port_extract_member_trap(

-                               mach_port_name_t target,
-                               mach_port_name_t name,
-                               mach_port_name_t pset
-);
+       mach_port_name_t target,
+       mach_port_name_t name,
+       mach_port_name_t pset
+       );

 
 extern kern_return_t _kernelrpc_mach_port_construct_trap(
 
 extern kern_return_t _kernelrpc_mach_port_construct_trap(

-                               mach_port_name_t target,
-                               mach_port_options_t *options,
-                               uint64_t context,
-                               mach_port_name_t *name
-);
+       mach_port_name_t target,
+       mach_port_options_t *options,
+       uint64_t context,
+       mach_port_name_t *name
+       );

 
 extern kern_return_t _kernelrpc_mach_port_destruct_trap(
 
 extern kern_return_t _kernelrpc_mach_port_destruct_trap(

-                               mach_port_name_t target,
-                               mach_port_name_t name,
-                               mach_port_delta_t srdelta,
-                               uint64_t guard
-);
+       mach_port_name_t target,
+       mach_port_name_t name,
+       mach_port_delta_t srdelta,
+       uint64_t guard
+       );

 
 extern kern_return_t _kernelrpc_mach_port_guard_trap(
 
 extern kern_return_t _kernelrpc_mach_port_guard_trap(

-                               mach_port_name_t target,
-                               mach_port_name_t name,
-                               uint64_t guard,
-                               boolean_t strict
-);
+       mach_port_name_t target,
+       mach_port_name_t name,
+       uint64_t guard,
+       boolean_t strict
+       );

 
 extern kern_return_t _kernelrpc_mach_port_unguard_trap(
 
 extern kern_return_t _kernelrpc_mach_port_unguard_trap(

-                               mach_port_name_t target,
-                               mach_port_name_t name,
-                               uint64_t guard
-);
+       mach_port_name_t target,
+       mach_port_name_t name,
+       uint64_t guard
+       );
+
+extern kern_return_t mach_generate_activity_id(
+       mach_port_name_t target,
+       int count,
+       uint64_t *activity_id
+       );

 
 extern kern_return_t macx_swapon(
 
 extern kern_return_t macx_swapon(

-                               uint64_t filename,
-                               int flags,
-                               int size,
-                               int priority);
+       uint64_t filename,
+       int flags,
+       int size,
+       int priority);

 
 extern kern_return_t macx_swapoff(
 
 extern kern_return_t macx_swapoff(

-                               uint64_t filename,
-                               int flags);
+       uint64_t filename,
+       int flags);

 
 extern kern_return_t macx_triggers(
 
 extern kern_return_t macx_triggers(

-                               int hi_water,
-                               int low_water,
-                               int flags,
-                               mach_port_t alert_port);
+       int hi_water,
+       int low_water,
+       int flags,
+       mach_port_t alert_port);

 
 extern kern_return_t macx_backing_store_suspend(
 
 extern kern_return_t macx_backing_store_suspend(

-                               boolean_t suspend);
+       boolean_t suspend);

 
 extern kern_return_t macx_backing_store_recovery(
 
 extern kern_return_t macx_backing_store_recovery(

-                               int pid);
+       int pid);

 
 extern boolean_t swtch_pri(int pri);
 
 extern boolean_t swtch(void);
 
 extern kern_return_t thread_switch(
 
 extern boolean_t swtch_pri(int pri);
 
 extern boolean_t swtch(void);
 
 extern kern_return_t thread_switch(

-                               mach_port_name_t thread_name,
-                               int option,
-                               mach_msg_timeout_t option_time);
+       mach_port_name_t thread_name,
+       int option,
+       mach_msg_timeout_t option_time);

 
 extern mach_port_name_t task_self_trap(void);
 
 
 extern mach_port_name_t task_self_trap(void);
 

+extern kern_return_t host_create_mach_voucher_trap(
+       mach_port_name_t host,
+       mach_voucher_attr_raw_recipe_array_t recipes,
+       int recipes_size,
+       mach_port_name_t *voucher);
+
+extern kern_return_t mach_voucher_extract_attr_recipe_trap(
+       mach_port_name_t voucher_name,
+       mach_voucher_attr_key_t key,
+       mach_voucher_attr_raw_recipe_t recipe,
+       mach_msg_type_number_t *recipe_size);
+
+extern kern_return_t _kernelrpc_mach_port_type_trap(
+       ipc_space_t task,
+       mach_port_name_t name,
+       mach_port_type_t *ptype);
+
+extern kern_return_t _kernelrpc_mach_port_request_notification_trap(
+       ipc_space_t task,
+       mach_port_name_t name,
+       mach_msg_id_t msgid,
+       mach_port_mscount_t sync,
+       mach_port_name_t notify,
+       mach_msg_type_name_t notifyPoly,
+       mach_port_name_t *previous);
+

 /*
  *     Obsolete interfaces.
  */
 
 extern kern_return_t task_for_pid(
 /*
  *     Obsolete interfaces.
  */
 
 extern kern_return_t task_for_pid(

-                               mach_port_name_t target_tport,
-                               int pid,
-                               mach_port_name_t *t);
+       mach_port_name_t target_tport,
+       int pid,
+       mach_port_name_t *t);

 
 extern kern_return_t task_name_for_pid(
 
 extern kern_return_t task_name_for_pid(

-                               mach_port_name_t target_tport,
-                               int pid,
-                               mach_port_name_t *tn);
+       mach_port_name_t target_tport,
+       int pid,
+       mach_port_name_t *tn);

 
 extern kern_return_t pid_for_task(
 
 extern kern_return_t pid_for_task(

-                               mach_port_name_t t,
-                               int *x);
-
-#if            !defined(__LP64__) && !defined(__arm__)
-/* these should go away altogether - so no 64 legacy please */
+       mach_port_name_t t,
+       int *x);

 
 

-extern kern_return_t map_fd(
-                               int fd,
-                               vm_offset_t offset,
-                               vm_offset_t *va,
-                               boolean_t findspace,
-                               vm_size_t size);
+extern kern_return_t debug_control_port_for_pid(
+       mach_port_name_t target_tport,
+       int pid,
+       mach_port_name_t *t);

 
 

-#endif /* !defined(__LP64__) && !defined(__arm__) */
+#else   /* KERNEL */

 
 

-#else  /* KERNEL */
-
-#ifdef XNU_KERNEL_PRIVATE
+#ifdef  XNU_KERNEL_PRIVATE

 
 /* Syscall data translations routines
  *
  * The kernel may support multiple userspace ABIs, and must use
  * argument structures with elements large enough for any of them.
  */
 
 /* Syscall data translations routines
  *
  * The kernel may support multiple userspace ABIs, and must use
  * argument structures with elements large enough for any of them.
  */

-#define        PAD_(t) (sizeof(uint64_t) <= sizeof(t) \
-               ? 0 : sizeof(uint64_t) - sizeof(t))
+#if CONFIG_REQUIRES_U32_MUNGING
+#define PAD_(t) (sizeof(uint64_t) <= sizeof(t) \
+               ? 0 : sizeof(uint64_t) - sizeof(t))
+#define PAD_ARG_8
+#else
+#define PAD_(t) (sizeof(uint32_t) <= sizeof(t) \
+               ? 0 : sizeof(uint32_t) - sizeof(t))
+#if __arm__ && (__BIGGEST_ALIGNMENT__ > 4)

 #define PAD_ARG_8
 #define PAD_ARG_8

+#else
+#define PAD_ARG_8 char arg8_pad_[sizeof(uint32_t)];
+#endif
+#endif

 
 #if BYTE_ORDER == LITTLE_ENDIAN
 
 #if BYTE_ORDER == LITTLE_ENDIAN

-#define        PADL_(t)        0
-#define        PADR_(t)        PAD_(t)
+#define PADL_(t)        0
+#define PADR_(t)        PAD_(t)

 #else
 #else

-#define        PADL_(t)        PAD_(t)
-#define        PADR_(t)        0
+#define PADL_(t)        PAD_(t)
+#define PADR_(t)        0

 #endif
 
 #define PAD_ARG_(arg_type, arg_name) \
 #endif
 
 #define PAD_ARG_(arg_type, arg_name) \

-  char arg_name##_l_[PADL_(arg_type)]; arg_type arg_name; char arg_name##_r_[PADR_(arg_type)];
+  char arg_name##_l_[PADL_(arg_type)]; arg_type arg_name; char arg_name##_r_[PADR_(arg_type)]

 
 /*
  * To support 32-bit clients as well as 64-bit clients, argument
 
 /*
  * To support 32-bit clients as well as 64-bit clients, argument


@@ -347,62 +397,41 @@ extern kern_return_t map_fd(
  * traps, without calling out to the BSD system call mungers.
  */
 
  * traps, without calling out to the BSD system call mungers.
  */
 

-#if 0 /* no active architectures use this */
-void munge_w(const void *, void *);  
-void munge_ww(const void *, void *);  
-void munge_www(const void *, void *);  
-void munge_wwww(const void *, void *);  
-void munge_wwwww(const void *, void *);  
-void munge_wwwwww(const void *, void *);  
-void munge_wwwwwww(const void *, void *);  
-void munge_wwwwwwww(const void *, void *);  
-void munge_d(const void *, void *);  
-void munge_dd(const void *, void *);  
-void munge_ddd(const void *, void *);  
-void munge_dddd(const void *, void *);  
-void munge_ddddd(const void *, void *);  
-void munge_dddddd(const void *, void *);  
-void munge_ddddddd(const void *, void *);  
-void munge_dddddddd(const void *, void *);
-void munge_l(const void *, void *);
-void munge_lw(const void *, void *);
-void munge_lwww(const void *, void *);
-void munge_wl(const void *, void *);  
-void munge_wlw(const void *, void *);  
-void munge_wwwl(const void *, void *);  
-void munge_wwwwl(const void *, void *);  
-void munge_wwwwwl(const void *, void *);  
-#endif /* 0 */
-

 struct kern_invalid_args {
        int32_t dummy;
 };
 extern kern_return_t kern_invalid(
 struct kern_invalid_args {
        int32_t dummy;
 };
 extern kern_return_t kern_invalid(

-                               struct kern_invalid_args *args);
+       struct kern_invalid_args *args);

 
 struct mach_reply_port_args {
        int32_t dummy;
 };
 extern mach_port_name_t mach_reply_port(
 
 struct mach_reply_port_args {
        int32_t dummy;
 };
 extern mach_port_name_t mach_reply_port(

-                               struct mach_reply_port_args *args);
+       struct mach_reply_port_args *args);
+
+struct thread_get_special_reply_port_args {
+       int32_t dummy;
+};
+extern mach_port_name_t thread_get_special_reply_port(
+       struct thread_get_special_reply_port_args *args);

 
 struct thread_self_trap_args {
        int32_t dummy;
 };
 extern mach_port_name_t thread_self_trap(
 
 struct thread_self_trap_args {
        int32_t dummy;
 };
 extern mach_port_name_t thread_self_trap(

-                               struct thread_self_trap_args *args);
+       struct thread_self_trap_args *args);

 
 struct task_self_trap_args {
        int32_t dummy;
 };
 extern mach_port_name_t task_self_trap(
 
 struct task_self_trap_args {
        int32_t dummy;
 };
 extern mach_port_name_t task_self_trap(

-                               struct task_self_trap_args *args);
+       struct task_self_trap_args *args);

 
 struct host_self_trap_args {
        int32_t dummy;
 };
 extern mach_port_name_t host_self_trap(
 
 struct host_self_trap_args {
        int32_t dummy;
 };
 extern mach_port_name_t host_self_trap(

-                               struct host_self_trap_args *args);
+       struct host_self_trap_args *args);

 
 struct mach_msg_overwrite_trap_args {
        PAD_ARG_(user_addr_t, msg);
 
 struct mach_msg_overwrite_trap_args {
        PAD_ARG_(user_addr_t, msg);


@@ -411,46 +440,46 @@ struct mach_msg_overwrite_trap_args {
        PAD_ARG_(mach_msg_size_t, rcv_size);
        PAD_ARG_(mach_port_name_t, rcv_name);
        PAD_ARG_(mach_msg_timeout_t, timeout);
        PAD_ARG_(mach_msg_size_t, rcv_size);
        PAD_ARG_(mach_port_name_t, rcv_name);
        PAD_ARG_(mach_msg_timeout_t, timeout);

-       PAD_ARG_(mach_port_name_t, notify);
+       PAD_ARG_(mach_msg_priority_t, priority);

        PAD_ARG_8
        PAD_ARG_8

-       PAD_ARG_(user_addr_t, rcv_msg);  /* Unused on mach_msg_trap */
+           PAD_ARG_(user_addr_t, rcv_msg); /* Unused on mach_msg_trap */

 };
 extern mach_msg_return_t mach_msg_trap(
 };
 extern mach_msg_return_t mach_msg_trap(

-                               struct mach_msg_overwrite_trap_args *args);
+       struct mach_msg_overwrite_trap_args *args);

 extern mach_msg_return_t mach_msg_overwrite_trap(
 extern mach_msg_return_t mach_msg_overwrite_trap(

-                               struct mach_msg_overwrite_trap_args *args);
+       struct mach_msg_overwrite_trap_args *args);

 
 struct semaphore_signal_trap_args {
        PAD_ARG_(mach_port_name_t, signal_name);
 };
 extern kern_return_t semaphore_signal_trap(
 
 struct semaphore_signal_trap_args {
        PAD_ARG_(mach_port_name_t, signal_name);
 };
 extern kern_return_t semaphore_signal_trap(

-                               struct semaphore_signal_trap_args *args);
-                                             
+       struct semaphore_signal_trap_args *args);
+

 struct semaphore_signal_all_trap_args {
        PAD_ARG_(mach_port_name_t, signal_name);
 };
 extern kern_return_t semaphore_signal_all_trap(
 struct semaphore_signal_all_trap_args {
        PAD_ARG_(mach_port_name_t, signal_name);
 };
 extern kern_return_t semaphore_signal_all_trap(

-                               struct semaphore_signal_all_trap_args *args);
+       struct semaphore_signal_all_trap_args *args);

 
 struct semaphore_signal_thread_trap_args {
        PAD_ARG_(mach_port_name_t, signal_name);
        PAD_ARG_(mach_port_name_t, thread_name);
 };
 extern kern_return_t semaphore_signal_thread_trap(
 
 struct semaphore_signal_thread_trap_args {
        PAD_ARG_(mach_port_name_t, signal_name);
        PAD_ARG_(mach_port_name_t, thread_name);
 };
 extern kern_return_t semaphore_signal_thread_trap(

-                               struct semaphore_signal_thread_trap_args *args);
+       struct semaphore_signal_thread_trap_args *args);

 
 struct semaphore_wait_trap_args {
        PAD_ARG_(mach_port_name_t, wait_name);
 };
 extern kern_return_t semaphore_wait_trap(
 
 struct semaphore_wait_trap_args {
        PAD_ARG_(mach_port_name_t, wait_name);
 };
 extern kern_return_t semaphore_wait_trap(

-                               struct semaphore_wait_trap_args *args);
+       struct semaphore_wait_trap_args *args);

 
 struct semaphore_wait_signal_trap_args {
        PAD_ARG_(mach_port_name_t, wait_name);
        PAD_ARG_(mach_port_name_t, signal_name);
 };
 extern kern_return_t semaphore_wait_signal_trap(
 
 struct semaphore_wait_signal_trap_args {
        PAD_ARG_(mach_port_name_t, wait_name);
        PAD_ARG_(mach_port_name_t, signal_name);
 };
 extern kern_return_t semaphore_wait_signal_trap(

-                               struct semaphore_wait_signal_trap_args *args);
+       struct semaphore_wait_signal_trap_args *args);

 
 struct semaphore_timedwait_trap_args {
        PAD_ARG_(mach_port_name_t, wait_name);
 
 struct semaphore_timedwait_trap_args {
        PAD_ARG_(mach_port_name_t, wait_name);


@@ -458,7 +487,7 @@ struct semaphore_timedwait_trap_args {
        PAD_ARG_(clock_res_t, nsec);
 };
 extern kern_return_t semaphore_timedwait_trap(
        PAD_ARG_(clock_res_t, nsec);
 };
 extern kern_return_t semaphore_timedwait_trap(

-                               struct semaphore_timedwait_trap_args *args);
+       struct semaphore_timedwait_trap_args *args);

 
 struct semaphore_timedwait_signal_trap_args {
        PAD_ARG_(mach_port_name_t, wait_name);
 
 struct semaphore_timedwait_signal_trap_args {
        PAD_ARG_(mach_port_name_t, wait_name);


@@ -467,17 +496,7 @@ struct semaphore_timedwait_signal_trap_args {
        PAD_ARG_(clock_res_t, nsec);
 };
 extern kern_return_t semaphore_timedwait_signal_trap(
        PAD_ARG_(clock_res_t, nsec);
 };
 extern kern_return_t semaphore_timedwait_signal_trap(

-                               struct semaphore_timedwait_signal_trap_args *args);
-
-struct map_fd_args {
-       PAD_ARG_(int, fd);
-       PAD_ARG_(vm_offset_t, offset);
-       PAD_ARG_(vm_offset_t *, va);
-       PAD_ARG_(boolean_t, findspace);
-       PAD_ARG_(vm_size_t, size);
-};
-extern kern_return_t map_fd(
-                               struct map_fd_args *args);
+       struct semaphore_timedwait_signal_trap_args *args);

 
 struct task_for_pid_args {
        PAD_ARG_(mach_port_name_t, target_tport);
 
 struct task_for_pid_args {
        PAD_ARG_(mach_port_name_t, target_tport);


@@ -485,7 +504,7 @@ struct task_for_pid_args {
        PAD_ARG_(user_addr_t, t);
 };
 extern kern_return_t task_for_pid(
        PAD_ARG_(user_addr_t, t);
 };
 extern kern_return_t task_for_pid(

-                               struct task_for_pid_args *args);
+       struct task_for_pid_args *args);

 
 struct task_name_for_pid_args {
        PAD_ARG_(mach_port_name_t, target_tport);
 
 struct task_name_for_pid_args {
        PAD_ARG_(mach_port_name_t, target_tport);


@@ -493,14 +512,22 @@ struct task_name_for_pid_args {
        PAD_ARG_(user_addr_t, t);
 };
 extern kern_return_t task_name_for_pid(
        PAD_ARG_(user_addr_t, t);
 };
 extern kern_return_t task_name_for_pid(

-                               struct task_name_for_pid_args *args);
+       struct task_name_for_pid_args *args);

 
 struct pid_for_task_args {
        PAD_ARG_(mach_port_name_t, t);
        PAD_ARG_(user_addr_t, pid);
 };
 extern kern_return_t pid_for_task(
 
 struct pid_for_task_args {
        PAD_ARG_(mach_port_name_t, t);
        PAD_ARG_(user_addr_t, pid);
 };
 extern kern_return_t pid_for_task(

-                               struct pid_for_task_args *args);
+       struct pid_for_task_args *args);
+
+struct debug_control_port_for_pid_args {
+       PAD_ARG_(mach_port_name_t, target_tport);
+       PAD_ARG_(int, pid);
+       PAD_ARG_(user_addr_t, t);
+};
+extern kern_return_t debug_control_port_for_pid(
+       struct debug_control_port_for_pid_args *args);

 
 struct macx_swapon_args {
        PAD_ARG_(uint64_t, filename);
 
 struct macx_swapon_args {
        PAD_ARG_(uint64_t, filename);


@@ -509,14 +536,14 @@ struct macx_swapon_args {
        PAD_ARG_(int, priority);
 };
 extern kern_return_t macx_swapon(
        PAD_ARG_(int, priority);
 };
 extern kern_return_t macx_swapon(

-                               struct macx_swapon_args *args);
+       struct macx_swapon_args *args);

 
 struct macx_swapoff_args {
 
 struct macx_swapoff_args {

-    PAD_ARG_(uint64_t, filename);
-    PAD_ARG_(int, flags);
+       PAD_ARG_(uint64_t, filename);
+       PAD_ARG_(int, flags);

 };
 extern kern_return_t macx_swapoff(
 };
 extern kern_return_t macx_swapoff(

-                               struct macx_swapoff_args *args);
+       struct macx_swapoff_args *args);

 
 struct macx_triggers_args {
        PAD_ARG_(int, hi_water);
 
 struct macx_triggers_args {
        PAD_ARG_(int, hi_water);


@@ -525,39 +552,39 @@ struct macx_triggers_args {
        PAD_ARG_(mach_port_t, alert_port);
 };
 extern kern_return_t macx_triggers(
        PAD_ARG_(mach_port_t, alert_port);
 };
 extern kern_return_t macx_triggers(

-                               struct macx_triggers_args *args);
+       struct macx_triggers_args *args);

 
 struct macx_backing_store_suspend_args {
        PAD_ARG_(boolean_t, suspend);
 };
 extern kern_return_t macx_backing_store_suspend(
 
 struct macx_backing_store_suspend_args {
        PAD_ARG_(boolean_t, suspend);
 };
 extern kern_return_t macx_backing_store_suspend(

-                               struct macx_backing_store_suspend_args *args);
+       struct macx_backing_store_suspend_args *args);

 
 struct macx_backing_store_recovery_args {
        PAD_ARG_(int, pid);
 };
 extern kern_return_t macx_backing_store_recovery(
 
 struct macx_backing_store_recovery_args {
        PAD_ARG_(int, pid);
 };
 extern kern_return_t macx_backing_store_recovery(

-                               struct macx_backing_store_recovery_args *args);
+       struct macx_backing_store_recovery_args *args);

 
 struct swtch_pri_args {
        PAD_ARG_(int, pri);
 };
 extern boolean_t swtch_pri(
 
 struct swtch_pri_args {
        PAD_ARG_(int, pri);
 };
 extern boolean_t swtch_pri(

-                               struct swtch_pri_args *args);
+       struct swtch_pri_args *args);

 
 struct pfz_exit_args {
        int32_t dummy;
 };
 extern kern_return_t pfz_exit(
 
 struct pfz_exit_args {
        int32_t dummy;
 };
 extern kern_return_t pfz_exit(

-                               struct pfz_exit_args *args);
+       struct pfz_exit_args *args);

 
 struct swtch_args {
 
 struct swtch_args {

-    int32_t dummy;
+       int32_t dummy;

 };
 extern boolean_t swtch(
 };
 extern boolean_t swtch(

-                               struct swtch_args *args);
+       struct swtch_args *args);

 
 

-struct clock_sleep_trap_args{
+struct clock_sleep_trap_args {

        PAD_ARG_(mach_port_name_t, clock_name);
        PAD_ARG_(sleep_type_t, sleep_type);
        PAD_ARG_(int, sleep_sec);
        PAD_ARG_(mach_port_name_t, clock_name);
        PAD_ARG_(sleep_type_t, sleep_type);
        PAD_ARG_(int, sleep_sec);


@@ -565,7 +592,7 @@ struct clock_sleep_trap_args{
        PAD_ARG_(user_addr_t, wakeup_time);
 };
 extern kern_return_t clock_sleep_trap(
        PAD_ARG_(user_addr_t, wakeup_time);
 };
 extern kern_return_t clock_sleep_trap(

-                               struct clock_sleep_trap_args *args);
+       struct clock_sleep_trap_args *args);

 
 struct thread_switch_args {
        PAD_ARG_(mach_port_name_t, thread_name);
 
 struct thread_switch_args {
        PAD_ARG_(mach_port_name_t, thread_name);


@@ -573,73 +600,90 @@ struct thread_switch_args {
        PAD_ARG_(mach_msg_timeout_t, option_time);
 };
 extern kern_return_t thread_switch(
        PAD_ARG_(mach_msg_timeout_t, option_time);
 };
 extern kern_return_t thread_switch(

-                               struct thread_switch_args *args);
+       struct thread_switch_args *args);

 
 struct mach_timebase_info_trap_args {
        PAD_ARG_(user_addr_t, info);
 };
 extern kern_return_t mach_timebase_info_trap(
 
 struct mach_timebase_info_trap_args {
        PAD_ARG_(user_addr_t, info);
 };
 extern kern_return_t mach_timebase_info_trap(

-                               struct mach_timebase_info_trap_args *args);
+       struct mach_timebase_info_trap_args *args);

 
 struct mach_wait_until_trap_args {
        PAD_ARG_(uint64_t, deadline);
 };
 extern kern_return_t mach_wait_until_trap(
 
 struct mach_wait_until_trap_args {
        PAD_ARG_(uint64_t, deadline);
 };
 extern kern_return_t mach_wait_until_trap(

-                               struct mach_wait_until_trap_args *args);
+       struct mach_wait_until_trap_args *args);

 
 struct mk_timer_create_trap_args {
 
 struct mk_timer_create_trap_args {

-    int32_t dummy;
+       int32_t dummy;

 };
 extern mach_port_name_t mk_timer_create_trap(
 };
 extern mach_port_name_t mk_timer_create_trap(

-                               struct mk_timer_create_trap_args *args);
+       struct mk_timer_create_trap_args *args);

 
 struct mk_timer_destroy_trap_args {
        PAD_ARG_(mach_port_name_t, name);
 };
 extern kern_return_t mk_timer_destroy_trap(
 
 struct mk_timer_destroy_trap_args {
        PAD_ARG_(mach_port_name_t, name);
 };
 extern kern_return_t mk_timer_destroy_trap(

-                               struct mk_timer_destroy_trap_args *args);
+       struct mk_timer_destroy_trap_args *args);

 
 struct mk_timer_arm_trap_args {
        PAD_ARG_(mach_port_name_t, name);
        PAD_ARG_(uint64_t, expire_time);
 };
 extern kern_return_t mk_timer_arm_trap(
 
 struct mk_timer_arm_trap_args {
        PAD_ARG_(mach_port_name_t, name);
        PAD_ARG_(uint64_t, expire_time);
 };
 extern kern_return_t mk_timer_arm_trap(

-                               struct mk_timer_arm_trap_args *args);
+       struct mk_timer_arm_trap_args *args);
+
+struct mk_timer_arm_leeway_trap_args {
+       PAD_ARG_(mach_port_name_t, name);
+       PAD_ARG_(uint64_t, mk_timer_flags);
+       PAD_ARG_(uint64_t, expire_time);
+       PAD_ARG_(uint64_t, mk_leeway);
+};
+extern kern_return_t mk_timer_arm_leeway_trap(
+       struct mk_timer_arm_leeway_trap_args *args);

 
 struct mk_timer_cancel_trap_args {
 
 struct mk_timer_cancel_trap_args {

-    PAD_ARG_(mach_port_name_t, name);
-    PAD_ARG_(user_addr_t, result_time);
+       PAD_ARG_(mach_port_name_t, name);
+       PAD_ARG_(user_addr_t, result_time);

 };
 extern kern_return_t mk_timer_cancel_trap(
 };
 extern kern_return_t mk_timer_cancel_trap(

-                               struct mk_timer_cancel_trap_args *args);
+       struct mk_timer_cancel_trap_args *args);

 
 struct _kernelrpc_mach_vm_allocate_trap_args {
 
 struct _kernelrpc_mach_vm_allocate_trap_args {

-       PAD_ARG_(mach_port_name_t, target);     /* 1 word */
-       PAD_ARG_(user_addr_t, addr);            /* 1 word */
-       PAD_ARG_(mach_vm_size_t, size);         /* 2 words */
-       PAD_ARG_(int, flags);                   /* 1 word */
-};                                             /* Total: 5 */
+       PAD_ARG_(mach_port_name_t, target);     /* 1 word */
+       PAD_ARG_(user_addr_t, addr);            /* 1 word */
+       PAD_ARG_(mach_vm_size_t, size);         /* 2 words */
+       PAD_ARG_(int, flags);                   /* 1 word */
+};                                              /* Total: 5 */

 
 extern kern_return_t _kernelrpc_mach_vm_allocate_trap(
 
 extern kern_return_t _kernelrpc_mach_vm_allocate_trap(

-                               struct _kernelrpc_mach_vm_allocate_trap_args *args);
+       struct _kernelrpc_mach_vm_allocate_trap_args *args);

 
 struct _kernelrpc_mach_vm_deallocate_args {
 
 struct _kernelrpc_mach_vm_deallocate_args {

-       PAD_ARG_(mach_port_name_t, target);     /* 1 word */
-       PAD_ARG_(mach_vm_address_t, address);   /* 2 words */
-       PAD_ARG_(mach_vm_size_t, size);         /* 2 words */
-};                                             /* Total: 5 */
+       PAD_ARG_(mach_port_name_t, target);     /* 1 word */
+       PAD_ARG_(mach_vm_address_t, address);   /* 2 words */
+       PAD_ARG_(mach_vm_size_t, size);         /* 2 words */
+};                                              /* Total: 5 */

 extern kern_return_t _kernelrpc_mach_vm_deallocate_trap(
 extern kern_return_t _kernelrpc_mach_vm_deallocate_trap(

-                               struct _kernelrpc_mach_vm_deallocate_args *args);
+       struct _kernelrpc_mach_vm_deallocate_args *args);
+
+struct task_dyld_process_info_notify_get_trap_args {
+       PAD_ARG_(mach_vm_address_t, names_addr);     /* 2 words */
+       PAD_ARG_(mach_vm_address_t, names_count_addr);  /* 2 words */
+};                                               /* Total: 4 */
+
+extern kern_return_t task_dyld_process_info_notify_get_trap(
+       struct task_dyld_process_info_notify_get_trap_args *args);

 
 struct _kernelrpc_mach_vm_protect_args {
 
 struct _kernelrpc_mach_vm_protect_args {

-       PAD_ARG_(mach_port_name_t, target);     /* 1 word */
-       PAD_ARG_(mach_vm_address_t, address);   /* 2 words */
-       PAD_ARG_(mach_vm_size_t, size);         /* 2 words */
-       PAD_ARG_(boolean_t, set_maximum);       /* 1 word */
-       PAD_ARG_(vm_prot_t, new_protection);    /* 1 word */
-};                                             /* Total: 7 */
+       PAD_ARG_(mach_port_name_t, target);     /* 1 word */
+       PAD_ARG_(mach_vm_address_t, address);   /* 2 words */
+       PAD_ARG_(mach_vm_size_t, size);         /* 2 words */
+       PAD_ARG_(boolean_t, set_maximum);       /* 1 word */
+       PAD_ARG_(vm_prot_t, new_protection);    /* 1 word */
+};                                              /* Total: 7 */

 extern kern_return_t _kernelrpc_mach_vm_protect_trap(
 extern kern_return_t _kernelrpc_mach_vm_protect_trap(

-                               struct _kernelrpc_mach_vm_protect_args *args);
+       struct _kernelrpc_mach_vm_protect_args *args);

 
 struct _kernelrpc_mach_vm_map_trap_args {
        PAD_ARG_(mach_port_name_t, target);
 
 struct _kernelrpc_mach_vm_map_trap_args {
        PAD_ARG_(mach_port_name_t, target);


@@ -648,10 +692,20 @@ struct _kernelrpc_mach_vm_map_trap_args {
        PAD_ARG_(mach_vm_offset_t, mask);
        PAD_ARG_(int, flags);
        PAD_ARG_8
        PAD_ARG_(mach_vm_offset_t, mask);
        PAD_ARG_(int, flags);
        PAD_ARG_8

-       PAD_ARG_(vm_prot_t, cur_protection);
+           PAD_ARG_(vm_prot_t, cur_protection);

 };
 extern kern_return_t _kernelrpc_mach_vm_map_trap(
 };
 extern kern_return_t _kernelrpc_mach_vm_map_trap(

-                               struct _kernelrpc_mach_vm_map_trap_args *args);
+       struct _kernelrpc_mach_vm_map_trap_args *args);
+
+struct _kernelrpc_mach_vm_purgable_control_trap_args {
+       PAD_ARG_(mach_port_name_t, target);     /* 1 word */
+       PAD_ARG_(mach_vm_offset_t, address);    /* 2 words */
+       PAD_ARG_(vm_purgable_t, control);       /* 1 word */
+       PAD_ARG_(user_addr_t, state);           /* 1 word */
+};                                              /* Total: 5 */
+
+extern kern_return_t _kernelrpc_mach_vm_purgable_control_trap(
+       struct _kernelrpc_mach_vm_purgable_control_trap_args *args);

 
 struct _kernelrpc_mach_port_allocate_args {
        PAD_ARG_(mach_port_name_t, target);
 
 struct _kernelrpc_mach_port_allocate_args {
        PAD_ARG_(mach_port_name_t, target);


@@ -659,22 +713,14 @@ struct _kernelrpc_mach_port_allocate_args {
        PAD_ARG_(user_addr_t, name);
 };
 extern kern_return_t _kernelrpc_mach_port_allocate_trap(
        PAD_ARG_(user_addr_t, name);
 };
 extern kern_return_t _kernelrpc_mach_port_allocate_trap(

-                               struct _kernelrpc_mach_port_allocate_args *args);
-
-
-struct _kernelrpc_mach_port_destroy_args {
-       PAD_ARG_(mach_port_name_t, target);
-       PAD_ARG_(mach_port_name_t, name);
-};
-extern kern_return_t _kernelrpc_mach_port_destroy_trap(
-                               struct _kernelrpc_mach_port_destroy_args *args);
+       struct _kernelrpc_mach_port_allocate_args *args);

 
 struct _kernelrpc_mach_port_deallocate_args {
        PAD_ARG_(mach_port_name_t, target);
        PAD_ARG_(mach_port_name_t, name);
 };
 extern kern_return_t _kernelrpc_mach_port_deallocate_trap(
 
 struct _kernelrpc_mach_port_deallocate_args {
        PAD_ARG_(mach_port_name_t, target);
        PAD_ARG_(mach_port_name_t, name);
 };
 extern kern_return_t _kernelrpc_mach_port_deallocate_trap(

-                               struct _kernelrpc_mach_port_deallocate_args *args);
+       struct _kernelrpc_mach_port_deallocate_args *args);

 
 struct _kernelrpc_mach_port_mod_refs_args {
        PAD_ARG_(mach_port_name_t, target);
 
 struct _kernelrpc_mach_port_mod_refs_args {
        PAD_ARG_(mach_port_name_t, target);


@@ -683,7 +729,7 @@ struct _kernelrpc_mach_port_mod_refs_args {
        PAD_ARG_(mach_port_delta_t, delta);
 };
 extern kern_return_t _kernelrpc_mach_port_mod_refs_trap(
        PAD_ARG_(mach_port_delta_t, delta);
 };
 extern kern_return_t _kernelrpc_mach_port_mod_refs_trap(

-                               struct _kernelrpc_mach_port_mod_refs_args *args);
+       struct _kernelrpc_mach_port_mod_refs_args *args);

 
 struct _kernelrpc_mach_port_move_member_args {
        PAD_ARG_(mach_port_name_t, target);
 
 struct _kernelrpc_mach_port_move_member_args {
        PAD_ARG_(mach_port_name_t, target);


@@ -691,7 +737,7 @@ struct _kernelrpc_mach_port_move_member_args {
        PAD_ARG_(mach_port_name_t, after);
 };
 extern kern_return_t _kernelrpc_mach_port_move_member_trap(
        PAD_ARG_(mach_port_name_t, after);
 };
 extern kern_return_t _kernelrpc_mach_port_move_member_trap(

-                               struct _kernelrpc_mach_port_move_member_args *args);
+       struct _kernelrpc_mach_port_move_member_args *args);

 
 struct _kernelrpc_mach_port_insert_right_args {
        PAD_ARG_(mach_port_name_t, target);
 
 struct _kernelrpc_mach_port_insert_right_args {
        PAD_ARG_(mach_port_name_t, target);


@@ -700,7 +746,17 @@ struct _kernelrpc_mach_port_insert_right_args {
        PAD_ARG_(mach_msg_type_name_t, polyPoly);
 };
 extern kern_return_t _kernelrpc_mach_port_insert_right_trap(
        PAD_ARG_(mach_msg_type_name_t, polyPoly);
 };
 extern kern_return_t _kernelrpc_mach_port_insert_right_trap(

-                               struct _kernelrpc_mach_port_insert_right_args *args);
+       struct _kernelrpc_mach_port_insert_right_args *args);
+
+struct _kernelrpc_mach_port_get_attributes_args {
+       PAD_ARG_(mach_port_name_t, target);
+       PAD_ARG_(mach_port_name_t, name);
+       PAD_ARG_(mach_port_flavor_t, flavor);
+       PAD_ARG_(user_addr_t, info);
+       PAD_ARG_(user_addr_t, count);
+};
+extern kern_return_t _kernelrpc_mach_port_get_attributes_trap(
+       struct _kernelrpc_mach_port_get_attributes_args *args);

 
 struct _kernelrpc_mach_port_insert_member_args {
        PAD_ARG_(mach_port_name_t, target);
 
 struct _kernelrpc_mach_port_insert_member_args {
        PAD_ARG_(mach_port_name_t, target);


@@ -708,7 +764,7 @@ struct _kernelrpc_mach_port_insert_member_args {
        PAD_ARG_(mach_port_name_t, pset);
 };
 extern kern_return_t _kernelrpc_mach_port_insert_member_trap(
        PAD_ARG_(mach_port_name_t, pset);
 };
 extern kern_return_t _kernelrpc_mach_port_insert_member_trap(

-                               struct _kernelrpc_mach_port_insert_member_args *args);
+       struct _kernelrpc_mach_port_insert_member_args *args);

 
 struct _kernelrpc_mach_port_extract_member_args {
        PAD_ARG_(mach_port_name_t, target);
 
 struct _kernelrpc_mach_port_extract_member_args {
        PAD_ARG_(mach_port_name_t, target);


@@ -716,7 +772,7 @@ struct _kernelrpc_mach_port_extract_member_args {
        PAD_ARG_(mach_port_name_t, pset);
 };
 extern kern_return_t _kernelrpc_mach_port_extract_member_trap(
        PAD_ARG_(mach_port_name_t, pset);
 };
 extern kern_return_t _kernelrpc_mach_port_extract_member_trap(

-                               struct _kernelrpc_mach_port_extract_member_args *args);
+       struct _kernelrpc_mach_port_extract_member_args *args);

 
 struct _kernelrpc_mach_port_construct_args {
        PAD_ARG_(mach_port_name_t, target);
 
 struct _kernelrpc_mach_port_construct_args {
        PAD_ARG_(mach_port_name_t, target);


@@ -725,7 +781,7 @@ struct _kernelrpc_mach_port_construct_args {
        PAD_ARG_(user_addr_t, name);
 };
 extern kern_return_t _kernelrpc_mach_port_construct_trap(
        PAD_ARG_(user_addr_t, name);
 };
 extern kern_return_t _kernelrpc_mach_port_construct_trap(

-                               struct _kernelrpc_mach_port_construct_args *args);
+       struct _kernelrpc_mach_port_construct_args *args);

 
 struct _kernelrpc_mach_port_destruct_args {
        PAD_ARG_(mach_port_name_t, target);
 
 struct _kernelrpc_mach_port_destruct_args {
        PAD_ARG_(mach_port_name_t, target);


@@ -734,7 +790,7 @@ struct _kernelrpc_mach_port_destruct_args {
        PAD_ARG_(uint64_t, guard);
 };
 extern kern_return_t _kernelrpc_mach_port_destruct_trap(
        PAD_ARG_(uint64_t, guard);
 };
 extern kern_return_t _kernelrpc_mach_port_destruct_trap(

-                               struct _kernelrpc_mach_port_destruct_args *args);
+       struct _kernelrpc_mach_port_destruct_args *args);

 
 struct _kernelrpc_mach_port_guard_args {
        PAD_ARG_(mach_port_name_t, target);
 
 struct _kernelrpc_mach_port_guard_args {
        PAD_ARG_(mach_port_name_t, target);


@@ -743,7 +799,7 @@ struct _kernelrpc_mach_port_guard_args {
        PAD_ARG_(boolean_t, strict);
 };
 extern kern_return_t _kernelrpc_mach_port_guard_trap(
        PAD_ARG_(boolean_t, strict);
 };
 extern kern_return_t _kernelrpc_mach_port_guard_trap(

-                               struct _kernelrpc_mach_port_guard_args *args);
+       struct _kernelrpc_mach_port_guard_args *args);

 
 struct _kernelrpc_mach_port_unguard_args {
        PAD_ARG_(mach_port_name_t, target);
 
 struct _kernelrpc_mach_port_unguard_args {
        PAD_ARG_(mach_port_name_t, target);


@@ -751,7 +807,58 @@ struct _kernelrpc_mach_port_unguard_args {
        PAD_ARG_(uint64_t, guard);
 };
 extern kern_return_t _kernelrpc_mach_port_unguard_trap(
        PAD_ARG_(uint64_t, guard);
 };
 extern kern_return_t _kernelrpc_mach_port_unguard_trap(

-                               struct _kernelrpc_mach_port_unguard_args *args);
+       struct _kernelrpc_mach_port_unguard_args *args);
+
+struct mach_generate_activity_id_args {
+       PAD_ARG_(mach_port_name_t, target);
+       PAD_ARG_(int, count);
+       PAD_ARG_(user_addr_t, activity_id);
+};
+extern kern_return_t mach_generate_activity_id(
+       struct mach_generate_activity_id_args *args);
+
+/*
+ * Voucher trap interfaces
+ */
+
+struct host_create_mach_voucher_args {
+       PAD_ARG_(mach_port_name_t, host);
+       PAD_ARG_(mach_voucher_attr_raw_recipe_array_t, recipes);
+       PAD_ARG_(int, recipes_size);
+       PAD_ARG_(user_addr_t, voucher);
+};
+extern kern_return_t host_create_mach_voucher_trap(
+       struct host_create_mach_voucher_args *args);
+
+struct mach_voucher_extract_attr_recipe_args {
+       PAD_ARG_(mach_port_name_t, voucher_name);
+       PAD_ARG_(mach_voucher_attr_key_t, key);
+       PAD_ARG_(mach_voucher_attr_raw_recipe_t, recipe);
+       PAD_ARG_(user_addr_t, recipe_size);
+};
+
+extern kern_return_t mach_voucher_extract_attr_recipe_trap(
+       struct mach_voucher_extract_attr_recipe_args *args);
+
+struct _kernelrpc_mach_port_type_args {
+       PAD_ARG_(mach_port_name_t, target);
+       PAD_ARG_(mach_port_right_t, name);
+       PAD_ARG_(user_addr_t, ptype);
+};
+extern kern_return_t _kernelrpc_mach_port_type_trap(
+       struct _kernelrpc_mach_port_type_args *args);
+
+struct _kernelrpc_mach_port_request_notification_args {
+       PAD_ARG_(mach_port_name_t, target);
+       PAD_ARG_(mach_port_name_t, name);
+       PAD_ARG_(mach_msg_id_t, msgid);
+       PAD_ARG_(mach_port_mscount_t, sync);
+       PAD_ARG_(mach_port_name_t, notify);
+       PAD_ARG_(mach_msg_type_name_t, notifyPoly);
+       PAD_ARG_(user_addr_t, previous);
+};
+extern kern_return_t _kernelrpc_mach_port_request_notification_trap(
+       struct _kernelrpc_mach_port_request_notification_args *args);

 
 
 /* not published to LP64 clients yet */
 
 
 /* not published to LP64 clients yet */


@@ -763,11 +870,11 @@ struct iokit_user_client_trap_args {
        PAD_ARG_(void *, p3);
        PAD_ARG_(void *, p4);
        PAD_ARG_(void *, p5);
        PAD_ARG_(void *, p3);
        PAD_ARG_(void *, p4);
        PAD_ARG_(void *, p5);

-       PAD_ARG_8
-       PAD_ARG_(void *, p6);
+       PAD_ARG_8
+           PAD_ARG_(void *, p6);

 };
 kern_return_t iokit_user_client_trap(
 };
 kern_return_t iokit_user_client_trap(

-                               struct iokit_user_client_trap_args *args);
+       struct iokit_user_client_trap_args *args);

 
 #undef PAD_
 #undef PADL_
 
 #undef PAD_
 #undef PADL_


@@ -775,10 +882,10 @@ kern_return_t iokit_user_client_trap(
 #undef PAD_ARG_
 #undef PAD_ARG_8
 
 #undef PAD_ARG_
 #undef PAD_ARG_8
 

-#endif /* XNU_KERNEL_PRIVATE */
+#endif  /* XNU_KERNEL_PRIVATE */

 
 

-#endif /* KERNEL */
+#endif  /* KERNEL */

 
 __END_DECLS
 
 
 __END_DECLS
 

-#endif /* _MACH_MACH_TRAPS_H_ */
+#endif  /* _MACH_MACH_TRAPS_H_ */