#include <mach/mach_traps.h>
#include <kern/syscall_sw.h>
+#if CONFIG_REQUIRES_U32_MUNGING
+#include <sys/munge.h>
+#endif
/* Forwards */
/*
* To add a new entry:
- * Add an "MACH_TRAP(routine, arg count)" to the table below.
+ * Add an "MACH_TRAP(routine, arg_count, num_32_bit_words, munge_routine)" to the table below.
+ * where,
+ * - routine: The trap handling routine in the kernel
+ * - arg_count: The number of arguments for the mach trap (independant of arch/arg size).
+ * This value also defines the number of 64-bit words copied in for a U64 process.
+ * - num_32_bit_words: The number of 32-bit words to be copied in for a U32 process.
+ * - munge_routine: The argument munging routine to align input args correctly.
*
- * Add trap definition to mach/syscall_sw.h and
+ * Also, add trap definition to mach/syscall_sw.h and
* recompile user library.
*
+ *
* WARNING: If you add a trap which requires more than 7
* parameters, mach/{machine}/syscall_sw.h and {machine}/trap.c
* and/or {machine}/locore.s may need to be modified for it
#include <kern/clock.h>
#include <mach/mk_timer.h>
-mach_trap_t mach_trap_table[MACH_TRAP_TABLE_COUNT] = {
-/* 0 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 1 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 2 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 3 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 4 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 5 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 6 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 7 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 8 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 9 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 10 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 11 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 12 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 13 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 14 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 15 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 16 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 17 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 18 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 19 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 20 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 21 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 22 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 23 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 24 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 25 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 26 */ MACH_TRAP(mach_reply_port, 0, NULL, NULL),
-/* 27 */ MACH_TRAP(thread_self_trap, 0, NULL, NULL),
-/* 28 */ MACH_TRAP(task_self_trap, 0, NULL, NULL),
-/* 29 */ MACH_TRAP(host_self_trap, 0, NULL, NULL),
-/* 30 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 31 */ MACH_TRAP(mach_msg_trap, 7, munge_wwwwwww, munge_ddddddd),
-/* 32 */ MACH_TRAP(mach_msg_overwrite_trap, 8, munge_wwwwwwww, munge_dddddddd),
-/* 33 */ MACH_TRAP(semaphore_signal_trap, 1, munge_w, munge_d),
-/* 34 */ MACH_TRAP(semaphore_signal_all_trap, 1, munge_w, munge_d),
-/* 35 */ MACH_TRAP(semaphore_signal_thread_trap, 2, munge_ww, munge_dd),
-/* 36 */ MACH_TRAP(semaphore_wait_trap, 1, munge_w, munge_d),
-/* 37 */ MACH_TRAP(semaphore_wait_signal_trap, 2, munge_ww, munge_dd),
-/* 38 */ MACH_TRAP(semaphore_timedwait_trap, 3, munge_www, munge_ddd),
-/* 39 */ MACH_TRAP(semaphore_timedwait_signal_trap, 4, munge_wwww, munge_dddd),
-/* 40 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 41 */ MACH_TRAP(init_process, 0, NULL, NULL),
-/* 42 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 43 */ MACH_TRAP(map_fd, 5, munge_wwwww, munge_ddddd),
-/* 44 */ MACH_TRAP(task_name_for_pid, 3, munge_www, munge_ddd),
-/* 45 */ MACH_TRAP(task_for_pid, 3, munge_www, munge_ddd),
-/* 46 */ MACH_TRAP(pid_for_task, 2, munge_ww,munge_dd),
-/* 47 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 48 */ MACH_TRAP(macx_swapon, 4, munge_wwww, munge_dddd),
-/* 49 */ MACH_TRAP(macx_swapoff, 2, munge_ww, munge_dd),
-/* 50 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 51 */ MACH_TRAP(macx_triggers, 4, munge_wwww, munge_dddd),
-/* 52 */ MACH_TRAP(macx_backing_store_suspend, 1, munge_w, munge_d),
-/* 53 */ MACH_TRAP(macx_backing_store_recovery, 1, munge_w, munge_d),
-/* 54 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 55 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 56 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 57 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 58 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 59 */ MACH_TRAP(swtch_pri, 0, NULL, NULL),
-/* 60 */ MACH_TRAP(swtch, 0, NULL, NULL),
-/* 61 */ MACH_TRAP(thread_switch, 3, munge_www, munge_ddd),
-/* 62 */ MACH_TRAP(clock_sleep_trap, 5, munge_wwwww, munge_ddddd),
-/* 63 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
+const mach_trap_t mach_trap_table[MACH_TRAP_TABLE_COUNT] = {
+/* 0 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 1 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 2 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 3 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 4 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 5 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 6 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 7 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 8 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 9 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 10 */ MACH_TRAP(_kernelrpc_mach_vm_allocate_trap, 4, 5, munge_wwlw),
+/* 11 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 12 */ MACH_TRAP(_kernelrpc_mach_vm_deallocate_trap, 3, 5, munge_wll),
+/* 13 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 14 */ MACH_TRAP(_kernelrpc_mach_vm_protect_trap, 5, 7, munge_wllww),
+/* 15 */ MACH_TRAP(_kernelrpc_mach_vm_map_trap, 6, 8, munge_wwllww),
+/* 16 */ MACH_TRAP(_kernelrpc_mach_port_allocate_trap, 3, 3, munge_www),
+/* 17 */ MACH_TRAP(_kernelrpc_mach_port_destroy_trap, 2, 2, munge_ww),
+/* 18 */ MACH_TRAP(_kernelrpc_mach_port_deallocate_trap, 2, 2, munge_ww),
+/* 19 */ MACH_TRAP(_kernelrpc_mach_port_mod_refs_trap, 4, 4, munge_wwww),
+/* 20 */ MACH_TRAP(_kernelrpc_mach_port_move_member_trap, 3, 3, munge_www),
+/* 21 */ MACH_TRAP(_kernelrpc_mach_port_insert_right_trap, 4, 4, munge_wwww),
+/* 22 */ MACH_TRAP(_kernelrpc_mach_port_insert_member_trap, 3, 3, munge_www),
+/* 23 */ MACH_TRAP(_kernelrpc_mach_port_extract_member_trap, 3, 3, munge_www),
+/* 24 */ MACH_TRAP(_kernelrpc_mach_port_construct_trap, 4, 5, munge_wwlw),
+/* 25 */ MACH_TRAP(_kernelrpc_mach_port_destruct_trap, 4, 5, munge_wwwl),
+/* 26 */ MACH_TRAP(mach_reply_port, 0, 0, NULL),
+/* 27 */ MACH_TRAP(thread_self_trap, 0, 0, NULL),
+/* 28 */ MACH_TRAP(task_self_trap, 0, 0, NULL),
+/* 29 */ MACH_TRAP(host_self_trap, 0, 0, NULL),
+/* 30 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 31 */ MACH_TRAP(mach_msg_trap, 7, 7, munge_wwwwwww),
+/* 32 */ MACH_TRAP(mach_msg_overwrite_trap, 8, 8, munge_wwwwwwww),
+/* 33 */ MACH_TRAP(semaphore_signal_trap, 1, 1, munge_w),
+/* 34 */ MACH_TRAP(semaphore_signal_all_trap, 1, 1, munge_w),
+/* 35 */ MACH_TRAP(semaphore_signal_thread_trap, 2, 2, munge_ww),
+/* 36 */ MACH_TRAP(semaphore_wait_trap, 1, 1, munge_w),
+/* 37 */ MACH_TRAP(semaphore_wait_signal_trap, 2, 2, munge_ww),
+/* 38 */ MACH_TRAP(semaphore_timedwait_trap, 3, 3, munge_www),
+/* 39 */ MACH_TRAP(semaphore_timedwait_signal_trap, 4, 4, munge_wwww),
+/* 40 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 41 */ MACH_TRAP(_kernelrpc_mach_port_guard_trap, 4, 5, munge_wwlw),
+/* 42 */ MACH_TRAP(_kernelrpc_mach_port_unguard_trap, 3, 4, munge_wwl),
+/* 43 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 44 */ MACH_TRAP(task_name_for_pid, 3, 3, munge_www),
+/* 45 */ MACH_TRAP(task_for_pid, 3, 3, munge_www),
+/* 46 */ MACH_TRAP(pid_for_task, 2, 2, munge_ww),
+/* 47 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 48 */ MACH_TRAP(macx_swapon, 4, 5, munge_lwww),
+/* 49 */ MACH_TRAP(macx_swapoff, 2, 3, munge_lw),
+/* 50 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 51 */ MACH_TRAP(macx_triggers, 4, 4, munge_wwww),
+/* 52 */ MACH_TRAP(macx_backing_store_suspend, 1, 1, munge_w),
+/* 53 */ MACH_TRAP(macx_backing_store_recovery, 1, 1, munge_w),
+/* 54 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 55 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 56 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 57 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 58 */ MACH_TRAP(pfz_exit, 0, 0, NULL),
+/* 59 */ MACH_TRAP(swtch_pri, 0, 0, NULL),
+/* 60 */ MACH_TRAP(swtch, 0, 0, NULL),
+/* 61 */ MACH_TRAP(thread_switch, 3, 3, munge_www),
+/* 62 */ MACH_TRAP(clock_sleep_trap, 5, 5, munge_wwwww),
+/* 63 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* traps 64 - 95 reserved (debo) */
+/* 64 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 65 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 66 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 67 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 68 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 69 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 70 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 71 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 72 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 73 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 74 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 75 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 76 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 77 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 78 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 79 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 80 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 81 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 82 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 83 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 84 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 85 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 86 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 87 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 88 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 89 */ MACH_TRAP(mach_timebase_info_trap, 1, 1, munge_w),
+/* 90 */ MACH_TRAP(mach_wait_until_trap, 1, 2, munge_l),
+/* 91 */ MACH_TRAP(mk_timer_create_trap, 0, 0, NULL),
+/* 92 */ MACH_TRAP(mk_timer_destroy_trap, 1, 1, munge_w),
+/* 93 */ MACH_TRAP(mk_timer_arm_trap, 2, 3, munge_wl),
+/* 94 */ MACH_TRAP(mk_timer_cancel_trap, 2, 2, munge_ww),
+/* 95 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* traps 64 - 95 reserved (debo) */
+/* 96 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 97 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 98 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 99 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* traps 100-107 reserved for iokit (esb) */
+/* 100 */ MACH_TRAP(iokit_user_client_trap, 8, 8, munge_wwwwwwww),
+/* 101 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 102 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 103 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 104 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 105 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 106 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 107 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* traps 108-127 unused */
+/* 108 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 109 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 110 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 111 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 112 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 113 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 114 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 115 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 116 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 117 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 118 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 119 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 120 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 121 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 122 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 123 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 124 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 125 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 126 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+/* 127 */ MACH_TRAP(kern_invalid, 0, 0, NULL),
+};
+
+const char * mach_syscall_name_table[MACH_TRAP_TABLE_COUNT] = {
+/* 0 */ "kern_invalid",
+/* 1 */ "kern_invalid",
+/* 2 */ "kern_invalid",
+/* 3 */ "kern_invalid",
+/* 4 */ "kern_invalid",
+/* 5 */ "kern_invalid",
+/* 6 */ "kern_invalid",
+/* 7 */ "kern_invalid",
+/* 8 */ "kern_invalid",
+/* 9 */ "kern_invalid",
+/* 10 */ "_kernelrpc_mach_vm_allocate_trap",
+/* 11 */ "kern_invalid",
+/* 12 */ "_kernelrpc_mach_vm_deallocate_trap",
+/* 13 */ "kern_invalid",
+/* 14 */ "_kernelrpc_mach_vm_protect_trap",
+/* 15 */ "_kernelrpc_mach_vm_map_trap",
+/* 16 */ "_kernelrpc_mach_port_allocate_trap",
+/* 17 */ "_kernelrpc_mach_port_destroy_trap",
+/* 18 */ "_kernelrpc_mach_port_deallocate_trap",
+/* 19 */ "_kernelrpc_mach_port_mod_refs_trap",
+/* 20 */ "_kernelrpc_mach_port_move_member_trap",
+/* 21 */ "_kernelrpc_mach_port_insert_right_trap",
+/* 22 */ "_kernelrpc_mach_port_insert_member_trap",
+/* 23 */ "_kernelrpc_mach_port_extract_member_trap",
+/* 24 */ "_kernelrpc_mach_port_construct_trap",
+/* 25 */ "_kernelrpc_mach_port_destruct_trap",
+/* 26 */ "mach_reply_port",
+/* 27 */ "thread_self_trap",
+/* 28 */ "task_self_trap",
+/* 29 */ "host_self_trap",
+/* 30 */ "kern_invalid",
+/* 31 */ "mach_msg_trap",
+/* 32 */ "mach_msg_overwrite_trap",
+/* 33 */ "semaphore_signal_trap",
+/* 34 */ "semaphore_signal_all_trap",
+/* 35 */ "semaphore_signal_thread_trap",
+/* 36 */ "semaphore_wait_trap",
+/* 37 */ "semaphore_wait_signal_trap",
+/* 38 */ "semaphore_timedwait_trap",
+/* 39 */ "semaphore_timedwait_signal_trap",
+/* 40 */ "kern_invalid",
+/* 41 */ "_kernelrpc_mach_port_guard_trap",
+/* 42 */ "_kernelrpc_mach_port_unguard_trap",
+/* 43 */ "kern_invalid",
+/* 44 */ "task_name_for_pid",
+/* 45 */ "task_for_pid",
+/* 46 */ "pid_for_task",
+/* 47 */ "kern_invalid",
+/* 48 */ "macx_swapon",
+/* 49 */ "macx_swapoff",
+/* 50 */ "kern_invalid",
+/* 51 */ "macx_triggers",
+/* 52 */ "macx_backing_store_suspend",
+/* 53 */ "macx_backing_store_recovery",
+/* 54 */ "kern_invalid",
+/* 55 */ "kern_invalid",
+/* 56 */ "kern_invalid",
+/* 57 */ "kern_invalid",
+/* 58 */ "pfz_exit",
+/* 59 */ "swtch_pri",
+/* 60 */ "swtch",
+/* 61 */ "thread_switch",
+/* 62 */ "clock_sleep_trap",
+/* 63 */ "kern_invalid",
/* traps 64 - 95 reserved (debo) */
-/* 64 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 65 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 66 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 67 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 68 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 69 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 70 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 71 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 72 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 73 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 74 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 75 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 76 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 77 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 78 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 79 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 80 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 81 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 82 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 83 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 84 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 85 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 86 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 87 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 88 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 89 */ MACH_TRAP(mach_timebase_info_trap, 1, munge_w, munge_d),
-/* 90 */ MACH_TRAP(mach_wait_until_trap, 2, munge_l, munge_d),
-/* 91 */ MACH_TRAP(mk_timer_create_trap, 0, NULL, NULL),
-/* 92 */ MACH_TRAP(mk_timer_destroy_trap, 1, munge_w, munge_d),
-/* 93 */ MACH_TRAP(mk_timer_arm_trap, 3, munge_wl, munge_dd),
-/* 94 */ MACH_TRAP(mk_timer_cancel_trap, 2, munge_ww, munge_dd),
-/* 95 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
+/* 64 */ "kern_invalid",
+/* 65 */ "kern_invalid",
+/* 66 */ "kern_invalid",
+/* 67 */ "kern_invalid",
+/* 68 */ "kern_invalid",
+/* 69 */ "kern_invalid",
+/* 70 */ "kern_invalid",
+/* 71 */ "kern_invalid",
+/* 72 */ "kern_invalid",
+/* 73 */ "kern_invalid",
+/* 74 */ "kern_invalid",
+/* 75 */ "kern_invalid",
+/* 76 */ "kern_invalid",
+/* 77 */ "kern_invalid",
+/* 78 */ "kern_invalid",
+/* 79 */ "kern_invalid",
+/* 80 */ "kern_invalid",
+/* 81 */ "kern_invalid",
+/* 82 */ "kern_invalid",
+/* 83 */ "kern_invalid",
+/* 84 */ "kern_invalid",
+/* 85 */ "kern_invalid",
+/* 86 */ "kern_invalid",
+/* 87 */ "kern_invalid",
+/* 88 */ "kern_invalid",
+/* 89 */ "mach_timebase_info_trap",
+/* 90 */ "mach_wait_until_trap",
+/* 91 */ "mk_timer_create_trap",
+/* 92 */ "mk_timer_destroy_trap",
+/* 93 */ "mk_timer_arm_trap",
+/* 94 */ "mk_timer_cancel_trap",
+/* 95 */ "kern_invalid",
/* traps 64 - 95 reserved (debo) */
-/* 96 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 97 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 98 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 99 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
+/* 96 */ "kern_invalid",
+/* 97 */ "kern_invalid",
+/* 98 */ "kern_invalid",
+/* 99 */ "kern_invalid",
/* traps 100-107 reserved for iokit (esb) */
-/* 100 */ MACH_TRAP(iokit_user_client_trap, 8, munge_wwwwwwww, munge_dddddddd),
-/* 101 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 102 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 103 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 104 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 105 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 106 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 107 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
+/* 100 */ "iokit_user_client_trap",
+/* 101 */ "kern_invalid",
+/* 102 */ "kern_invalid",
+/* 103 */ "kern_invalid",
+/* 104 */ "kern_invalid",
+/* 105 */ "kern_invalid",
+/* 106 */ "kern_invalid",
+/* 107 */ "kern_invalid",
/* traps 108-127 unused */
-/* 108 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 109 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 110 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 111 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 112 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 113 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 114 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 115 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 116 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 117 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 118 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 119 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 120 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 121 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 122 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 123 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 124 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 125 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 126 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
-/* 127 */ MACH_TRAP(kern_invalid, 0, NULL, NULL),
+/* 108 */ "kern_invalid",
+/* 109 */ "kern_invalid",
+/* 110 */ "kern_invalid",
+/* 111 */ "kern_invalid",
+/* 112 */ "kern_invalid",
+/* 113 */ "kern_invalid",
+/* 114 */ "kern_invalid",
+/* 115 */ "kern_invalid",
+/* 116 */ "kern_invalid",
+/* 117 */ "kern_invalid",
+/* 118 */ "kern_invalid",
+/* 119 */ "kern_invalid",
+/* 120 */ "kern_invalid",
+/* 121 */ "kern_invalid",
+/* 122 */ "kern_invalid",
+/* 123 */ "kern_invalid",
+/* 124 */ "kern_invalid",
+/* 125 */ "kern_invalid",
+/* 126 */ "kern_invalid",
+/* 127 */ "kern_invalid",
};
int mach_trap_count = (sizeof(mach_trap_table) / sizeof(mach_trap_table[0]));