Loading...
--- libmalloc/libmalloc-792.80.2/src/vm.h
+++ libmalloc/libmalloc-521.100.59/src/vm.h
@@ -39,28 +39,12 @@
 extern uint64_t malloc_entropy[2];
 
 #if !MALLOC_TARGET_EXCLAVES
-MALLOC_NOEXPORT
-extern volatile uintptr_t entropic_base;
-
 static inline bool
 mvm_aslr_enabled(void)
 {
 	extern struct mach_header __dso_handle;
 	return _dyld_get_image_slide(&__dso_handle);
 }
-
-struct mvm_guarded_range_config_s {
-	mach_vm_address_t base_address;
-	size_t            size;
-	mach_vm_address_t carveout_address;
-};
-
-MALLOC_NOEXPORT
-extern struct mvm_guarded_range_config_s malloc_guarded_range_config;
-
-MALLOC_NOEXPORT
-void
-mvm_guarded_range_init(void);
 #endif // !MALLOC_TARGET_EXCLAVES
 
 MALLOC_NOEXPORT
@@ -68,15 +52,15 @@
 mvm_aslr_init(void);
 
 MALLOC_NOEXPORT
-void * __alloc_size(2) __sized_by_or_null(size)
+void * __alloc_size(2)
 mvm_allocate_plat(uintptr_t addr, size_t size, uint8_t align, int flags, int debug_flags, int label, plat_map_t *map_out);
 
 MALLOC_NOEXPORT
-void * __alloc_size(1) __sized_by_or_null(size)
+void * __alloc_size(1)
 mvm_allocate_pages(size_t size, uint8_t align, uint32_t debug_flags, int vm_page_label);
 
 MALLOC_NOEXPORT
-void * __alloc_size(1) __sized_by_or_null(size)
+void * __alloc_size(1)
 mvm_allocate_pages_plat(size_t size, uint8_t align, uint32_t debug_flags, int vm_page_label, plat_map_t *map_out);
 
 MALLOC_NOEXPORT
@@ -115,22 +99,22 @@
 void
 mvm_protect_plat(void * __sized_by(size) address, size_t size, unsigned protection, unsigned debug_flags, plat_map_t *map);
 
-#if CONFIG_MAGAZINE_DEFERRED_RECLAIM
+#if CONFIG_DEFERRED_RECLAIM
 MALLOC_NOEXPORT
 kern_return_t
 mvm_deferred_reclaim_init(void);
 
 MALLOC_NOEXPORT
 bool
-mvm_reclaim_mark_used(mach_vm_reclaim_id_t id, mach_vm_address_t ptr, mach_vm_size_t size, unsigned int debug_flags);
+mvm_reclaim_mark_used(uint64_t id, mach_vm_address_t ptr, uint32_t size, unsigned int debug_flags);
 
 MALLOC_NOEXPORT
-mach_vm_reclaim_id_t
-mvm_reclaim_mark_free(mach_vm_address_t ptr, mach_vm_size_t size, unsigned int debug_flags);
+uint64_t
+mvm_reclaim_mark_free(vm_address_t ptr, uint32_t size, unsigned int debug_flags);
 
 MALLOC_NOEXPORT
 bool
-mvm_reclaim_is_available(mach_vm_reclaim_id_t id);
-#endif // CONFIG_MAGAZINE_DEFERRED_RECLAIM
+mvm_reclaim_is_available(uint64_t id);
+#endif // CONFIG_DEFERRED_RECLAIM
 
 #endif // __VM_H