X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=include%2Flibfirm%2Fadt%2Farray.h;h=642fc6c6287cb532a22db1d90267b1943f46299a;hb=0df5e0ea5d4d6a566339ac4b93a73719858e81e1;hp=5df5fb1ecf3dc35efc3a1b4fc21539b25b00d0e4;hpb=c021732d2f0c04113e6afd153a7a9be38e40ca6f;p=libfirm
diff --git a/include/libfirm/adt/array.h b/include/libfirm/adt/array.h
index 5df5fb1ec..642fc6c62 100644
--- a/include/libfirm/adt/array.h
+++ b/include/libfirm/adt/array.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved.
+ * Copyright (C) 1995-2011 University of Karlsruhe. All right reserved.
*
* This file is part of libFirm.
*
@@ -47,7 +47,7 @@
* @return A pointer to the flexible array (can be used as a pointer to the
* first element of this array).
*/
-#define NEW_ARR_F(type, nelts) \
+#define NEW_ARR_F(type, nelts) \
((type *)ir_new_arr_f((nelts), sizeof(type) * (nelts)))
/**
@@ -63,7 +63,7 @@
* @return A pointer to the flexible array (can be used as a pointer to the
* first element of this array).
*/
-#define CLONE_ARR_F(type, arr) \
+#define CLONE_ARR_F(type, arr) \
NEW_ARR_F(type, ARR_LEN((arr)))
/**
@@ -78,8 +78,8 @@
* @return A pointer to the flexible array (can be used as a pointer to the
* first element of this array).
*/
-#define DUP_ARR_F(type, arr) \
- memcpy(CLONE_ARR_F(type, (arr)), (arr), sizeof(type) * ARR_LEN((arr)))
+#define DUP_ARR_F(type, arr) \
+ ((type*) memcpy(CLONE_ARR_F(type, (arr)), (arr), sizeof(type) * ARR_LEN((arr))))
/**
* Delete a flexible array.
@@ -101,10 +101,10 @@
* @return A pointer to the dynamic array (can be used as a pointer to the
* first element of this array).
*/
-#define NEW_ARR_D(type, obstack, nelts) \
- ( nelts \
- ? (type *)ir_new_arr_d((obstack), (nelts), sizeof(type) * (nelts)) \
- : (type *)arr_mt_descr.v.elts)
+#define NEW_ARR_D(type, obstack, nelts) \
+ ( nelts \
+ ? (type *)ir_new_arr_d((obstack), (nelts), sizeof(type) * (nelts)) \
+ : (type *)arr_mt_descr.elts)
/**
* Creates a new dynamic array with the same number of elements as a
@@ -120,7 +120,7 @@
* @return A pointer to the dynamic array (can be used as a pointer to the
* first element of this array).
*/
-#define CLONE_ARR_D(type, obstack, arr) \
+#define CLONE_ARR_D(type, obstack, arr) \
NEW_ARR_D(type, (obstack), ARR_LEN((arr)))
/**
@@ -136,8 +136,8 @@
* @return A pointer to the dynamic array (can be used as a pointer to the
* first element of this array).
*/
-#define DUP_ARR_D(type, obstack, arr) \
- memcpy(CLONE_ARR_D(type, (obstack), (arr)), (arr), sizeof(type) * ARR_LEN ((arr)))
+#define DUP_ARR_D(type, obstack, arr) \
+ ((type*)memcpy(CLONE_ARR_D(type, (obstack), (arr)), (arr), sizeof(type) * ARR_LEN ((arr))))
/**
* Returns the length of an array
@@ -156,8 +156,8 @@
*
* @remark This macro may change arr, so update all references!
*/
-#define ARR_RESIZE(type, arr, n) \
- ((arr) = ir_arr_resize((void *)(arr), (n), sizeof(type)))
+#define ARR_RESIZE(type, arr, n) \
+ ((arr) = (type*) ir_arr_resize((void *)(arr), (n), sizeof(type)))
/**
* Resize a flexible array, always reallocate data.
@@ -168,14 +168,8 @@
*
* @remark This macro may change arr, so update all references!
*/
-#define ARR_SETLEN(type, arr, n) \
- ((arr) = ir_arr_setlen((void *)(arr), (n), sizeof(type) * (n)))
-
-/** Set a length smaller than the current length of the array. Do not
- * resize. len must be <= ARR_LEN(arr). */
-#define ARR_SHRINKLEN(arr,len) \
- (ARR_VRFY((arr)), assert(ARR_DESCR((arr))->nelts >= len), \
- ARR_DESCR((arr))->nelts = len)
+#define ARR_SETLEN(type, arr, n) \
+ ((arr) = (type*) ir_arr_setlen((void *)(arr), (n), sizeof(type) * (n)))
/**
* Resize a flexible array by growing it by delta elements.
@@ -186,7 +180,7 @@
*
* @remark This macro may change arr, so update all references!
*/
-#define ARR_EXTEND(type, arr, delta) \
+#define ARR_EXTEND(type, arr, delta) \
ARR_RESIZE(type, (arr), ARR_LEN((arr)) + (delta))
/**
@@ -199,7 +193,7 @@
*
* @remark This macro may change arr, so update all references!
*/
-#define ARR_EXTO(type, arr, n) \
+#define ARR_EXTO(type, arr, n) \
((n) >= ARR_LEN((arr)) ? ARR_RESIZE(type, (arr), (n)+1) : (arr))
/**
@@ -209,7 +203,7 @@
* @param arr The array, which must be an lvalue.
* @param elt The new element, must be of type (type).
*/
-#define ARR_APP1(type, arr, elt) \
+#define ARR_APP1(type, arr, elt) \
(ARR_EXTEND(type, (arr), 1), (arr)[ARR_LEN((arr))-1] = (elt))
#ifdef NDEBUG
@@ -217,7 +211,7 @@
# define ARR_IDX_VRFY(arr, idx) ((void)0)
#else
# define ARR_VRFY(arr) ir_verify_arr(arr)
-# define ARR_IDX_VRFY(arr, idx) \
+# define ARR_IDX_VRFY(arr, idx) \
assert((0 <= (idx)) && ((idx) < ARR_LEN((arr))))
#endif
@@ -228,146 +222,42 @@ typedef union {
long l;
} aligned_type;
-/**
- * Construct an array header.
- */
-#define ARR_STRUCT(type, rnelts) \
- struct { \
- int magic; \
- size_t eltsize; \
- union { \
- struct obstack *obstack; /* dynamic: allocated on this obstack */ \
- int allocated; /* flexible: #slots allocated */ \
- } u; \
- int nelts; \
- union { \
- type elts[(rnelts)]; \
- aligned_type align[1]; \
- } v; \
- }
/**
* The array descriptor header type.
*/
-typedef ARR_STRUCT(aligned_type, 1) ir_arr_descr;
+typedef struct {
+ int magic; /**< array magic. */
+ size_t eltsize; /**< size of array elements. */
+ union {
+ struct obstack *obstack; /**< for obstack array: the obstack. */
+ size_t allocated; /**< number of allocated elements. */
+ } u;
+ size_t nelts; /**< current length of the array. */
+ aligned_type elts[1]; /**< start of the array data. */
+} ir_arr_descr;
extern ir_arr_descr arr_mt_descr;
-void *ir_new_arr_f(int nelts, size_t elts_size);
-void ir_del_arr_f(void *elts);
-void *ir_new_arr_d(struct obstack *obstack, int nelts, size_t elts_size);
-void *ir_arr_resize(void *elts, int nelts, size_t elts_size);
-void *ir_arr_setlen(void *elts, int nelts, size_t elts_size);
-void ir_verify_arr(const void *elts);
+FIRM_API void *ir_new_arr_f(size_t nelts, size_t elts_size);
+FIRM_API void ir_del_arr_f(void *elts);
+FIRM_API void *ir_new_arr_d(struct obstack *obstack, size_t nelts, size_t elts_size);
+FIRM_API void *ir_arr_resize(void *elts, size_t nelts, size_t elts_size);
+FIRM_API void *ir_arr_setlen(void *elts, size_t nelts, size_t elts_size);
+FIRM_API void ir_verify_arr(const void *elts);
-#define ARR_ELTS_OFFS offsetof(ir_arr_descr, v.elts)
+#define ARR_ELTS_OFFS offsetof(ir_arr_descr, elts)
#define ARR_DESCR(elts) ((ir_arr_descr *)(void *)((char *)(elts) - ARR_ELTS_OFFS))
-/*
- ____ _ _ _
-/ ___| ___ _ __| |_ ___ __| | / \ _ __ _ __ __ _ _ _ ___
-\___ \ / _ \| '__| __/ _ \/ _` | / _ \ | '__| '__/ _` | | | / __|
- ___) | (_) | | | || __/ (_| | / ___ \| | | | | (_| | |_| \__ \
-|____/ \___/|_| \__\___|\__,_| /_/ \_\_| |_| \__,_|\__, |___/
- |___/
-*/
-
-typedef int (ir_arr_cmp_func_t)(const void *a, const void *b);
-
-/**
- * Do a binary search in an array.
- * @param arr The array.
- * @param elm_size The size of an array element.
- * @param cmp A comparison function for two array elements (see qsort(3) for example).
- * @param elm A pointer to the element we are looking for.
- * @return This is somewhat tricky. Let res be the return value.
- * If the return value is negative, then elm was not in the array
- * but -res - 1 gives the proper location where it should be inserted.
- * If res >= 0 then the element is in the array and res
- * represents its index.
- * That allows for testing membership and finding proper insertion indices.
- * @note The differences to bsearch(3) which does not give proper insert locations
- * in the case that the element is not conatined in the array.
- */
-static inline int ir_arr_bsearch(const void *arr, size_t elm_size, ir_arr_cmp_func_t *cmp, const void *elm)
+/** Set a length smaller than the current length of the array. Do not
+ * resize. len must be <= ARR_LEN(arr). */
+static inline void ARR_SHRINKLEN(void *arr, size_t new_len)
{
- int hi = ARR_LEN(arr);
- int lo = 0;
-
- while(lo < hi) {
- int md = lo + ((hi - lo) >> 1);
- int res = cmp((char *) arr + md * elm_size, elm);
- if(res < 0)
- lo = md + 1;
- else if(res > 0)
- hi = md;
- else
- return md;
- }
-
- return -(lo + 1);
+ ARR_VRFY(arr);
+ assert(ARR_DESCR(arr)->nelts >= new_len);
+ ARR_DESCR(arr)->nelts = new_len;
}
-#define ARR_SET_INSERT(arr, cmp, elm) \
-do { \
- int idx = ir_arr_bsearch((arr), sizeof((arr)[0]), (cmp), (elm)); \
- if (idx < 0) { \
- idx = -idx - 1; \
- memmove(&(arr)[idx+1], &(arr)[idx], sizeof((arr)[0]) * (ARR_DESCR((arr))->nelts - idx)); \
- (arr)[idx] = *(elm); \
- ++ARR_DESCR((arr))->nelts; \
- } \
-} while(0)
-
-#define ARR_SET_INSERT_EXT(type, arr, cmp, elm) \
-do { \
- int idx = ir_arr_bsearch((arr), sizeof((arr)[0]), (cmp), (elm)); \
- if (idx < 0) { \
- int len = ARR_LEN(arr); \
- idx = -idx - 1; \
- ARR_EXTO(type, arr, len + 1); \
- memmove(&(arr)[idx+1], &(arr)[idx], sizeof((arr)[0]) * (len - idx)); \
- (arr)[idx] = *(elm); \
- } \
-} while(0)
-
-#define ARR_SET_REMOVE(arr, cmp, elm) \
-do { \
- int idx = ir_arr_bsearch((arr), sizeof((arr)[0]), (cmp), (elm)); \
- if (idx >= 0) { \
- --ARR_DESCR((arr))->nelts; \
- memmove(&(arr)[idx], &(arr)[idx+1], sizeof((arr)[0]) * (ARR_DESCR((arr))->nelts - idx)); \
- } \
-} while(0)
-
-/**
- * Return the index of an element in an array set.
- * To check for containment, use the expression:
- * (ARR_SET_GET_IDX(arr, cmp, elm) >= 0)
- *
- * @return The index or some value < 0 if the element was not in the set.
- */
-#define ARR_SET_GET_IDX(arr, cmp, elm) \
- (ARR_VRFY((arr)), ir_arr_bsearch((arr), sizeof((arr)[0]), cmp, (elm)))
-
-#ifdef __GNUC__
-#define ARR_SET_GET(arr, cmp, elm) \
- ({ int idx = ARR_SET_GET_IDX(arr, cmp, elm); idx >= 0 ? &(arr)[idx] : NULL; })
-#else
-#define ARR_SET_GET(arr, cmp, elm) \
- (ARR_SET_GET_IDX(arr, cmp, elm) >= 0 ? &(arr)[ARR_SET_GET_IDX(arr, cmp, elm)] : NULL)
-#endif
-
-
-#define ARR_SET_CONTAINS(arr, cmp, elm) \
- (ARR_SET_GET_IDX((arr), (cmp), (elm)) >= 0)
-
-/**
- * Reset the array set.
- * This just initializes the size to zero but does not wipe out any element.
- */
-#define ARR_SET_CLEAR(arr) ARR_SHRINKLEN(arr, 0)
-
#include "../end.h"
#endif