@@ -56,16 +56,8 @@ BASE_OPTIONAL(const bool, MaySupportMemoryTagging, false)
56
56
// SizeClassMap to use with the Primary.
57
57
PRIMARY_REQUIRED_TYPE(SizeClassMap)
58
58
59
- // Defines the type and scale of a compact pointer. A compact pointer can
60
- // be understood as the offset of a pointer within the region it belongs
61
- // to, in increments of a power-of-2 scale. See `CompactPtrScale` also.
62
- PRIMARY_REQUIRED_TYPE(CompactPtrT)
63
-
64
59
// PRIMARY_REQUIRED(TYPE, NAME)
65
60
//
66
- // The scale of a compact pointer. E.g., Ptr = Base + (CompactPtr << Scale).
67
- PRIMARY_REQUIRED(const uptr, CompactPtrScale)
68
-
69
61
// Log2 of the size of a size class region, as used by the Primary.
70
62
PRIMARY_REQUIRED(const uptr, RegionSizeLog)
71
63
@@ -86,6 +78,9 @@ PRIMARY_REQUIRED(const s32, MaxReleaseToOsIntervalMs)
86
78
87
79
// PRIMARY_OPTIONAL(TYPE, NAME, DEFAULT)
88
80
//
81
+ // The scale of a compact pointer. E.g., Ptr = Base + (CompactPtr << Scale).
82
+ PRIMARY_OPTIONAL(const uptr, CompactPtrScale, SCUDO_MIN_ALIGNMENT_LOG)
83
+
89
84
// Indicates support for offsetting the start of a region by a random number of
90
85
// pages. This is only used if `EnableContiguousRegions` is enabled.
91
86
PRIMARY_OPTIONAL(const bool , EnableRandomOffset, false )
@@ -104,6 +99,11 @@ PRIMARY_OPTIONAL(const bool, EnableContiguousRegions, true)
104
99
// guarantee a performance benefit.
105
100
PRIMARY_OPTIONAL_TYPE(ConditionVariableT, ConditionVariableDummy)
106
101
102
+ // Defines the type and scale of a compact pointer. A compact pointer can
103
+ // be understood as the offset of a pointer within the region it belongs
104
+ // to, in increments of a power-of-2 scale. See `CompactPtrScale` also.
105
+ PRIMARY_OPTIONAL_TYPE(CompactPtrT, uptr)
106
+
107
107
// SECONDARY_REQUIRED_TEMPLATE_TYPE(NAME)
108
108
//
109
109
// Defines the type of Secondary Cache to use.
0 commit comments