--- libmalloc/libmalloc-116/src/magazine_malloc.h
+++ libmalloc/libmalloc-166.220.1/src/magazine_malloc.h
@@ -38,9 +38,11 @@
 boolean_t
 scalable_zone_statistics(malloc_zone_t *zone, malloc_statistics_t *stats, unsigned subzone);
 
-MALLOC_NOINLINE __printflike(5, 6)
-void
-szone_error(szone_t *szone, int is_corruption, const char *msg, const void *ptr, const char *fmt, ...);
+MALLOC_NOEXPORT
+extern int max_magazines;
+
+MALLOC_NOEXPORT
+extern int recirc_retained_regions;
 
 // MARK: magazine_malloc utility functions
 
@@ -49,30 +51,6 @@
 struct malloc_introspection_t szone_introspect;
 
 MALLOC_NOEXPORT
-void *
-allocate_pages(szone_t *szone, size_t size, unsigned char align, unsigned debug_flags, int vm_page_label);
-
-MALLOC_NOEXPORT
-void *
-allocate_pages_securely(szone_t *szone, size_t size, unsigned char align, int vm_page_label);
-
-MALLOC_NOEXPORT
-void
-deallocate_pages(szone_t *szone, void *addr, size_t size, unsigned debug_flags);
-
-MALLOC_NOEXPORT
-int
-madvise_free_range(szone_t *szone, region_t r, uintptr_t pgLo, uintptr_t pgHi, uintptr_t *last);
-
-MALLOC_NOEXPORT
-int
-madvise_reuse_range(szone_t *szone, region_t r, uintptr_t pgLo, uintptr_t phHi);
-
-MALLOC_NOEXPORT
-void
-protect(void *address, size_t size, unsigned protection, unsigned debug_flags);
-
-MALLOC_NOEXPORT
 void
 szone_batch_free(szone_t *szone, void **to_be_freed, unsigned count);
 
@@ -109,6 +87,10 @@
 szone_pressure_relief(szone_t *szone, size_t goal);
 
 MALLOC_NOEXPORT
+boolean_t
+szone_claimed_address(szone_t *szone, void *ptr);
+
+MALLOC_NOEXPORT
 void *
 szone_realloc(szone_t *szone, void *ptr, size_t new_size);
 
@@ -128,31 +110,32 @@
 
 MALLOC_NOEXPORT
 boolean_t
-tiny_check_region(szone_t *szone, region_t region);
-
-MALLOC_NOEXPORT
-void
-tiny_finalize_region(szone_t *szone, magazine_t *tiny_mag_ptr);
+tiny_check_region(rack_t *rack, region_t region, size_t region_index,
+		unsigned counter);
+
+MALLOC_NOEXPORT
+void
+tiny_finalize_region(rack_t *rack, magazine_t *tiny_mag_ptr);
 
 MALLOC_NOEXPORT
 int
-tiny_free_detach_region(szone_t *szone, magazine_t *tiny_mag_ptr, region_t r);
-
-MALLOC_NOEXPORT
-boolean_t
-tiny_free_list_check(szone_t *szone, grain_t slot);
-
-MALLOC_NOEXPORT
-boolean_t
-tiny_free_no_lock(szone_t *szone, magazine_t *tiny_mag_ptr, mag_index_t mag_index, region_t region, void *ptr, msize_t msize);
-
-MALLOC_NOEXPORT
-size_t
-tiny_free_reattach_region(szone_t *szone, magazine_t *tiny_mag_ptr, region_t r);
-
-MALLOC_NOEXPORT
-void
-tiny_free_scan_madvise_free(szone_t *szone, magazine_t *depot_ptr, region_t r);
+tiny_free_detach_region(rack_t *rack, magazine_t *tiny_mag_ptr, region_t r);
+
+MALLOC_NOEXPORT
+boolean_t
+tiny_free_list_check(rack_t *rack, grain_t slot, unsigned counter);
+
+MALLOC_NOEXPORT
+boolean_t
+tiny_free_no_lock(rack_t *rack, magazine_t *tiny_mag_ptr, mag_index_t mag_index, region_t region, void *ptr, msize_t msize);
+
+MALLOC_NOEXPORT
+size_t
+tiny_free_reattach_region(rack_t *rack, magazine_t *tiny_mag_ptr, region_t r);
+
+MALLOC_NOEXPORT
+void
+tiny_free_scan_madvise_free(rack_t *rack, magazine_t *depot_ptr, region_t r);
 
 MALLOC_NOEXPORT
 kern_return_t
@@ -161,31 +144,47 @@
 
 MALLOC_NOEXPORT
 void *
-tiny_malloc_from_free_list(szone_t *szone, magazine_t *tiny_mag_ptr, mag_index_t mag_index, msize_t msize);
-
-MALLOC_NOEXPORT
-void *
-tiny_malloc_should_clear(szone_t *szone, msize_t msize, boolean_t cleared_requested);
+tiny_malloc_from_free_list(rack_t *rack, magazine_t *tiny_mag_ptr, mag_index_t mag_index, msize_t msize);
+
+MALLOC_NOEXPORT
+void *
+tiny_malloc_should_clear(rack_t *rack, msize_t msize, boolean_t cleared_requested);
 
 MALLOC_NOEXPORT
 void *
 tiny_memalign(szone_t *szone, size_t alignment, size_t size, size_t span);
 
 MALLOC_NOEXPORT
-void *
-tiny_try_shrink_in_place(szone_t *szone, void *ptr, size_t old_size, size_t new_good_size);
-
-MALLOC_NOEXPORT
-boolean_t
-tiny_try_realloc_in_place(szone_t *szone, void *ptr, size_t old_size, size_t new_size);
-
-MALLOC_NOEXPORT
-void
-free_tiny(szone_t *szone, void *ptr, region_t tiny_region, size_t known_size);
-
-MALLOC_NOEXPORT
-void
-print_tiny_free_list(szone_t *szone);
+boolean_t
+tiny_claimed_address(rack_t *rack, void *ptr);
+
+MALLOC_NOEXPORT
+void *
+tiny_try_shrink_in_place(rack_t *rack, void *ptr, size_t old_size, size_t new_good_size);
+
+MALLOC_NOEXPORT
+boolean_t
+tiny_try_realloc_in_place(rack_t *rack, void *ptr, size_t old_size, size_t new_size);
+
+MALLOC_NOEXPORT
+void
+free_tiny(rack_t *rack, void *ptr, region_t tiny_region, size_t known_size);
+
+MALLOC_NOEXPORT
+size_t
+tiny_size(rack_t *rack, const void *ptr);
+
+MALLOC_NOEXPORT
+unsigned
+tiny_batch_malloc(szone_t *szone, size_t size, void **results, unsigned count);
+
+MALLOC_NOEXPORT
+void
+tiny_batch_free(szone_t *szone, void **to_be_freed, unsigned count);
+
+MALLOC_NOEXPORT
+void
+print_tiny_free_list(rack_t *rack);
 
 MALLOC_NOEXPORT
 void
@@ -195,27 +194,28 @@
 
 MALLOC_NOEXPORT
 boolean_t
-small_check_region(szone_t *szone, region_t region);
-
-MALLOC_NOEXPORT
-void
-small_finalize_region(szone_t *szone, magazine_t *small_mag_ptr);
+small_check_region(rack_t *rack, region_t region, size_t region_index,
+		unsigned counter);
+
+MALLOC_NOEXPORT
+void
+small_finalize_region(rack_t *rack, magazine_t *small_mag_ptr);
 
 MALLOC_NOEXPORT
 int
-small_free_detach_region(szone_t *szone, magazine_t *small_mag_ptr, region_t r);
-
-MALLOC_NOEXPORT
-boolean_t
-small_free_list_check(szone_t *szone, grain_t slot);
-
-MALLOC_NOEXPORT
-size_t
-small_free_reattach_region(szone_t *szone, magazine_t *small_mag_ptr, region_t r);
-
-MALLOC_NOEXPORT
-void
-small_free_scan_madvise_free(szone_t *szone, magazine_t *depot_ptr, region_t r);
+small_free_detach_region(rack_t *rack, magazine_t *small_mag_ptr, region_t r);
+
+MALLOC_NOEXPORT
+boolean_t
+small_free_list_check(rack_t *rack, grain_t slot, unsigned counter);
+
+MALLOC_NOEXPORT
+size_t
+small_free_reattach_region(rack_t *rack, magazine_t *small_mag_ptr, region_t r);
+
+MALLOC_NOEXPORT
+void
+small_free_scan_madvise_free(rack_t *rack, magazine_t *depot_ptr, region_t r);
 
 MALLOC_NOEXPORT
 kern_return_t
@@ -224,27 +224,35 @@
 
 MALLOC_NOEXPORT
 void *
-small_malloc_should_clear(szone_t *szone, msize_t msize, boolean_t cleared_requested);
+small_malloc_should_clear(rack_t *rack, msize_t msize, boolean_t cleared_requested);
 
 MALLOC_NOEXPORT
 void *
 small_memalign(szone_t *szone, size_t alignment, size_t size, size_t span);
 
 MALLOC_NOEXPORT
-void *
-small_try_shrink_in_place(szone_t *szone, void *ptr, size_t old_size, size_t new_good_size);
-
-MALLOC_NOEXPORT
-boolean_t
-small_try_realloc_in_place(szone_t *szone, void *ptr, size_t old_size, size_t new_size);
-
-MALLOC_NOEXPORT
-void
-free_small(szone_t *szone, void *ptr, region_t small_region, size_t known_size);
-
-MALLOC_NOEXPORT
-void
-print_small_free_list(szone_t *szone);
+boolean_t
+small_claimed_address(rack_t *rack, void *ptr);
+
+MALLOC_NOEXPORT
+void *
+small_try_shrink_in_place(rack_t *rack, void *ptr, size_t old_size, size_t new_good_size);
+
+MALLOC_NOEXPORT
+boolean_t
+small_try_realloc_in_place(rack_t *rack, void *ptr, size_t old_size, size_t new_size);
+
+MALLOC_NOEXPORT
+void
+free_small(rack_t *rack, void *ptr, region_t small_region, size_t known_size);
+
+MALLOC_NOEXPORT
+size_t
+small_size(rack_t *rack, const void *ptr);
+
+MALLOC_NOEXPORT
+void
+print_small_free_list(rack_t *rack);
 
 MALLOC_NOEXPORT
 void
@@ -282,6 +290,10 @@
 large_malloc(szone_t *szone, size_t num_kernel_pages, unsigned char alignment, boolean_t cleared_requested);
 
 MALLOC_NOEXPORT
+boolean_t
+large_claimed_address(szone_t *szone, void *ptr);
+
+MALLOC_NOEXPORT
 void *
 szone_malloc_should_clear(szone_t *szone, size_t size, boolean_t cleared_requested);
 
@@ -289,6 +301,7 @@
 
 #define MALLOC_STOCK_LOGGING_LITE_ZONE_NAME "MallocStackLoggingLiteZone"
 
+// These enable/disable stack logging lite for malloc allocations, not VM-only lite mode
 MALLOC_NOEXPORT
 void
 enable_stack_logging_lite();