diff options
| -rw-r--r-- | generated/manual-mach.inc.h | 42 | ||||
| -rwxr-xr-x | script/gen-manual-mach.sh | 7 |
2 files changed, 8 insertions, 41 deletions
diff --git a/generated/manual-mach.inc.h b/generated/manual-mach.inc.h index cfb8fd8..2d14eab 100644 --- a/generated/manual-mach.inc.h +++ b/generated/manual-mach.inc.h @@ -16,15 +16,12 @@ #ifndef KERNEL #if defined(__has_include) #if __has_include(<mach/mig_voucher_support.h>) -#ifndef USING_VOUCHERS #define USING_VOUCHERS -#endif #ifndef __VOUCHER_FORWARD_TYPE_DECLS__ #define __VOUCHER_FORWARD_TYPE_DECLS__ #ifdef __cplusplus -extern "C" { +static "C" { #endif - extern boolean_t voucher_mach_msg_set(mach_msg_header_t *msg) __attribute__((weak_import)); #ifdef __cplusplus } #endif @@ -66,11 +63,7 @@ __BEGIN_DECLS /* Routine thread_get_state */ -#ifdef static static -#else -extern -#endif /* static */ kern_return_t manual_thread_get_state ( thread_act_t target_act, @@ -80,11 +73,7 @@ kern_return_t manual_thread_get_state , mach_port_t reply_port); /* Routine thread_set_state */ -#ifdef static static -#else -extern -#endif /* static */ kern_return_t manual_thread_set_state ( thread_act_t target_act, @@ -125,7 +114,7 @@ kern_return_t manual_thread_set_state /* * IDENTIFICATION: - * stub generated Tue Oct 27 21:24:44 2015 + * stub generated Tue Oct 27 21:33:54 2015 * with a MiG generated by bootstrap_cmds-93 * OPTIONS: */ @@ -137,9 +126,6 @@ kern_return_t manual_thread_set_state #define mig_internal static __inline__ #endif /* mig_internal */ -#ifndef static -#define static -#endif /* static */ #if !defined(__MigKernelSpecificCode) && defined(_MIG_KERNEL_SPECIFIC_CODE_) @@ -355,11 +341,6 @@ static kern_return_t manual_thread_get_state /* BEGIN VOUCHER CODE */ -#ifdef USING_VOUCHERS - if (voucher_mach_msg_set != NULL) { - voucher_mach_msg_set(&InP->Head); - } -#endif // USING_VOUCHERS /* END VOUCHER CODE */ @@ -507,11 +488,6 @@ static kern_return_t manual_thread_set_state /* BEGIN VOUCHER CODE */ -#ifdef USING_VOUCHERS - if (voucher_mach_msg_set != NULL) { - voucher_mach_msg_set(&InP->Head); - } -#endif // USING_VOUCHERS /* END VOUCHER CODE */ @@ -534,11 +510,7 @@ static kern_return_t manual_thread_set_state } /* Routine mach_vm_remap */ -#ifdef static static -#else -extern -#endif /* static */ kern_return_t manual_mach_vm_remap ( vm_map_t target_task, @@ -582,7 +554,7 @@ kern_return_t manual_mach_vm_remap /* * IDENTIFICATION: - * stub generated Tue Oct 27 21:24:44 2015 + * stub generated Tue Oct 27 21:33:54 2015 * with a MiG generated by bootstrap_cmds-93 * OPTIONS: */ @@ -594,9 +566,6 @@ kern_return_t manual_mach_vm_remap #define mig_internal static __inline__ #endif /* mig_internal */ -#ifndef static -#define static -#endif /* static */ #if !defined(__MigKernelSpecificCode) && defined(_MIG_KERNEL_SPECIFIC_CODE_) @@ -850,11 +819,6 @@ static kern_return_t manual_mach_vm_remap /* BEGIN VOUCHER CODE */ -#ifdef USING_VOUCHERS - if (voucher_mach_msg_set != NULL) { - voucher_mach_msg_set(&InP->Head); - } -#endif // USING_VOUCHERS /* END VOUCHER CODE */ diff --git a/script/gen-manual-mach.sh b/script/gen-manual-mach.sh index b309e0c..2676915 100755 --- a/script/gen-manual-mach.sh +++ b/script/gen-manual-mach.sh @@ -4,13 +4,16 @@ pat='/thread_[gs]et_state|vm_remap/' (mig -user /dev/stdout -server /dev/null -header /dev/stdout /usr/include/mach/{thread_act,mach_vm}.defs | egrep -v '^(#ifndef|#define|#endif).*_user_' | egrep -v '#include "stdout"' | - unifdef -D__MigTypeCheck | + unifdef -D__MigTypeCheck -Umig_external -UUSING_VOUCHERS | + egrep -v 'voucher_mach_msg_set' | + egrep -v '#define mig_external' | sed -E 's/(mach_msg|memcpy)\(/manual_\1(/g; s/^\)/, mach_port_t reply_port)/; s/_kernelrpc_//g; s/(Request|Reply)__/\1__manual_/g; + s/[[:<:]]extern[[:>:]]/static/g; s/^([a-z].*)?kern_return_t[[:blank:]]+([a-z])/\1kern_return_t manual_\2/; - s/mig_external/static/; + s/mig_external/static/g; s/mig_get_reply_port\(\)/reply_port/g' | awk 'BEGIN { on = 1; } /^\/\* Routine / || |