Loading...
--- libmalloc/libmalloc-646.40.3/src/base.h
+++ libmalloc/libmalloc-792.80.2/src/base.h
@@ -46,6 +46,12 @@
 		__builtin_trap(); \
 	} \
 })
+
+#ifdef DEBUG
+#define MALLOC_DEBUG_ASSERT(e) MALLOC_ASSERT(e)
+#else
+#define MALLOC_DEBUG_ASSERT(e)
+#endif
 
 #define MALLOC_FATAL_ERROR(cause, message) ({ \
 		_os_set_crash_log_cause_and_message((cause), "FATAL ERROR - " message); \
@@ -194,12 +200,20 @@
 #define MALLOC_PURGEABLE (1 << 7)
 // call abort() on malloc errors, but not on out of memory.
 #define MALLOC_ABORT_ON_CORRUPTION (1 << 8)
-// don't populate the mapping for the allocation
+// don't populate the mapping for this allocation
 #define MALLOC_NO_POPULATE (1 << 9)
+// enable faulting anywhere within this allocation
+#define MALLOC_CAN_FAULT (1 << 12)
+// guarded metadata allocation
+#define MALLOC_GUARDED_METADATA (1 << 13)
 
 // See malloc_implementation.h
 // MALLOC_MSL_LITE_WRAPPED_ZONE_FLAGS == (1 << 10)
 
+#if CONFIG_MTE
+// allocate objects such that they can be MTE-tagged
+#define MALLOC_MTE_TAGGABLE (1 << 11)
+#endif
 
 /*
  * These commpage routines provide fast access to the logical cpu number
@@ -209,9 +223,9 @@
 extern unsigned int hyper_shift;
 extern unsigned int logical_ncpus;
 extern unsigned int phys_ncpus;
-#if CONFIG_MAGAZINE_PER_CLUSTER
+#if CONFIG_CLUSTER_AWARE
 extern unsigned int ncpuclusters;
-#endif // CONFIG_MAGAZINE_PER_CLUSTER
+#endif // CONFIG_CLUSTER_AWARE
 
 /*
  * msize - a type to refer to the number of quanta of a tiny or small