Loading...
--- libmalloc/libmalloc-474.0.13/src/vm.h
+++ libmalloc/libmalloc-140.50.6/src/vm.h
@@ -28,8 +28,7 @@
static inline bool
mvm_aslr_enabled(void)
{
- extern struct mach_header __dso_handle;
- return _dyld_get_image_slide(&__dso_handle);
+ return _dyld_get_image_slide((const struct mach_header *)_NSGetMachExecuteHeader()) != 0;
}
MALLOC_NOEXPORT
@@ -38,7 +37,11 @@
MALLOC_NOEXPORT
void *
-mvm_allocate_pages(size_t size, unsigned char align, uint32_t debug_flags, int vm_page_label);
+mvm_allocate_pages(size_t size, unsigned char align, unsigned debug_flags, int vm_page_label);
+
+MALLOC_NOEXPORT
+void *
+mvm_allocate_pages_securely(size_t size, unsigned char align, int vm_page_label, uint32_t debug_flags);
MALLOC_NOEXPORT
void
@@ -46,28 +49,14 @@
MALLOC_NOEXPORT
int
-mvm_madvise_free(void *szone, void *r, uintptr_t pgLo, uintptr_t pgHi, uintptr_t *last, boolean_t scribble);
+mvm_madvise_free(rack_t *szone, region_t r, uintptr_t pgLo, uintptr_t pgHi, uintptr_t *last);
+
+MALLOC_NOEXPORT
+int
+mvm_madvise_reuse(region_t r, uintptr_t pgLo, uintptr_t phHi, uint32_t debug_flags);
MALLOC_NOEXPORT
void
mvm_protect(void *address, size_t size, unsigned protection, unsigned debug_flags);
-#if CONFIG_DEFERRED_RECLAIM
-MALLOC_NOEXPORT
-kern_return_t
-mvm_deferred_reclaim_init(void);
-
-MALLOC_NOEXPORT
-bool
-mvm_reclaim_mark_used(uint64_t id, mach_vm_address_t ptr, uint32_t size, unsigned int debug_flags);
-
-MALLOC_NOEXPORT
-uint64_t
-mvm_reclaim_mark_free(vm_address_t ptr, uint32_t size, unsigned int debug_flags);
-
-MALLOC_NOEXPORT
-bool
-mvm_reclaim_is_available(uint64_t id);
-#endif // CONFIG_DEFERRED_RECLAIM
-
#endif // __VM_H