diff options
Diffstat (limited to 'gcc/vec.h')
| -rw-r--r-- | gcc/vec.h | 754 |
1 files changed, 418 insertions, 336 deletions
diff --git a/gcc/vec.h b/gcc/vec.h index 945a4137f6b..43aeb817d64 100644 --- a/gcc/vec.h +++ b/gcc/vec.h @@ -37,7 +37,9 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA latter case the pointers are dereferenced and the objects copied into the vector. Therefore, when using a vector of pointers, the objects pointed to must be long lived, but when dealing with a - vector of objects, the source objects need not be. + vector of objects, the source objects need not be. The vector of + pointers API is also appropriate for small register sized objects + like integers. There are both 'index' and 'iterate' accessors. The iterator returns a boolean iteration condition and updates the iteration @@ -63,9 +65,13 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA vector, if needed. Reallocation causes an exponential increase in vector size. If you know you will be adding N elements, it would be more efficient to use the reserve operation before adding the - elements with the 'quick' operation. You may also use the reserve - operation with a -1 operand, to gain control over exactly when - reallocation occurs. + elements with the 'quick' operation. This will ensure there are at + least as many elements as you ask for, it will exponentially + increase if there are too few spare slots. If you want reserve a + specific number of slots, but do not want the exponential increase + (for instance, you know this is the last allocation), use a + negative number for reservation. You can also create a vector of a + specific size from the get go. You should prefer the push and pop operations, as they append and remove from the end of the vector. If you need to remove several @@ -74,39 +80,51 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA vector. There are two remove operations, one which preserves the element ordering 'ordered_remove', and one which does not 'unordered_remove'. The latter function copies the end element - into the removed slot, rather than invoke a memmove operation. - The 'lower_bound' function will determine where to place an item in the + into the removed slot, rather than invoke a memmove operation. The + 'lower_bound' function will determine where to place an item in the array using insert that will maintain sorted order. - Both garbage collected and explicitly managed vector types are - creatable. The allocation mechanism is specified when the type is - defined, and is therefore part of the type. + When a vector type is defined, first a non-memory managed version + is created. You can then define either or both garbage collected + and heap allocated versions. The allocation mechanism is specified + when the type is defined, and is therefore part of the type. If + you need both gc'd and heap allocated versions, you still must have + *exactly* one definition of the common non-memory managed base vector. If you need to directly manipulate a vector, then the 'address' accessor will return the address of the start of the vector. Also the 'space' predicate will tell you whether there is spare capacity in the vector. You will not normally need to use these two functions. - Vector types are defined using a DEF_VEC_{GC,MALLOC}_{O,P}(TYPEDEF) - macro, and variables of vector type are declared using a - VEC(TYPEDEF) macro. The tags GC and MALLOC specify the allocation - method -- garbage collected or explicit malloc/free calls. The - characters O and P indicate whether TYPEDEF is a pointer (P) or - object (O) type. + Vector types are defined using a DEF_VEC_{O,P}(TYPEDEF) macro, to + get the non-memory allocation version, and then a + DEF_VEC_ALLOC_{O,P}(TYPEDEF,ALLOC) macro to get memory managed + vectors. Variables of vector type are declared using a + VEC(TYPEDEF,ALLOC) macro. The ALLOC argument specifies the + allocation strategy, and can be either 'gc' or 'heap' for garbage + collected and heap allocated respectively. It can be 'none' to get + a vector that must be explicitly allocated (for instance as a + trailing array of another structure). The characters O and P + indicate whether TYPEDEF is a pointer (P) or object (O) type. Be + careful to pick the correct one, as you'll get an awkward and + inefficient API if you get the wrong one. There is a check, which + results in a compile-time warning, for the P versions, but there is + no check for the O versions, as that is not possible in plain C. An example of their use would be, - DEF_VEC_GC_P(tree); // define a gc'd vector of tree pointers. This must - // appear at file scope. + DEF_VEC_P(tree); // non-managed tree vector. + DEF_VEC_ALLOC_P(tree,gc); // gc'd vector of tree pointers. This must + // appear at file scope. struct my_struct { - VEC(tree) *v; // A (pointer to) a vector of tree pointers. + VEC(tree,gc) *v; // A (pointer to) a vector of tree pointers. }; struct my_struct *s; if (VEC_length(tree,s->v)) { we have some contents } - VEC_safe_push(tree,s->v,decl); // append some decl onto the end + VEC_safe_push(tree,gc,s->v,decl); // append some decl onto the end for (ix = 0; VEC_iterate(tree,s->v,ix,elt); ix++) { do something with elt } @@ -114,9 +132,11 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA /* Macros to invoke API calls. A single macro works for both pointer and object vectors, but the argument and return types might well be - different. In each macro, TDEF is the typedef of the vector - elements. Some of these macros pass the vector, V, by reference - (by taking its address), this is noted in the descriptions. */ + different. In each macro, T is the typedef of the vector elements, + and A is the allocation strategy. The allocation strategy is only + present when it is required. Some of these macros pass the vector, + V, by reference (by taking its address), this is noted in the + descriptions. */ /* Length of vector unsigned VEC_T_length(const VEC(T) *v); @@ -124,7 +144,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA Return the number of active elements in V. V can be NULL, in which case zero is returned. */ -#define VEC_length(TDEF,V) (VEC_OP(TDEF,length)(V)) +#define VEC_length(T,V) (VEC_OP(T,base,length)(VEC_BASE(V))) /* Get the final element of the vector. T VEC_T_last(VEC(T) *v); // Pointer @@ -132,7 +152,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA Return the final element. If V is empty, abort. */ -#define VEC_last(TDEF,V) (VEC_OP(TDEF,last)(V VEC_CHECK_INFO)) +#define VEC_last(T,V) (VEC_OP(T,base,last)(VEC_BASE(V) VEC_CHECK_INFO)) /* Index into vector T VEC_T_index(VEC(T) *v, unsigned ix); // Pointer @@ -141,7 +161,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA Return the IX'th element. If IX is outside the domain of V, abort. */ -#define VEC_index(TDEF,V,I) (VEC_OP(TDEF,index)(V,I VEC_CHECK_INFO)) +#define VEC_index(T,V,I) (VEC_OP(T,base,index)(VEC_BASE(V),I VEC_CHECK_INFO)) /* Iterate over vector int VEC_T_iterate(VEC(T) *v, unsigned ix, T &ptr); // Pointer @@ -154,22 +174,22 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA for (ix = 0; VEC_iterate(T,v,ix,ptr); ix++) continue; */ -#define VEC_iterate(TDEF,V,I,P) (VEC_OP(TDEF,iterate)(V,I,&(P))) +#define VEC_iterate(T,V,I,P) (VEC_OP(T,base,iterate)(VEC_BASE(V),I,&(P))) /* Allocate new vector. - VEC(T) *VEC_T_alloc(int reserve); + VEC(T,A) *VEC_T_A_alloc(int reserve); Allocate a new vector with space for RESERVE objects. If RESERVE - is <= 0, a default number of slots are created. */ + is zero, NO vector is created. */ -#define VEC_alloc(TDEF,A) (VEC_OP(TDEF,alloc)(A MEM_STAT_INFO)) +#define VEC_alloc(T,A,N) (VEC_OP(T,A,alloc)(N MEM_STAT_INFO)) /* Free a vector. - void VEC_T_alloc(VEC(T) *&); + void VEC_T_A_free(VEC(T,A) *&); Free a vector and set it to NULL. */ -#define VEC_free(TDEF,V) (VEC_OP(TDEF,free)(&V)) +#define VEC_free(T,A,V) (VEC_OP(T,A,free)(&V)) /* Use these to determine the required size and initialization of a vector embedded within another structure (as the final member). @@ -179,34 +199,34 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA These allow the caller to perform the memory allocation. */ -#define VEC_embedded_size(TDEF,A) (VEC_OP(TDEF,embedded_size)(A)) -#define VEC_embedded_init(TDEF,O,A) (VEC_OP(TDEF,embedded_init)(O,A)) +#define VEC_embedded_size(T,N) (VEC_OP(T,base,embedded_size)(N)) +#define VEC_embedded_init(T,O,N) (VEC_OP(T,base,embedded_init)(VEC_BASE(O),N)) /* Determine if a vector has additional capacity. int VEC_T_space (VEC(T) *v,int reserve) - If V has space for RESERVE additional entries, return nonzero. If - RESERVE is < 0, ensure there is at least one space slot. You + If V has space for RESERVE additional entries, return nonzero. You usually only need to use this if you are doing your own vector reallocation, for instance on an embedded vector. This returns nonzero in exactly the same circumstances that VEC_T_reserve will. */ -#define VEC_space(TDEF,V,R) (VEC_OP(TDEF,space)(V,R)) +#define VEC_space(T,V,R) \ + (VEC_OP(T,base,space)(VEC_BASE(V),R VEC_CHECK_INFO)) /* Reserve space. - int VEC_T_reserve(VEC(T) *&v, int reserve); + int VEC_T_A_reserve(VEC(T,A) *&v, int reserve); - Ensure that V has at least RESERVE slots available, if RESERVE is - >= 0. If RESERVE < 0, ensure that there is at least one spare - slot. These differ in their reallocation behavior, the first will - not create additional headroom, but the second mechanism will - perform the usual exponential headroom increase. Note this can - cause V to be reallocated. Returns nonzero iff reallocation - actually occurred. */ + Ensure that V has at least abs(RESERVE) slots available. The + signedness of RESERVE determines the reallocation behavior. A + negative value will not create additional headroom beyond that + requested. A positive value will create additional headroom. Note + this can cause V to be reallocated. Returns nonzero iff + reallocation actually occurred. */ -#define VEC_reserve(TDEF,V,R) (VEC_OP(TDEF,reserve)(&(V),R MEM_STAT_INFO)) +#define VEC_reserve(T,A,V,R) \ + (VEC_OP(T,A,reserve)(&(V),R VEC_CHECK_INFO MEM_STAT_INFO)) /* Push object with no reallocation T *VEC_T_quick_push (VEC(T) *v, T obj); // Pointer @@ -217,19 +237,19 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA case NO initialization is performed. Aborts if there is insufficient space in the vector. */ -#define VEC_quick_push(TDEF,V,O) \ - (VEC_OP(TDEF,quick_push)(V,O VEC_CHECK_INFO)) +#define VEC_quick_push(T,V,O) \ + (VEC_OP(T,base,quick_push)(VEC_BASE(V),O VEC_CHECK_INFO)) /* Push object with reallocation - T *VEC_T_safe_push (VEC(T) *&v, T obj); // Pointer - T *VEC_T_safe_push (VEC(T) *&v, T *obj); // Object + T *VEC_T_A_safe_push (VEC(T,A) *&v, T obj); // Pointer + T *VEC_T_A_safe_push (VEC(T,A) *&v, T *obj); // Object Push a new element onto the end, returns a pointer to the slot filled in. For object vectors, the new value can be NULL, in which case NO initialization is performed. Reallocates V, if needed. */ -#define VEC_safe_push(TDEF,V,O) \ - (VEC_OP(TDEF,safe_push)(&(V),O VEC_CHECK_INFO MEM_STAT_INFO)) +#define VEC_safe_push(T,A,V,O) \ + (VEC_OP(T,A,safe_push)(&(V),O VEC_CHECK_INFO MEM_STAT_INFO)) /* Pop element off end T VEC_T_pop (VEC(T) *v); // Pointer @@ -238,15 +258,26 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA Pop the last element off the end. Returns the element popped, for pointer vectors. */ -#define VEC_pop(TDEF,V) (VEC_OP(TDEF,pop)(V VEC_CHECK_INFO)) +#define VEC_pop(T,V) (VEC_OP(T,base,pop)(VEC_BASE(V) VEC_CHECK_INFO)) /* Truncate to specific length void VEC_T_truncate (VEC(T) *v, unsigned len); - Set the length as specified. This is an O(1) operation. */ + Set the length as specified. The new length must be less than or + equal to the current length. This is an O(1) operation. */ -#define VEC_truncate(TDEF,V,I) \ - (VEC_OP(TDEF,truncate)(V,I VEC_CHECK_INFO)) +#define VEC_truncate(T,V,I) \ + (VEC_OP(T,base,truncate)(VEC_BASE(V),I VEC_CHECK_INFO)) + +/* Grow to a specific length. + void VEC_T_A_safe_grow (VEC(T,A) *&v, int len); + + Grow the vector to a specific length. The LEN must be as + long or longer than the current length. The new elements are + uninitialized. */ + +#define VEC_safe_grow(T,A,V,I) \ + (VEC_OP(T,A,grow)(&(V),I VEC_CHECK_INFO)) /* Replace element T VEC_T_replace (VEC(T) *v, unsigned ix, T val); // Pointer @@ -258,8 +289,8 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA NULL, in which case no overwriting of the slot is actually performed. */ -#define VEC_replace(TDEF,V,I,O) \ - (VEC_OP(TDEF,replace)(V,I,O VEC_CHECK_INFO)) +#define VEC_replace(T,V,I,O) \ + (VEC_OP(T,base,replace)(VEC_BASE(V),I,O VEC_CHECK_INFO)) /* Insert object with no reallocation T *VEC_T_quick_insert (VEC(T) *v, unsigned ix, T val); // Pointer @@ -270,20 +301,20 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA NULL, in which case no initialization of the inserted slot takes place. Aborts if there is insufficient space. */ -#define VEC_quick_insert(TDEF,V,I,O) \ - (VEC_OP(TDEF,quick_insert)(V,I,O VEC_CHECK_INFO)) +#define VEC_quick_insert(T,V,I,O) \ + (VEC_OP(T,base,quick_insert)(VEC_BASE(V),I,O VEC_CHECK_INFO)) /* Insert object with reallocation - T *VEC_T_safe_insert (VEC(T) *&v, unsigned ix, T val); // Pointer - T *VEC_T_safe_insert (VEC(T) *&v, unsigned ix, T *val); // Object + T *VEC_T_A_safe_insert (VEC(T,A) *&v, unsigned ix, T val); // Pointer + T *VEC_T_A_safe_insert (VEC(T,A) *&v, unsigned ix, T *val); // Object Insert an element, VAL, at the IXth position of V. Return a pointer to the slot created. For vectors of object, the new value can be NULL, in which case no initialization of the inserted slot takes place. Reallocate V, if necessary. */ -#define VEC_safe_insert(TDEF,V,I,O) \ - (VEC_OP(TDEF,safe_insert)(&(V),I,O VEC_CHECK_INFO MEM_STAT_INFO)) +#define VEC_safe_insert(T,A,V,I,O) \ + (VEC_OP(T,A,safe_insert)(&(V),I,O VEC_CHECK_INFO MEM_STAT_INFO)) /* Remove element retaining order T VEC_T_ordered_remove (VEC(T) *v, unsigned ix); // Pointer @@ -293,8 +324,8 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA remaining elements is preserved. For pointer vectors returns the removed object. This is an O(N) operation due to a memmove. */ -#define VEC_ordered_remove(TDEF,V,I) \ - (VEC_OP(TDEF,ordered_remove)(V,I VEC_CHECK_INFO)) +#define VEC_ordered_remove(T,V,I) \ + (VEC_OP(T,base,ordered_remove)(VEC_BASE(V),I VEC_CHECK_INFO)) /* Remove element destroying order T VEC_T_unordered_remove (VEC(T) *v, unsigned ix); // Pointer @@ -304,8 +335,8 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA remaining elements is destroyed. For pointer vectors returns the removed object. This is an O(1) operation. */ -#define VEC_unordered_remove(TDEF,V,I) \ - (VEC_OP(TDEF,unordered_remove)(V,I VEC_CHECK_INFO)) +#define VEC_unordered_remove(T,V,I) \ + (VEC_OP(T,base,unordered_remove)(VEC_BASE(V),I VEC_CHECK_INFO)) /* Get the address of the array of elements T *VEC_T_address (VEC(T) v) @@ -313,7 +344,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA If you need to directly manipulate the array (for instance, you want to feed it to qsort), use this accessor. */ -#define VEC_address(TDEF,V) (VEC_OP(TDEF,address)(V)) +#define VEC_address(T,V) (VEC_OP(T,base,address)(VEC_BASE(V))) /* Find the first index in the vector not less than the object. unsigned VEC_T_lower_bound (VEC(T) *v, const T val, @@ -325,25 +356,26 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA changing the ordering of V. LESSTHAN is a function that returns true if the first argument is strictly less than the second. */ -#define VEC_lower_bound(TDEF,V,O,LT) \ - (VEC_OP(TDEF,lower_bound)(V,O,LT VEC_CHECK_INFO)) +#define VEC_lower_bound(T,V,O,LT) \ + (VEC_OP(T,base,lower_bound)(VEC_BASE(V),O,LT VEC_CHECK_INFO)) #if !IN_GENGTYPE /* Reallocate an array of elements with prefix. */ extern void *vec_gc_p_reserve (void *, int MEM_STAT_DECL); extern void *vec_gc_o_reserve (void *, int, size_t, size_t MEM_STAT_DECL); -extern void vec_gc_free (void *); +extern void ggc_free (void *); +#define vec_gc_free(V) ggc_free (V) extern void *vec_heap_p_reserve (void *, int MEM_STAT_DECL); extern void *vec_heap_o_reserve (void *, int, size_t, size_t MEM_STAT_DECL); -extern void vec_heap_free (void *); +#define vec_heap_free(V) free (V) #if ENABLE_CHECKING #define VEC_CHECK_INFO ,__FILE__,__LINE__,__FUNCTION__ #define VEC_CHECK_DECL ,const char *file_,unsigned line_,const char *function_ #define VEC_CHECK_PASS ,file_,line_,function_ -#define VEC_ASSERT(EXPR,OP,TDEF) \ - (void)((EXPR) ? 0 : (VEC_ASSERT_FAIL(OP,VEC(TDEF)), 0)) +#define VEC_ASSERT(EXPR,OP,T,A) \ + (void)((EXPR) ? 0 : (VEC_ASSERT_FAIL(OP,VEC(T,A)), 0)) extern void vec_assert_fail (const char *, const char * VEC_CHECK_DECL) ATTRIBUTE_NORETURN; @@ -352,63 +384,74 @@ extern void vec_assert_fail (const char *, const char * VEC_CHECK_DECL) #define VEC_CHECK_INFO #define VEC_CHECK_DECL #define VEC_CHECK_PASS -#define VEC_ASSERT(EXPR,OP,TYPE) (void)(EXPR) +#define VEC_ASSERT(EXPR,OP,T,A) (void)(EXPR) #endif -#define VEC(TDEF) VEC_##TDEF -#define VEC_OP(TDEF,OP) VEC_OP_(VEC(TDEF),OP) -#define VEC_OP_(VEC,OP) VEC_OP__(VEC,OP) -#define VEC_OP__(VEC,OP) VEC ## _ ## OP +#define VEC(T,A) VEC_##T##_##A +#define VEC_OP(T,A,OP) VEC_##T##_##A##_##OP #else /* IN_GENGTYPE */ -#define VEC(TDEF) VEC_ TDEF +#define VEC(T,A) VEC_ T _ A #define VEC_STRINGIFY(X) VEC_STRINGIFY_(X) #define VEC_STRINGIFY_(X) #X #undef GTY #endif /* IN_GENGTYPE */ -#define VEC_TDEF(TDEF) \ -typedef struct VEC (TDEF) GTY(()) \ +/* Base of vector type, not user visible. */ +#define VEC_T(T,B) \ +typedef struct VEC(T,B) GTY(()) \ { \ unsigned num; \ unsigned alloc; \ - TDEF GTY ((length ("%h.num"))) vec[1]; \ -} VEC (TDEF) + T GTY ((length ("%h.num"))) vec[1]; \ +} VEC(T,B) + +/* Derived vector type, user visible. */ +#define VEC_TA(T,B,A,GTY) \ +typedef struct VEC(T,A) GTY \ +{ \ + VEC(T,B) base; \ +} VEC(T,A) + +/* Convert to base type. */ +#define VEC_BASE(P) ((P) ? &(P)->base : 0) /* Vector of pointer to object. */ #if IN_GENGTYPE -{"DEF_VEC_GC_P", VEC_STRINGIFY (VEC_TDEF (#)) ";", NULL}, -{"DEF_VEC_MALLOC_P", "", NULL}, +{"DEF_VEC_P", VEC_STRINGIFY (VEC_T(#0,#1)) ";", "none"}, +{"DEF_VEC_ALLOC_P", VEC_STRINGIFY (VEC_TA (#0,#1,#2,#3)) ";", NULL}, #else -#define DEF_VEC_GC_P(TDEF) DEF_VEC_P(TDEF,gc) -#define DEF_VEC_MALLOC_P(TDEF) DEF_VEC_P(TDEF,heap) -#define DEF_VEC_P(TDEF,a) \ -VEC_TDEF (TDEF); \ +#define DEF_VEC_P(T) \ +VEC_T(T,base); \ \ -static inline unsigned VEC_OP (TDEF,length) \ - (const VEC (TDEF) *vec_) \ +static inline void VEC_OP (T,must,be_a_pointer_or_integer) (void) \ +{ \ + (void)((T)0 == (void *)0); \ +} \ + \ +static inline unsigned VEC_OP (T,base,length) (const VEC(T,base) *vec_) \ { \ return vec_ ? vec_->num : 0; \ } \ \ -static inline TDEF VEC_OP (TDEF,last) \ - (const VEC (TDEF) *vec_ VEC_CHECK_DECL) \ +static inline T VEC_OP (T,base,last) \ + (const VEC(T,base) *vec_ VEC_CHECK_DECL) \ { \ - VEC_ASSERT (vec_ && vec_->num, "last", TDEF); \ + VEC_ASSERT (vec_ && vec_->num, "last", T, base); \ \ return vec_->vec[vec_->num - 1]; \ } \ \ -static inline TDEF VEC_OP (TDEF,index) \ - (const VEC (TDEF) *vec_, unsigned ix_ VEC_CHECK_DECL) \ +static inline T VEC_OP (T,base,index) \ + (const VEC(T,base) *vec_, unsigned ix_ VEC_CHECK_DECL) \ { \ - VEC_ASSERT (vec_ && ix_ < vec_->num, "index", TDEF); \ + VEC_ASSERT (vec_ && ix_ < vec_->num, "index", T, base); \ \ return vec_->vec[ix_]; \ } \ \ -static inline int VEC_OP (TDEF,iterate) \ - (const VEC (TDEF) *vec_, unsigned ix_, TDEF *ptr) \ +static inline int VEC_OP (T,base,iterate) \ + (const VEC(T,base) *vec_, unsigned ix_, T *ptr) \ { \ if (vec_ && ix_ < vec_->num) \ { \ @@ -422,170 +465,103 @@ static inline int VEC_OP (TDEF,iterate) \ } \ } \ \ -static inline VEC (TDEF) *VEC_OP (TDEF,alloc) \ - (int alloc_ MEM_STAT_DECL) \ -{ \ - return (VEC (TDEF) *) vec_##a##_p_reserve (NULL, alloc_ - !alloc_ PASS_MEM_STAT);\ -} \ - \ -static inline void VEC_OP (TDEF,free) \ - (VEC (TDEF) **vec_) \ -{ \ - vec_##a##_free (*vec_); \ - *vec_ = NULL; \ -} \ - \ -static inline size_t VEC_OP (TDEF,embedded_size) \ +static inline size_t VEC_OP (T,base,embedded_size) \ (int alloc_) \ { \ - return offsetof (VEC(TDEF),vec) + alloc_ * sizeof(TDEF); \ + return offsetof (VEC(T,base),vec) + alloc_ * sizeof(T); \ } \ \ -static inline void VEC_OP (TDEF,embedded_init) \ - (VEC (TDEF) *vec_, int alloc_) \ +static inline void VEC_OP (T,base,embedded_init) \ + (VEC(T,base) *vec_, int alloc_) \ { \ vec_->num = 0; \ vec_->alloc = alloc_; \ } \ \ -static inline int VEC_OP (TDEF,space) \ - (VEC (TDEF) *vec_, int alloc_) \ +static inline int VEC_OP (T,base,space) \ + (VEC(T,base) *vec_, int alloc_ VEC_CHECK_DECL) \ { \ - return vec_ ? ((vec_)->alloc - (vec_)->num \ - >= (unsigned)(alloc_ < 0 ? 1 : alloc_)) : !alloc_; \ -} \ - \ -static inline int VEC_OP (TDEF,reserve) \ - (VEC (TDEF) **vec_, int alloc_ MEM_STAT_DECL) \ -{ \ - int extend = !VEC_OP (TDEF,space) (*vec_, alloc_); \ - \ - if (extend) \ - *vec_ = (VEC (TDEF) *) vec_##a##_p_reserve (*vec_, alloc_ PASS_MEM_STAT); \ - \ - return extend; \ + VEC_ASSERT (alloc_ >= 0, "space", T, base); \ + return vec_ ? vec_->alloc - vec_->num >= (unsigned)alloc_ : !alloc_; \ } \ \ -static inline TDEF *VEC_OP (TDEF,quick_push) \ - (VEC (TDEF) *vec_, TDEF obj_ VEC_CHECK_DECL) \ +static inline T *VEC_OP (T,base,quick_push) \ + (VEC(T,base) *vec_, T obj_ VEC_CHECK_DECL) \ { \ - TDEF *slot_; \ + T *slot_; \ \ - VEC_ASSERT (vec_->num < vec_->alloc, "push", TDEF); \ + VEC_ASSERT (vec_->num < vec_->alloc, "push", T, base); \ slot_ = &vec_->vec[vec_->num++]; \ *slot_ = obj_; \ \ return slot_; \ } \ \ -static inline TDEF *VEC_OP (TDEF,safe_push) \ - (VEC (TDEF) **vec_, TDEF obj_ VEC_CHECK_DECL MEM_STAT_DECL) \ +static inline T VEC_OP (T,base,pop) (VEC(T,base) *vec_ VEC_CHECK_DECL) \ { \ - VEC_OP (TDEF,reserve) (vec_, -1 PASS_MEM_STAT); \ - \ - return VEC_OP (TDEF,quick_push) (*vec_, obj_ VEC_CHECK_PASS); \ -} \ + T obj_; \ \ -static inline TDEF VEC_OP (TDEF,pop) \ - (VEC (TDEF) *vec_ VEC_CHECK_DECL) \ -{ \ - TDEF obj_; \ - \ - VEC_ASSERT (vec_->num, "pop", TDEF); \ + VEC_ASSERT (vec_->num, "pop", T, base); \ obj_ = vec_->vec[--vec_->num]; \ \ return obj_; \ } \ \ -static inline void VEC_OP (TDEF,truncate) \ - (VEC (TDEF) *vec_, unsigned size_ VEC_CHECK_DECL) \ +static inline void VEC_OP (T,base,truncate) \ + (VEC(T,base) *vec_, unsigned size_ VEC_CHECK_DECL) \ { \ - VEC_ASSERT (vec_ ? vec_->num >= size_ : !size_, "truncate", TDEF); \ + VEC_ASSERT (vec_ ? vec_->num >= size_ : !size_, "truncate", T, base); \ if (vec_) \ vec_->num = size_; \ } \ \ -static inline TDEF VEC_OP (TDEF,replace) \ - (VEC (TDEF) *vec_, unsigned ix_, TDEF obj_ VEC_CHECK_DECL) \ +static inline T VEC_OP (T,base,replace) \ + (VEC(T,base) *vec_, unsigned ix_, T obj_ VEC_CHECK_DECL) \ { \ - TDEF old_obj_; \ + T old_obj_; \ \ - VEC_ASSERT (ix_ < vec_->num, "replace", TDEF); \ + VEC_ASSERT (ix_ < vec_->num, "replace", T, base); \ old_obj_ = vec_->vec[ix_]; \ vec_->vec[ix_] = obj_; \ \ return old_obj_; \ } \ \ -static inline unsigned VEC_OP (TDEF,lower_bound) \ - (VEC (TDEF) *vec_, const TDEF obj_, bool (*lessthan_)(const TDEF, const TDEF) VEC_CHECK_DECL) \ -{ \ - unsigned int len_ = VEC_OP (TDEF, length) (vec_); \ - unsigned int half_, middle_; \ - unsigned int first_ = 0; \ - while (len_ > 0) \ - { \ - TDEF middle_elem_; \ - half_ = len_ >> 1; \ - middle_ = first_; \ - middle_ += half_; \ - middle_elem_ = VEC_OP (TDEF, index) (vec_, middle_ VEC_CHECK_PASS); \ - if (lessthan_ (middle_elem_, obj_)) \ - { \ - first_ = middle_; \ - ++first_; \ - len_ = len_ - half_ - 1; \ - } \ - else \ - len_ = half_; \ - } \ - return first_; \ -} \ - \ -static inline TDEF *VEC_OP (TDEF,quick_insert) \ - (VEC (TDEF) *vec_, unsigned ix_, TDEF obj_ VEC_CHECK_DECL) \ -{ \ - TDEF *slot_; \ - \ - VEC_ASSERT (vec_->num < vec_->alloc, "insert", TDEF); \ - VEC_ASSERT (ix_ <= vec_->num, "insert", TDEF); \ +static inline T *VEC_OP (T,base,quick_insert) \ + (VEC(T,base) *vec_, unsigned ix_, T obj_ VEC_CHECK_DECL) \ +{ \ + T *slot_; \ + \ + VEC_ASSERT (vec_->num < vec_->alloc, "insert", T, base); \ + VEC_ASSERT (ix_ <= vec_->num, "insert", T, base); \ slot_ = &vec_->vec[ix_]; \ - memmove (slot_ + 1, slot_, (vec_->num++ - ix_) * sizeof (TDEF)); \ + memmove (slot_ + 1, slot_, (vec_->num++ - ix_) * sizeof (T)); \ *slot_ = obj_; \ \ return slot_; \ } \ \ -static inline TDEF *VEC_OP (TDEF,safe_insert) \ - (VEC (TDEF) **vec_, unsigned ix_, TDEF obj_ \ - VEC_CHECK_DECL MEM_STAT_DECL) \ +static inline T VEC_OP (T,base,ordered_remove) \ + (VEC(T,base) *vec_, unsigned ix_ VEC_CHECK_DECL) \ { \ - VEC_OP (TDEF,reserve) (vec_, -1 PASS_MEM_STAT); \ - \ - return VEC_OP (TDEF,quick_insert) (*vec_, ix_, obj_ VEC_CHECK_PASS); \ -} \ + T *slot_; \ + T obj_; \ \ -static inline TDEF VEC_OP (TDEF,ordered_remove) \ - (VEC (TDEF) *vec_, unsigned ix_ VEC_CHECK_DECL) \ -{ \ - TDEF *slot_; \ - TDEF obj_; \ - \ - VEC_ASSERT (ix_ < vec_->num, "remove", TDEF); \ + VEC_ASSERT (ix_ < vec_->num, "remove", T, base); \ slot_ = &vec_->vec[ix_]; \ obj_ = *slot_; \ - memmove (slot_, slot_ + 1, (--vec_->num - ix_) * sizeof (TDEF)); \ + memmove (slot_, slot_ + 1, (--vec_->num - ix_) * sizeof (T)); \ \ return obj_; \ } \ \ -static inline TDEF VEC_OP (TDEF,unordered_remove) \ - (VEC (TDEF) *vec_, unsigned ix_ VEC_CHECK_DECL) \ +static inline T VEC_OP (T,base,unordered_remove) \ + (VEC(T,base) *vec_, unsigned ix_ VEC_CHECK_DECL) \ { \ - TDEF *slot_; \ - TDEF obj_; \ + T *slot_; \ + T obj_; \ \ - VEC_ASSERT (ix_ < vec_->num, "remove", TDEF); \ + VEC_ASSERT (ix_ < vec_->num, "remove", T, base); \ slot_ = &vec_->vec[ix_]; \ obj_ = *slot_; \ *slot_ = vec_->vec[--vec_->num]; \ @@ -593,51 +569,133 @@ static inline TDEF VEC_OP (TDEF,unordered_remove) \ return obj_; \ } \ \ -static inline TDEF *VEC_OP (TDEF,address) \ - (VEC (TDEF) *vec_) \ +static inline T *VEC_OP (T,base,address) \ + (VEC(T,base) *vec_) \ { \ return vec_ ? vec_->vec : 0; \ } \ \ +static inline unsigned VEC_OP (T,base,lower_bound) \ + (VEC(T,base) *vec_, const T obj_, \ + bool (*lessthan_)(const T, const T) VEC_CHECK_DECL) \ +{ \ + unsigned int len_ = VEC_OP (T,base, length) (vec_); \ + unsigned int half_, middle_; \ + unsigned int first_ = 0; \ + while (len_ > 0) \ + { \ + T middle_elem_; \ + half_ = len_ >> 1; \ + middle_ = first_; \ + middle_ += half_; \ + middle_elem_ = VEC_OP (T,base,index) (vec_, middle_ VEC_CHECK_PASS); \ + if (lessthan_ (middle_elem_, obj_)) \ + { \ + first_ = middle_; \ + ++first_; \ + len_ = len_ - half_ - 1; \ + } \ + else \ + len_ = half_; \ + } \ + return first_; \ +} \ + \ +VEC_TA(T,base,none,) + +#define DEF_VEC_ALLOC_P(T,A) \ +VEC_TA(T,base,A,); \ + \ +static inline VEC(T,A) *VEC_OP (T,A,alloc) \ + (int alloc_ MEM_STAT_DECL) \ +{ \ + /* We must request exact size allocation, hence the negation. */ \ + return (VEC(T,A) *) vec_##A##_p_reserve (NULL, -alloc_ PASS_MEM_STAT); \ +} \ + \ +static inline void VEC_OP (T,A,free) \ + (VEC(T,A) **vec_) \ +{ \ + if (*vec_) \ + vec_##A##_free (*vec_); \ + *vec_ = NULL; \ +} \ + \ +static inline int VEC_OP (T,A,reserve) \ + (VEC(T,A) **vec_, int alloc_ VEC_CHECK_DECL MEM_STAT_DECL) \ +{ \ + int extend = !VEC_OP (T,base,space) (VEC_BASE(*vec_), \ + alloc_ < 0 ? -alloc_ : alloc_ \ + VEC_CHECK_PASS); \ + \ + if (extend) \ + *vec_ = (VEC(T,A) *) vec_##A##_p_reserve (*vec_, alloc_ PASS_MEM_STAT); \ + \ + return extend; \ +} \ + \ +static inline void VEC_OP (T,A,safe_grow) \ + (VEC(T,A) **vec_, int size_ VEC_CHECK_DECL MEM_STAT_DECL) \ +{ \ + VEC_ASSERT (size_ >= 0 \ + && VEC_OP(T,base,length) VEC_BASE(*vec_) <= (unsigned)size_, \ + "grow", T, A); \ + VEC_OP (T,A,reserve) (vec_, (int)(*vec_ ? VEC_BASE(*vec_)->num : 0) - size_ \ + VEC_CHECK_PASS PASS_MEM_STAT); \ + VEC_BASE (*vec_)->num = size_; \ +} \ + \ +static inline T *VEC_OP (T,A,safe_push) \ + (VEC(T,A) **vec_, T obj_ VEC_CHECK_DECL MEM_STAT_DECL) \ +{ \ + VEC_OP (T,A,reserve) (vec_, 1 VEC_CHECK_PASS PASS_MEM_STAT); \ + \ + return VEC_OP (T,base,quick_push) (VEC_BASE(*vec_), obj_ VEC_CHECK_PASS); \ +} \ + \ +static inline T *VEC_OP (T,A,safe_insert) \ + (VEC(T,A) **vec_, unsigned ix_, T obj_ VEC_CHECK_DECL MEM_STAT_DECL) \ +{ \ + VEC_OP (T,A,reserve) (vec_, 1 VEC_CHECK_PASS PASS_MEM_STAT); \ + \ + return VEC_OP (T,base,quick_insert) (VEC_BASE(*vec_), ix_, obj_ \ + VEC_CHECK_PASS); \ +} \ + \ struct vec_swallow_trailing_semi #endif /* Vector of object. */ #if IN_GENGTYPE -{"DEF_VEC_GC_O", VEC_STRINGIFY (VEC_TDEF (#)) ";", NULL}, -{"DEF_VEC_MALLOC_O", "", NULL}, +{"DEF_VEC_O", VEC_STRINGIFY (VEC_T(#0,#1)) ";", "none"}, +{"DEF_VEC_ALLOC_O", VEC_STRINGIFY (VEC_TA(#0,#1,#2,#3)) ";", NULL}, #else -#define DEF_VEC_GC_O(TDEF) DEF_VEC_O(TDEF,gc) -#define DEF_VEC_MALLOC_O(TDEF) DEF_VEC_O(TDEF,heap) - -#define DEF_VEC_O(TDEF,a) \ -VEC_TDEF (TDEF); \ +#define DEF_VEC_O(T) \ +VEC_T(T,base); \ \ -static inline unsigned VEC_OP (TDEF,length) \ - (const VEC (TDEF) *vec_) \ +static inline unsigned VEC_OP (T,base,length) (const VEC(T,base) *vec_) \ { \ return vec_ ? vec_->num : 0; \ } \ \ -static inline TDEF *VEC_OP (TDEF,last) \ - (VEC (TDEF) *vec_ VEC_CHECK_DECL) \ +static inline T *VEC_OP (T,base,last) (VEC(T,base) *vec_ VEC_CHECK_DECL) \ { \ - VEC_ASSERT (vec_ && vec_->num, "last", TDEF); \ + VEC_ASSERT (vec_ && vec_->num, "last", T, base); \ \ return &vec_->vec[vec_->num - 1]; \ } \ \ -static inline TDEF *VEC_OP (TDEF,index) \ - (VEC (TDEF) *vec_, unsigned ix_ VEC_CHECK_DECL) \ +static inline T *VEC_OP (T,base,index) \ + (VEC(T,base) *vec_, unsigned ix_ VEC_CHECK_DECL) \ { \ - VEC_ASSERT (vec_ && ix_ < vec_->num, "index", TDEF); \ + VEC_ASSERT (vec_ && ix_ < vec_->num, "index", T, base); \ \ return &vec_->vec[ix_]; \ } \ \ -static inline int VEC_OP (TDEF,iterate) \ - (VEC (TDEF) *vec_, unsigned ix_, TDEF **ptr) \ +static inline int VEC_OP (T,base,iterate) \ + (VEC(T,base) *vec_, unsigned ix_, T **ptr) \ { \ if (vec_ && ix_ < vec_->num) \ { \ @@ -651,60 +709,32 @@ static inline int VEC_OP (TDEF,iterate) \ } \ } \ \ -static inline VEC (TDEF) *VEC_OP (TDEF,alloc) \ - (int alloc_ MEM_STAT_DECL) \ -{ \ - return (VEC (TDEF) *) vec_##a##_o_reserve (NULL, alloc_ - !alloc_, \ - offsetof (VEC(TDEF),vec), sizeof (TDEF)\ - PASS_MEM_STAT); \ -} \ - \ -static inline void VEC_OP (TDEF,free) \ - (VEC (TDEF) **vec_) \ -{ \ - vec_##a##_free (*vec_); \ - *vec_ = NULL; \ -} \ - \ -static inline size_t VEC_OP (TDEF,embedded_size) \ +static inline size_t VEC_OP (T,base,embedded_size) \ (int alloc_) \ { \ - return offsetof (VEC(TDEF),vec) + alloc_ * sizeof(TDEF); \ + return offsetof (VEC(T,base),vec) + alloc_ * sizeof(T); \ } \ \ -static inline void VEC_OP (TDEF,embedded_init) \ - (VEC (TDEF) *vec_, int alloc_) \ +static inline void VEC_OP (T,base,embedded_init) \ + (VEC(T,base) *vec_, int alloc_) \ { \ vec_->num = 0; \ vec_->alloc = alloc_; \ } \ \ -static inline int VEC_OP (TDEF,space) \ - (VEC (TDEF) *vec_, int alloc_) \ +static inline int VEC_OP (T,base,space) \ + (VEC(T,base) *vec_, int alloc_ VEC_CHECK_DECL) \ { \ - return vec_ ? ((vec_)->alloc - (vec_)->num \ - >= (unsigned)(alloc_ < 0 ? 1 : alloc_)) : !alloc_; \ + VEC_ASSERT (alloc_ >= 0, "space", T, base); \ + return vec_ ? vec_->alloc - vec_->num >= (unsigned)alloc_ : !alloc_; \ } \ \ -static inline int VEC_OP (TDEF,reserve) \ - (VEC (TDEF) **vec_, int alloc_ MEM_STAT_DECL) \ +static inline T *VEC_OP (T,base,quick_push) \ + (VEC(T,base) *vec_, const T *obj_ VEC_CHECK_DECL) \ { \ - int extend = !VEC_OP (TDEF,space) (*vec_, alloc_); \ - \ - if (extend) \ - *vec_ = (VEC (TDEF) *) vec_##a##_o_reserve (*vec_, alloc_, \ - offsetof (VEC(TDEF),vec), sizeof (TDEF) \ - PASS_MEM_STAT); \ - \ - return extend; \ -} \ - \ -static inline TDEF *VEC_OP (TDEF,quick_push) \ - (VEC (TDEF) *vec_, const TDEF *obj_ VEC_CHECK_DECL) \ -{ \ - TDEF *slot_; \ + T *slot_; \ \ - VEC_ASSERT (vec_->num < vec_->alloc, "push", TDEF); \ + VEC_ASSERT (vec_->num < vec_->alloc, "push", T, base); \ slot_ = &vec_->vec[vec_->num++]; \ if (obj_) \ *slot_ = *obj_; \ @@ -712,35 +742,26 @@ static inline TDEF *VEC_OP (TDEF,quick_push) \ return slot_; \ } \ \ -static inline TDEF *VEC_OP (TDEF,safe_push) \ - (VEC (TDEF) **vec_, const TDEF *obj_ VEC_CHECK_DECL MEM_STAT_DECL) \ -{ \ - VEC_OP (TDEF,reserve) (vec_, -1 PASS_MEM_STAT); \ - \ - return VEC_OP (TDEF,quick_push) (*vec_, obj_ VEC_CHECK_PASS); \ -} \ - \ -static inline void VEC_OP (TDEF,pop) \ - (VEC (TDEF) *vec_ VEC_CHECK_DECL) \ +static inline void VEC_OP (T,base,pop) (VEC(T,base) *vec_ VEC_CHECK_DECL) \ { \ - VEC_ASSERT (vec_->num, "pop", TDEF); \ + VEC_ASSERT (vec_->num, "pop", T, base); \ --vec_->num; \ } \ \ -static inline void VEC_OP (TDEF,truncate) \ - (VEC (TDEF) *vec_, unsigned size_ VEC_CHECK_DECL) \ +static inline void VEC_OP (T,base,truncate) \ + (VEC(T,base) *vec_, unsigned size_ VEC_CHECK_DECL) \ { \ - VEC_ASSERT (vec_ ? vec_->num >= size_ : !size_, "truncate", TDEF); \ + VEC_ASSERT (vec_ ? vec_->num >= size_ : !size_, "truncate", T, base); \ if (vec_) \ vec_->num = size_; \ } \ \ -static inline TDEF *VEC_OP (TDEF,replace) \ - (VEC (TDEF) *vec_, unsigned ix_, const TDEF *obj_ VEC_CHECK_DECL) \ +static inline T *VEC_OP (T,base,replace) \ + (VEC(T,base) *vec_, unsigned ix_, const T *obj_ VEC_CHECK_DECL) \ { \ - TDEF *slot_; \ + T *slot_; \ \ - VEC_ASSERT (ix_ < vec_->num, "replace", TDEF); \ + VEC_ASSERT (ix_ < vec_->num, "replace", T, base); \ slot_ = &vec_->vec[ix_]; \ if (obj_) \ *slot_ = *obj_; \ @@ -748,76 +769,137 @@ static inline TDEF *VEC_OP (TDEF,replace) \ return slot_; \ } \ \ -static inline unsigned VEC_OP (TDEF,lower_bound) \ - (VEC (TDEF) *vec_, const TDEF *obj_, bool (*lessthan_)(const TDEF *, const TDEF *) VEC_CHECK_DECL) \ -{ \ - unsigned int len_ = VEC_OP (TDEF, length) (vec_); \ - unsigned int half_, middle_; \ - unsigned int first_ = 0; \ - while (len_ > 0) \ - { \ - TDEF *middle_elem_; \ - half_ = len_ >> 1; \ - middle_ = first_; \ - middle_ += half_; \ - middle_elem_ = VEC_OP (TDEF, index) (vec_, middle_ VEC_CHECK_PASS); \ - if (lessthan_ (middle_elem_, obj_)) \ - { \ - first_ = middle_; \ - ++first_; \ - len_ = len_ - half_ - 1; \ - } \ - else \ - len_ = half_; \ - } \ - return first_; \ -} \ - \ -static inline TDEF *VEC_OP (TDEF,quick_insert) \ - (VEC (TDEF) *vec_, unsigned ix_, const TDEF *obj_ VEC_CHECK_DECL) \ -{ \ - TDEF *slot_; \ - \ - VEC_ASSERT (vec_->num < vec_->alloc, "insert", TDEF); \ - VEC_ASSERT (ix_ <= vec_->num, "insert", TDEF); \ +static inline T *VEC_OP (T,base,quick_insert) \ + (VEC(T,base) *vec_, unsigned ix_, const T *obj_ VEC_CHECK_DECL) \ +{ \ + T *slot_; \ + \ + VEC_ASSERT (vec_->num < vec_->alloc, "insert", T, base); \ + VEC_ASSERT (ix_ <= vec_->num, "insert", T, base); \ slot_ = &vec_->vec[ix_]; \ - memmove (slot_ + 1, slot_, (vec_->num++ - ix_) * sizeof (TDEF)); \ + memmove (slot_ + 1, slot_, (vec_->num++ - ix_) * sizeof (T)); \ if (obj_) \ *slot_ = *obj_; \ \ return slot_; \ } \ \ -static inline TDEF *VEC_OP (TDEF,safe_insert) \ - (VEC (TDEF) **vec_, unsigned ix_, const TDEF *obj_ \ - VEC_CHECK_DECL MEM_STAT_DECL) \ +static inline void VEC_OP (T,base,ordered_remove) \ + (VEC(T,base) *vec_, unsigned ix_ VEC_CHECK_DECL) \ { \ - VEC_OP (TDEF,reserve) (vec_, -1 PASS_MEM_STAT); \ + T *slot_; \ \ - return VEC_OP (TDEF,quick_insert) (*vec_, ix_, obj_ VEC_CHECK_PASS); \ + VEC_ASSERT (ix_ < vec_->num, "remove", T, base); \ + slot_ = &vec_->vec[ix_]; \ + memmove (slot_, slot_ + 1, (--vec_->num - ix_) * sizeof (T)); \ } \ \ -static inline void VEC_OP (TDEF,ordered_remove) \ - (VEC (TDEF) *vec_, unsigned ix_ VEC_CHECK_DECL) \ +static inline void VEC_OP (T,base,unordered_remove) \ + (VEC(T,base) *vec_, unsigned ix_ VEC_CHECK_DECL) \ { \ - TDEF *slot_; \ + VEC_ASSERT (ix_ < vec_->num, "remove", T, base); \ + vec_->vec[ix_] = vec_->vec[--vec_->num]; \ +} \ \ - VEC_ASSERT (ix_ < vec_->num, "remove", TDEF); \ - slot_ = &vec_->vec[ix_]; \ - memmove (slot_, slot_ + 1, (--vec_->num - ix_) * sizeof (TDEF)); \ +static inline T *VEC_OP (T,base,address) \ + (VEC(T,base) *vec_) \ +{ \ + return vec_ ? vec_->vec : 0; \ } \ \ -static inline void VEC_OP (TDEF,unordered_remove) \ - (VEC (TDEF) *vec_, unsigned ix_ VEC_CHECK_DECL) \ +static inline unsigned VEC_OP (T,base,lower_bound) \ + (VEC(T,base) *vec_, const T *obj_, \ + bool (*lessthan_)(const T *, const T *) VEC_CHECK_DECL) \ +{ \ + unsigned int len_ = VEC_OP (T, base, length) (vec_); \ + unsigned int half_, middle_; \ + unsigned int first_ = 0; \ + while (len_ > 0) \ + { \ + T *middle_elem_; \ + half_ = len_ >> 1; \ + middle_ = first_; \ + middle_ += half_; \ + middle_elem_ = VEC_OP (T,base,index) (vec_, middle_ VEC_CHECK_PASS); \ + if (lessthan_ (middle_elem_, obj_)) \ + { \ + first_ = middle_; \ + ++first_; \ + len_ = len_ - half_ - 1; \ + } \ + else \ + len_ = half_; \ + } \ + return first_; \ +} \ + \ +VEC_TA(T,base,none,) + +#define DEF_VEC_ALLOC_O(T,A) \ +VEC_TA(T,base,A,); \ + \ +static inline VEC(T,A) *VEC_OP (T,A,alloc) \ + (int alloc_ MEM_STAT_DECL) \ { \ - VEC_ASSERT (ix_ < vec_->num, "remove", TDEF); \ - vec_->vec[ix_] = vec_->vec[--vec_->num]; \ + /* We must request exact size allocation, hence the negation. */ \ + return (VEC(T,A) *) vec_##A##_o_reserve (NULL, -alloc_, \ + offsetof (VEC(T,A),base.vec), \ + sizeof (T) \ + PASS_MEM_STAT); \ } \ \ -static inline TDEF *VEC_OP (TDEF,address) \ - (VEC (TDEF) *vec_) \ +static inline void VEC_OP (T,A,free) \ + (VEC(T,A) **vec_) \ { \ - return vec_ ? vec_->vec : 0; \ + if (*vec_) \ + vec_##A##_free (*vec_); \ + *vec_ = NULL; \ +} \ + \ +static inline int VEC_OP (T,A,reserve) \ + (VEC(T,A) **vec_, int alloc_ VEC_CHECK_DECL MEM_STAT_DECL) \ +{ \ + int extend = !VEC_OP (T,base,space) (VEC_BASE(*vec_), \ + alloc_ < 0 ? -alloc_ : alloc_ \ + VEC_CHECK_PASS); \ + \ + if (extend) \ + *vec_ = (VEC(T,A) *) vec_##A##_o_reserve (*vec_, alloc_, \ + offsetof (VEC(T,A),base.vec),\ + sizeof (T) \ + PASS_MEM_STAT); \ + \ + return extend; \ +} \ + \ +static inline void VEC_OP (T,A,safe_grow) \ + (VEC(T,A) **vec_, int size_ VEC_CHECK_DECL MEM_STAT_DECL) \ +{ \ + VEC_ASSERT (size_ >= 0 \ + && VEC_OP(T,base,length) VEC_BASE(*vec_) <= (unsigned)size_, \ + "grow", T, A); \ + VEC_OP (T,A,reserve) (vec_, (int)(*vec_ ? VEC_BASE(*vec_)->num : 0) - size_ \ + VEC_CHECK_PASS PASS_MEM_STAT); \ + VEC_BASE (*vec_)->num = size_; \ + VEC_BASE (*vec_)->num = size_; \ +} \ + \ +static inline T *VEC_OP (T,A,safe_push) \ + (VEC(T,A) **vec_, const T *obj_ VEC_CHECK_DECL MEM_STAT_DECL) \ +{ \ + VEC_OP (T,A,reserve) (vec_, 1 VEC_CHECK_PASS PASS_MEM_STAT); \ + \ + return VEC_OP (T,base,quick_push) (VEC_BASE(*vec_), obj_ VEC_CHECK_PASS); \ +} \ + \ +static inline T *VEC_OP (T,A,safe_insert) \ + (VEC(T,A) **vec_, unsigned ix_, const T *obj_ \ + VEC_CHECK_DECL MEM_STAT_DECL) \ +{ \ + VEC_OP (T,A,reserve) (vec_, 1 VEC_CHECK_PASS PASS_MEM_STAT); \ + \ + return VEC_OP (T,base,quick_insert) (VEC_BASE(*vec_), ix_, obj_ \ + VEC_CHECK_PASS); \ } \ \ struct vec_swallow_trailing_semi |