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

diff --git a/ir/adt/array.c b/ir/adt/array.c
index b7dc3236b..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.
  *
@@ -47,7 +47,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)
 {
@@ -58,7 +58,6 @@ void ir_verify_arr(const void *arr)
 	if (descr->magic == ARR_F_MAGIC) {
 		assert(descr->u.allocated >= descr->nelts);
 	}
-	assert(descr->nelts >= 0);
 #else
 	(void) arr;
 #endif
@@ -76,17 +75,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 = (ir_arr_descr*) 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 +99,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 *newa;
 
-	assert (nelts >= 0);
-	newa = (ir_arr_descr*) xmalloc (ARR_ELTS_OFFS+elts_size);
-	ARR_SET_DBGINF (newa, ARR_F_MAGIC, nelts ? elts_size/nelts : 0);
+	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->v.elts;
+	return newa->elts;
 }
 
 /**
@@ -122,14 +120,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 +141,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 = (ir_arr_descr*) 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 +168,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));
 
@@ -194,17 +189,20 @@ void *ir_arr_resize(void *elts, int nelts, size_t eltsize)
 	}
 	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);
-int array_len(const void *arr)
+size_t array_len(const void *arr)
 {
 	return ARR_LEN(arr);
 }
@@ -214,7 +212,6 @@ int array_len(const void *arr)
  * Do NOT use is in code!.
  * This function is intended to be called from a debugger.
  */
-ir_arr_descr *array_descr(const void *arr);
 ir_arr_descr *array_descr(const void *arr)
 {
 	if (! arr)