X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fadt%2Farray.c;h=d84007e4282a979e4bce18b0086fe3d015398043;hb=26b9008643da89a023fd6839ded5b9abf21ef328;hp=f25fb28ae69659e04bb49b5ca2aa12aa84ae0d52;hpb=32ea6ea0320f551448bb66e534e3351977464d42;p=libfirm

diff --git a/ir/adt/array.c b/ir/adt/array.c
index f25fb28ae..d84007e42 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.
  *
@@ -21,7 +21,6 @@
  * @file
  * @brief       Array --- dynamic & flexible arrays.
  * @author      Markus Armbruster
- * @version     $Id$
  */
 
 #include "config.h"
@@ -47,7 +46,7 @@
 /**
  * An empty dynamic array descriptor.
  */
-ir_arr_descr arr_mt_descr = { ARR_D_MAGIC, 0, {0}, 0, {{{0}}} };
+ir_arr_descr arr_mt_descr = { ARR_D_MAGIC, 0, { 0 }, 0,  { { 0 } } };
 
 void ir_verify_arr(const void *arr)
 {
@@ -55,10 +54,7 @@ void ir_verify_arr(const void *arr)
 	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);
+	assert(descr->magic != ARR_F_MAGIC || descr->u.allocated >= descr->nelts);
 #else
 	(void) arr;
 #endif
@@ -76,17 +72,17 @@ void ir_verify_arr(const void *arr)
  *
  * @remark Helper function, use NEW_ARR_D() instead.
  */
-void *ir_new_arr_d(struct obstack *obstack, int nelts, size_t elts_size)
+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);
+	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;
 }
 
 /**
@@ -100,15 +96,14 @@ void *ir_new_arr_d(struct obstack *obstack, int nelts, size_t elts_size)
  *
  * @remark Helper function, use NEW_ARR_F() instead.
  */
-void *ir_new_arr_f(int nelts, size_t elts_size)
+void *ir_new_arr_f(size_t nelts, size_t elts_size)
 {
-	ir_arr_descr *new;
+	ir_arr_descr *newa;
 
-	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;
+	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;
 }
 
 /**
@@ -122,14 +117,11 @@ 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
-	{
-		ir_arr_descr *wdp = (ir_arr_descr *)dp;
-		wdp->magic = 0xdeadbeef;
-	}
+	dp->magic = 0xdeadbeef;
 #endif
 	free(dp);
 }
@@ -146,18 +138,18 @@ void ir_del_arr_f(void *elts)
  *
  * @remark Helper function, use ARR_SETLEN() instead.
  */
-void *ir_arr_setlen (void *elts, int nelts, size_t elts_size)
+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;
 }
 
 /**
@@ -173,12 +165,12 @@ void *ir_arr_setlen (void *elts, int nelts, size_t elts_size)
  *
  * @remark Helper function, use ARR_RESIZE() instead.
  */
-void *ir_arr_resize(void *elts, int nelts, size_t eltsize)
+void *ir_arr_resize(void *elts, size_t nelts, size_t eltsize)
 {
 	ir_arr_descr *dp = ARR_DESCR(elts);
-	int n;
+	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));
 
@@ -189,25 +181,25 @@ void *ir_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);
 }