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

diff --git a/ir/adt/array.c b/ir/adt/array.c
index f25fb28ae..7c05ff672 100644
--- a/ir/adt/array.c
+++ b/ir/adt/array.c
@@ -82,7 +82,7 @@ void *ir_new_arr_d(struct obstack *obstack, int nelts, size_t elts_size)
 
 	assert(obstack && (nelts >= 0));
 
-	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;
@@ -102,13 +102,13 @@ void *ir_new_arr_d(struct obstack *obstack, int nelts, size_t elts_size)
  */
 void *ir_new_arr_f(int 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->v.elts;
 }
 
 /**
@@ -126,10 +126,7 @@ void ir_del_arr_f(void *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);
 }
@@ -154,7 +151,7 @@ void *ir_arr_setlen (void *elts, int nelts, size_t elts_size)
 	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;
@@ -189,12 +186,8 @@ 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;
 
@@ -207,6 +200,7 @@ void *ir_arr_resize(void *elts, int nelts, size_t eltsize)
  * 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)
 {
 	return ARR_LEN(arr);
@@ -217,6 +211,7 @@ 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)