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

diff --git a/ir/adt/array.c b/ir/adt/array.c
index 5227a5dd9..ed4fb5b4c 100644
--- a/ir/adt/array.c
+++ b/ir/adt/array.c
@@ -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.
  *
@@ -24,15 +24,11 @@
  * @version     $Id$
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
-#ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
+#include <stdlib.h>
 
-#include "array.h"
+#include "array_t.h"
 #include "xmalloc.h"
 
 /* Undefine the macros to get the functions instead, cf tmalloc.c.  */
@@ -51,11 +47,21 @@
 /**
  * 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);
+	}
+#else
+	(void) arr;
 #endif
-;
+}
 
 /**
  * Creates a dynamic array on a obstack.
@@ -69,16 +75,17 @@ _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, size_t nelts, size_t elts_size)
+{
+	ir_arr_descr *dp;
 
-	assert(obstack && (nelts >= 0));
+	assert(obstack);
 
-	dp = obstack_alloc(obstack, _ARR_ELTS_OFFS + elts_size);
-	_ARR_SET_DBGINF(dp, ARR_D_MAGIC, elts_size/nelts);
+	dp = (ir_arr_descr*)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;
+	return dp->elts;
 }
 
 /**
@@ -92,14 +99,14 @@ 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;
-
-	assert (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;
+void *ir_new_arr_f(size_t nelts, size_t elts_size)
+{
+	ir_arr_descr *newa;
+
+	newa = (ir_arr_descr*)xmalloc(ARR_ELTS_OFFS+elts_size);
+	ARR_SET_DBGINF(newa, ARR_F_MAGIC, nelts ? elts_size/nelts : 0);
+	newa->u.allocated = newa->nelts = nelts;
+	return newa->elts;
 }
 
 /**
@@ -109,19 +116,17 @@ 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);
+	ARR_VRFY(elts);
+	assert(dp->magic == ARR_F_MAGIC);
 
 #ifndef NDEBUG
-	{
-		_arr_descr *wdp = (_arr_descr *)dp;
-		wdp->magic = 0xdeadbeef;
-	}
+	dp->magic = 0xdeadbeef;
 #endif
-	free((void *)dp);
+	free(dp);
 }
 
 /**
@@ -136,17 +141,18 @@ 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, size_t 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));
+	assert(dp->magic == ARR_F_MAGIC);
+	ARR_VRFY(elts);
+	assert(!dp->eltsize || !nelts || (dp->eltsize == elts_size/nelts));
 
-	dp = xrealloc (dp, _ARR_ELTS_OFFS+elts_size);
+	dp = (ir_arr_descr*) xrealloc(dp, ARR_ELTS_OFFS+elts_size);
 	dp->u.allocated = dp->nelts = nelts;
 
-	return dp->v.elts;
+	return dp->elts;
 }
 
 /**
@@ -162,11 +168,12 @@ 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);
-	int n;
+void *ir_arr_resize(void *elts, size_t nelts, size_t eltsize)
+{
+	ir_arr_descr *dp = ARR_DESCR(elts);
+	size_t n;
 
-	assert((dp->magic == ARR_F_MAGIC) && (nelts >= 0));
+	assert(dp->magic == ARR_F_MAGIC);
 	ARR_VRFY(elts);
 	assert(dp->eltsize ? dp->eltsize == eltsize : (dp->eltsize = eltsize, 1));
 
@@ -177,25 +184,26 @@ 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 = (ir_arr_descr*) xrealloc(dp, ARR_ELTS_OFFS+eltsize*n);
 		dp->u.allocated = n;
-#if defined(DEBUG) && defined(HAVE_GNU_MALLOC)
-	} else {
-		tmalloc_tag = NULL;
-#endif
 	}
 	dp->nelts = nelts;
 
-	return dp->v.elts;
+	return dp->elts;
 }
 
 #ifdef DEBUG_libfirm
+/* forward declarations to avoid warnings */
+size_t array_len(const void *arr);
+ir_arr_descr *array_descr(const void *arr);
+
 /**
  * This function returns the length of a flexible array.
  * Do NOT use is in code, use ARR_LEN() macro!
  * This function is intended to be called from a debugger.
  */
-int array_len(const void *arr) {
+size_t array_len(const void *arr)
+{
 	return ARR_LEN(arr);
 }
 
@@ -204,9 +212,10 @@ 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 */