From b37141e26eb2f3c5c383d7c29e8a7a7362f822ae Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Fri, 10 Apr 2026 19:45:22 -0400 Subject: [PATCH] Disable-kdebug-trace --- dyld/Tracing.h | 79 ++++++++++++-------------------------------------- 1 file changed, 19 insertions(+), 60 deletions(-) diff --git a/dyld/Tracing.h b/dyld/Tracing.h index 9536f0b..aa8d373 100644 --- a/dyld/Tracing.h +++ b/dyld/Tracing.h @@ -31,29 +31,25 @@ #include #include #include "Defines.h" -#if TARGET_OS_EXCLAVEKIT - #define KDBG_CODE(a, b, c) (c) - #define DBG_DYLD_UUID (5) - #define DBG_DYLD_UUID_MAP_A (0) - #define DBG_DYLD_UUID_MAP_B (1) - #define DBG_DYLD_UUID_MAP_32_A (2) - #define DBG_DYLD_UUID_MAP_32_B (3) - #define DBG_DYLD_UUID_MAP_32_C (4) - #define DBG_DYLD_UUID_UNMAP_A (5) - #define DBG_DYLD_UUID_UNMAP_B (6) - #define DBG_DYLD_UUID_UNMAP_32_A (7) - #define DBG_DYLD_UUID_UNMAP_32_B (8) - #define DBG_DYLD_UUID_UNMAP_32_C (9) - #define DBG_DYLD_UUID_SHARED_CACHE_A (10) - #define DBG_DYLD_UUID_SHARED_CACHE_B (11) - #define DBG_DYLD_UUID_SHARED_CACHE_32_A (12) - #define DBG_DYLD_UUID_SHARED_CACHE_32_B (13) - #define DBG_DYLD_UUID_SHARED_CACHE_32_C (14) - #define DBG_DYLD_AOT_UUID_MAP_A (15) - #define DBG_DYLD_AOT_UUID_MAP_B (16) -#else - #include -#endif +#define KDBG_CODE(a, b, c) (c) +#define DBG_DYLD_UUID (5) +#define DBG_DYLD_UUID_MAP_A (0) +#define DBG_DYLD_UUID_MAP_B (1) +#define DBG_DYLD_UUID_MAP_32_A (2) +#define DBG_DYLD_UUID_MAP_32_B (3) +#define DBG_DYLD_UUID_MAP_32_C (4) +#define DBG_DYLD_UUID_UNMAP_A (5) +#define DBG_DYLD_UUID_UNMAP_B (6) +#define DBG_DYLD_UUID_UNMAP_32_A (7) +#define DBG_DYLD_UUID_UNMAP_32_B (8) +#define DBG_DYLD_UUID_UNMAP_32_C (9) +#define DBG_DYLD_UUID_SHARED_CACHE_A (10) +#define DBG_DYLD_UUID_SHARED_CACHE_B (11) +#define DBG_DYLD_UUID_SHARED_CACHE_32_A (12) +#define DBG_DYLD_UUID_SHARED_CACHE_32_B (13) +#define DBG_DYLD_UUID_SHARED_CACHE_32_C (14) +#define DBG_DYLD_AOT_UUID_MAP_A (15) +#define DBG_DYLD_AOT_UUID_MAP_B (16) #include "Defines.h" @@ -118,24 +114,10 @@ struct VIS_HIDDEN kt_arg { uint64_t value() const { return _value; } private: void prepare(uint32_t code) { -#if !TARGET_OS_EXCLAVEKIT - if (_str) { - _value = kdebug_trace_string(code, 0, _str); - if (_value == (uint64_t)-1) _value = 0; - } -#endif } void destroy(uint32_t code) { -#if !TARGET_OS_EXCLAVEKIT - if (_str && _value) { - kdebug_trace_string(code, _value, nullptr); - } -#endif } friend class ScopedTimer; - friend uint64_t kdebug_trace_dyld_duration_start(uint32_t code, kt_arg data1, kt_arg data2, kt_arg data3); - friend void kdebug_trace_dyld_duration_end(uint64_t pair_id, uint32_t code, kt_arg data4, kt_arg data5, kt_arg data6); - friend void kdebug_trace_dyld_marker(uint32_t code, kt_arg data1, kt_arg data2, kt_arg data3, kt_arg data4); uint64_t _value; const char* _str; }; @@ -175,29 +157,6 @@ private: uint64_t current_trace_id = 0; }; -#if !TARGET_OS_EXCLAVEKIT -VIS_HIDDEN -void kdebug_trace_dyld_image(const uint32_t code, const char* path, const uuid_t* uuid_bytes, - const fsobj_id_t fsobjid, const fsid_t fsid, const void* load_addr, - uint32_t cpusubtype); -#endif - -VIS_HIDDEN -void kdebug_trace_dyld_cache(uint64_t fsobjid, uint64_t fsid, uint64_t sharedCacheBaseAddress, - const uint8_t sharedCacheUUID[16]); - -VIS_HIDDEN -bool kdebug_trace_dyld_enabled(uint32_t code); - -VIS_HIDDEN -void kdebug_trace_dyld_marker(uint32_t code, kt_arg data1, kt_arg data2, kt_arg data3, kt_arg data4); - -VIS_HIDDEN -uint64_t kdebug_trace_dyld_duration_start(uint32_t code, kt_arg data1, kt_arg data2, kt_arg data3); - -VIS_HIDDEN -void kdebug_trace_dyld_duration_end(uint64_t trace_id, uint32_t code, kt_arg data4, kt_arg data5, kt_arg data6); - VIS_HIDDEN void syntheticBacktrace(const char *reason, bool enableExternally=false); -- 2.51.2