Loading...
--- libmalloc/libmalloc-474.0.13/src/platform.h
+++ libmalloc/libmalloc-317.40.8/src/platform.h
@@ -24,11 +24,11 @@
 #ifndef __PLATFORM_H
 #define __PLATFORM_H
 
-#if (TARGET_OS_IPHONE && !TARGET_OS_SIMULATOR) || (TARGET_OS_DRIVERKIT && !MALLOC_TARGET_DK_OSX)
+#if TARGET_OS_IPHONE && !TARGET_OS_SIMULATOR
 #define MALLOC_TARGET_IOS 1
-#else // (TARGET_OS_IPHONE && !TARGET_OS_SIMULATOR) || (TARGET_OS_DRIVERKIT && !MALLOC_TARGET_DK_OSX)
+#else // TARGET_OS_IPHONE && !TARGET_OS_SIMULATOR
 #define MALLOC_TARGET_IOS 0
-#endif // (TARGET_OS_IPHONE && !TARGET_OS_SIMULATOR) || (TARGET_OS_DRIVERKIT && !MALLOC_TARGET_DK_OSX)
+#endif // TARGET_OS_IPHONE && !TARGET_OS_SIMULATOR
 
 #ifdef __LP64__
 #define MALLOC_TARGET_64BIT 1
@@ -37,17 +37,20 @@
 #endif
 
 // <rdar://problem/12596555>
+#if MALLOC_TARGET_IOS
+# define CONFIG_MADVISE_PRESSURE_RELIEF 0
+#else // MALLOC_TARGET_IOS
+# define CONFIG_MADVISE_PRESSURE_RELIEF 1
+#endif // MALLOC_TARGET_IOS
+
+// <rdar://problem/12596555>
 #define CONFIG_RECIRC_DEPOT 1
 #define CONFIG_AGGRESSIVE_MADVISE 1
 
 #if MALLOC_TARGET_IOS
 # define DEFAULT_AGGRESSIVE_MADVISE_ENABLED true
-// <rdar://problem/12596555>
-# define CONFIG_MADVISE_PRESSURE_RELIEF 0
 #else // MALLOC_TARGET_IOS
 # define DEFAULT_AGGRESSIVE_MADVISE_ENABLED false
-// <rdar://problem/12596555>
-# define CONFIG_MADVISE_PRESSURE_RELIEF 1
 #endif // MALLOC_TARGET_IOS
 
 // <rdar://problem/10397726>
@@ -67,18 +70,6 @@
 // enable nano checking for corrupt free list
 #define NANO_FREE_DEQUEUE_DILIGENCE 1
 
-// Conditional behaviour depends on MallocSpaceEfficient being set by
-// JetsamProperties which isn't true on iOS
-#if MALLOC_TARGET_IOS || TARGET_OS_DRIVERKIT
-#define NANOV2_DEFAULT_MODE NANO_ENABLED
-#else
-#define NANOV2_DEFAULT_MODE NANO_CONDITIONAL
-#endif
-
-// whether to pre-reserve all available nano regions during initialization
-#define CONFIG_NANO_RESERVE_REGIONS 0
-
-
 // This governs a last-free cache of 1 that bypasses the free-list for each region size
 #define CONFIG_TINY_CACHE 1
 #define CONFIG_SMALL_CACHE 1
@@ -95,46 +86,16 @@
 #define CONFIG_MEDIUM_ALLOCATOR 0
 #endif // MALLOC_TARGET_64BIT
 
-
-#if CONFIG_MEDIUM_ALLOCATOR
-#define DEFAULT_MEDIUM_ALLOCATOR_ENABLED 1
-#else // CONFIG_MEDIUM_ALLOCATOR
-#define DEFAULT_MEDIUM_ALLOCATOR_ENABLED 0
-#endif // CONFIG_MEDIUM_ALLOCATOR
-
-
 // The large last-free cache (aka. death row cache)
-#if TARGET_OS_IOS || TARGET_OS_SIMULATOR || TARGET_OS_DRIVERKIT
-// sdk=iphoneos, simulator, sdk=driverkit
-#define CONFIG_LARGE_CACHE 1
-#elif MALLOC_TARGET_IOS
-// all other embedded
+#if MALLOC_TARGET_IOS
 #define CONFIG_LARGE_CACHE 0
 #else
-// Mac
 #define CONFIG_LARGE_CACHE 1
 #endif
 
 #if CONFIG_LARGE_CACHE
-
-#if MALLOC_TARGET_IOS && MALLOC_TARGET_64BIT
-#define DEFAULT_LARGE_CACHE_ENABLED false
-#define CONFIG_DEFERRED_RECLAIM 1
-
-#elif TARGET_OS_SIMULATOR || (MALLOC_TARGET_IOS && !MALLOC_TARGET_64BIT)
-#define DEFAULT_LARGE_CACHE_ENABLED false
-#define CONFIG_DEFERRED_RECLAIM 0
-
-#else // TARGET_OS_SIMULATOR || (MALLOC_TARGET_IOS && !MALLOC_TARGET_64BIT)
 #define DEFAULT_LARGE_CACHE_ENABLED true
-#define CONFIG_DEFERRED_RECLAIM 0
-
-#endif // TARGET_OS_SIMULATOR || (MALLOC_TARGET_IOS && !MALLOC_TARGET_64BIT)
-
-#else // CONFIG_LARGE_CACHE
-#define  CONFIG_DEFERRED_RECLAIM 0
-
-#endif // CONFIG_LARGE_CACHE
+#endif
 
 #if MALLOC_TARGET_IOS
 // The VM system on iOS forces malloc-tagged memory to never be marked as
@@ -158,68 +119,15 @@
 #define CONFIG_FEATUREFLAGS_SIMPLE 0
 #endif
 
-#if !defined(TARGET_OS_EXCLAVECORE)
-#define TARGET_OS_EXCLAVECORE 0
-#endif
-
-#if !defined(TARGET_OS_EXCLAVEKIT)
-#define TARGET_OS_EXCLAVEKIT 0
-#endif
-
-// Sanitizer zone, only useful on macOS (+ DriverKit, 64-bit simulators) and exclavecore/exclavekit.
-#if (TARGET_OS_EXCLAVECORE || TARGET_OS_EXCLAVEKIT || TARGET_OS_OSX || TARGET_OS_DRIVERKIT || TARGET_OS_SIMULATOR) && MALLOC_TARGET_64BIT
-#define CONFIG_SANITIZER 1
-#else
-#define CONFIG_SANITIZER 0
-#endif
-
 // presence of commpage memsize
 #define CONFIG_HAS_COMMPAGE_MEMSIZE 1
 
 // presence of commpage number of cpu count
 #define CONFIG_HAS_COMMPAGE_NCPUS 1
 
-// Distribute magazines by cluster number if nmagazines == nclusters
-#if (TARGET_OS_IOS && !TARGET_OS_SIMULATOR)
-#define CONFIG_MAGAZINE_PER_CLUSTER 1
-#else // (TARGET_OS_IPHONE && !TARGET_OS_SIMULATOR)
-#define CONFIG_MAGAZINE_PER_CLUSTER 0
-#endif
-
-
 // Use of hyper-shift for magazine selection.
 #define CONFIG_NANO_USES_HYPER_SHIFT 0
-#define CONFIG_SZONE_USES_HYPER_SHIFT 0
-
-// FIXME: limit number of malloc_create_zone() wrapper zones for watchOS to remove this
-#if TARGET_OS_OSX || TARGET_OS_IOS
-#define CONFIG_PGM_WRAP_CUSTOM_ZONES 1
-#else
-#define CONFIG_PGM_WRAP_CUSTOM_ZONES 0
-#endif
-
-#define MALLOC_ZERO_POLICY_DEFAULT MALLOC_ZERO_ON_FREE
-
-
-#if MALLOC_TARGET_64BIT
-#define CONFIG_EARLY_MALLOC 1
-#else
-#define CONFIG_EARLY_MALLOC 0
-#endif
-
-#if TARGET_OS_IOS
-#define MALLOC_TARGET_IOS_ONLY 1
-#else
-#define MALLOC_TARGET_IOS_ONLY 0
-#endif
-
-
-#if MALLOC_TARGET_IOS_ONLY
-#define CONFIG_MALLOC_PROCESS_IDENTITY 1
-#else
-#define CONFIG_MALLOC_PROCESS_IDENTITY 0
-#endif
-
-#define MALLOC_SECURE_ALLOCATOR_LAUNCHD_ENABLED_DEFAULT true
+#define CONFIG_TINY_USES_HYPER_SHIFT 0
+#define CONFIG_SMALL_USES_HYPER_SHIFT 0
 
 #endif // __PLATFORM_H