X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fadt%2Farray.c;h=bb5f47c7c282f3776448c0ca63f0a3c931c1a571;hb=dd4cd761ab637d4488c7e29f49843b1b02366acf;hp=5227a5dd961bf53318bd1c9473bb2d08a547e9f5;hpb=385432c6bc64304fafb6155da024b7c785a53204;p=libfirm

diff --git a/ir/adt/array.c b/ir/adt/array.c
index 5227a5dd9..bb5f47c7c 100644
--- a/ir/adt/array.c
+++ b/ir/adt/array.c
@@ -32,7 +32,7 @@
 # include <stdlib.h>
 #endif
 
-#include "array.h"
+#include "array_t.h"
 #include "xmalloc.h"
 
 /* Undefine the macros to get the functions instead, cf tmalloc.c.  */
@@ -51,11 +51,22 @@
 /**
  * An empty dynamic array descriptor.
  */
-_arr_descr arr_mt_descr
+ir_arr_descr arr_mt_descr = { ARR_D_MAGIC, 0, {0}, 0, {{{0}}} };
+
+void ir_verify_arr(const void *arr)
+{
 #ifndef NDEBUG
-	= { ARR_D_MAGIC, 0, {0}, 0, {{{0}}} }
+	ir_arr_descr *descr = ARR_DESCR(arr);
+	assert(descr->magic == ARR_D_MAGIC || descr->magic == ARR_A_MAGIC
+			 || descr->magic == ARR_F_MAGIC);
+	if (descr->magic == ARR_F_MAGIC) {
+		assert(descr->u.allocated >= descr->nelts);
+	}
+	assert(descr->nelts >= 0);
+#else
+	(void) arr;
 #endif
-;
+}
 
 /**
  * Creates a dynamic array on a obstack.
@@ -69,13 +80,13 @@ _arr_descr arr_mt_descr
  *
  * @remark Helper function, use NEW_ARR_D() instead.
  */
-void *_new_arr_d(struct obstack *obstack, int nelts, size_t elts_size) {
-	_arr_descr *dp;
+void *ir_new_arr_d(struct obstack *obstack, int nelts, size_t elts_size) {
+	ir_arr_descr *dp;
 
 	assert(obstack && (nelts >= 0));
 
-	dp = obstack_alloc(obstack, _ARR_ELTS_OFFS + elts_size);
-	_ARR_SET_DBGINF(dp, ARR_D_MAGIC, elts_size/nelts);
+	dp = obstack_alloc(obstack, ARR_ELTS_OFFS + elts_size);
+	ARR_SET_DBGINF(dp, ARR_D_MAGIC, elts_size/nelts);
 	dp->u.obstack = obstack;
 	dp->nelts = nelts;
 	return dp->v.elts;
@@ -92,12 +103,12 @@ void *_new_arr_d(struct obstack *obstack, int nelts, size_t elts_size) {
  *
  * @remark Helper function, use NEW_ARR_F() instead.
  */
-void *_new_arr_f(int nelts, size_t elts_size) {
-	_arr_descr *new;
+void *ir_new_arr_f(int nelts, size_t elts_size) {
+	ir_arr_descr *new;
 
 	assert (nelts >= 0);
-	new = xmalloc (_ARR_ELTS_OFFS+elts_size);
-	_ARR_SET_DBGINF (new, ARR_F_MAGIC, nelts ? elts_size/nelts : 0);
+	new = xmalloc (ARR_ELTS_OFFS+elts_size);
+	ARR_SET_DBGINF (new, ARR_F_MAGIC, nelts ? elts_size/nelts : 0);
 	new->u.allocated = new->nelts = nelts;
 	return new->v.elts;
 }
@@ -109,19 +120,19 @@ void *_new_arr_f(int nelts, size_t elts_size) {
  *
  * @remark Helper function, use DEL_ARR_F() instead.
  */
-void _del_arr_f(const void *elts) {
-	const _arr_descr *dp = _ARR_DESCR (elts);
+void ir_del_arr_f(void *elts) {
+	ir_arr_descr *dp = ARR_DESCR (elts);
 
 	ARR_VRFY (elts);
 	assert (dp->magic == ARR_F_MAGIC);
 
 #ifndef NDEBUG
 	{
-		_arr_descr *wdp = (_arr_descr *)dp;
+		ir_arr_descr *wdp = (ir_arr_descr *)dp;
 		wdp->magic = 0xdeadbeef;
 	}
 #endif
-	free((void *)dp);
+	free(dp);
 }
 
 /**
@@ -136,14 +147,14 @@ void _del_arr_f(const void *elts) {
  *
  * @remark Helper function, use ARR_SETLEN() instead.
  */
-void *_arr_setlen (void *elts, int nelts, size_t elts_size) {
-	_arr_descr *dp = _ARR_DESCR (elts);
+void *ir_arr_setlen (void *elts, int nelts, size_t elts_size) {
+	ir_arr_descr *dp = ARR_DESCR (elts);
 
 	assert ((dp->magic == ARR_F_MAGIC) && (nelts >= 0));
 	ARR_VRFY (elts);
 	assert (!dp->eltsize || !nelts || (dp->eltsize == elts_size/nelts));
 
-	dp = xrealloc (dp, _ARR_ELTS_OFFS+elts_size);
+	dp = xrealloc (dp, ARR_ELTS_OFFS+elts_size);
 	dp->u.allocated = dp->nelts = nelts;
 
 	return dp->v.elts;
@@ -162,8 +173,8 @@ void *_arr_setlen (void *elts, int nelts, size_t elts_size) {
  *
  * @remark Helper function, use ARR_RESIZE() instead.
  */
-void *_arr_resize(void *elts, int nelts, size_t eltsize) {
-	_arr_descr *dp = _ARR_DESCR(elts);
+void *ir_arr_resize(void *elts, int nelts, size_t eltsize) {
+	ir_arr_descr *dp = ARR_DESCR(elts);
 	int n;
 
 	assert((dp->magic == ARR_F_MAGIC) && (nelts >= 0));
@@ -177,7 +188,7 @@ void *_arr_resize(void *elts, int nelts, size_t eltsize) {
 	assert(n >= nelts);
 
 	if (n != dp->u.allocated) {
-		dp = xrealloc(dp, _ARR_ELTS_OFFS+eltsize*n);
+		dp = xrealloc(dp, ARR_ELTS_OFFS+eltsize*n);
 		dp->u.allocated = n;
 #if defined(DEBUG) && defined(HAVE_GNU_MALLOC)
 	} else {
@@ -204,9 +215,9 @@ int array_len(const void *arr) {
  * Do NOT use is in code!.
  * This function is intended to be called from a debugger.
  */
-_arr_descr *array_descr(const void *arr) {
+ir_arr_descr *array_descr(const void *arr) {
 	if (! arr)
 		return NULL;
-	return _ARR_DESCR(arr);
+	return ARR_DESCR(arr);
 }
 #endif /* DEBUG_libfirm */