X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fadt%2Farray.c;h=f934fa4b263b48557b7e8e6cff99e2b0c8e58f0f;hb=89f5a4ce0aabfe22c149bcb77c621fa21fea0fcc;hp=1402432f0a7d31c3202f3c7b9c8c876607cfc9fb;hpb=1ba00901371680626dc22ab9658bc7339d2dd9ab;p=libfirm

diff --git a/ir/adt/array.c b/ir/adt/array.c
index 1402432f0..f934fa4b2 100644
--- a/ir/adt/array.c
+++ b/ir/adt/array.c
@@ -1,24 +1,33 @@
 /*
- * Project:     libFIRM
- * File name:   ir/adt/array.c
- * Purpose:     Array --- dynamic & flexible arrays.
- * Author:      Markus Armbruster
- * Modified by:
- * Created:     1999 by getting from fiasco
- * CVS-ID:      $Id$
- * Copyright:   (c) 1995, 1996 Markus Armbruster
- * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
+ * Copyright (C) 1995-2011 University of Karlsruhe.  All right reserved.
+ *
+ * This file is part of libFirm.
+ *
+ * This file may be distributed and/or modified under the terms of the
+ * GNU General Public License version 2 as published by the Free Software
+ * Foundation and appearing in the file LICENSE.GPL included in the
+ * packaging of this file.
+ *
+ * Licensees holding valid libFirm Professional Edition licenses may use
+ * this file in accordance with the libFirm Commercial License.
+ * Agreement provided with the Software.
+ *
+ * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+ * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE.
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+/**
+ * @file
+ * @brief       Array --- dynamic & flexible arrays.
+ * @author      Markus Armbruster
+ */
 
-#ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
+#include "config.h"
+
+#include <stdlib.h>
 
-#include "array.h"
+#include "array_t.h"
 #include "xmalloc.h"
 
 /* Undefine the macros to get the functions instead, cf tmalloc.c.  */
@@ -35,13 +44,21 @@
 #endif
 
 /**
- * An empty dynamic array
+ * An empty dynamic array descriptor.
  */
-_arr_descr arr_mt_descr
+ir_arr_descr arr_mt_descr = { ARR_D_MAGIC, 0, 0, { { 0 } } };
+
+void ir_verify_arr(const void *arr)
+{
 #ifndef NDEBUG
-  = { ARR_D_MAGIC }
+	ir_arr_descr *descr = ARR_DESCR(arr);
+	assert(descr->magic == ARR_D_MAGIC || descr->magic == ARR_A_MAGIC
+			 || descr->magic == ARR_F_MAGIC);
+	assert(descr->magic != ARR_F_MAGIC || descr->allocated >= descr->nelts);
+#else
+	(void) arr;
 #endif
-;
+}
 
 /**
  * Creates a dynamic array on a obstack.
@@ -55,18 +72,16 @@ _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)
+void *ir_new_arr_d(struct obstack *obstack, size_t nelts, size_t elts_size)
 {
-  _arr_descr *new;
+	ir_arr_descr *dp;
 
-  assert (obstack && (nelts >= 0));
+	assert(obstack);
 
-  new = obstack_alloc (obstack, _ARR_ELTS_OFFS+elts_size);
-  _ARR_SET_DBGINF (new, ARR_D_MAGIC, elts_size/nelts);
-  new->u.obstack = obstack;
-  new->nelts = nelts;
-  return new->v.elts;
+	dp = (ir_arr_descr*)obstack_alloc(obstack, ARR_ELTS_OFFS + elts_size);
+	ARR_SET_DBGINF(dp, ARR_D_MAGIC);
+	dp->allocated = dp->nelts = nelts;
+	return dp->elts;
 }
 
 /**
@@ -80,16 +95,14 @@ _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)
+void *ir_new_arr_f(size_t nelts, size_t elts_size)
 {
-  _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);
+	newa->allocated = newa->nelts = nelts;
+	return newa->elts;
 }
 
 /**
@@ -99,18 +112,17 @@ _new_arr_f (int nelts, size_t elts_size)
  *
  * @remark Helper function, use DEL_ARR_F() instead.
  */
-void
-_del_arr_f (void *elts)
+void ir_del_arr_f(void *elts)
 {
-  _arr_descr *dp = _ARR_DESCR (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
-  dp->magic = 0xdeadbeef;
+	dp->magic = 0xdeadbeef;
 #endif
-  free (dp);
+	free(dp);
 }
 
 /**
@@ -125,19 +137,17 @@ _del_arr_f (void *elts)
  *
  * @remark Helper function, use ARR_SETLEN() instead.
  */
-void *
-_arr_setlen (void *elts, int nelts, size_t elts_size)
+void *ir_arr_setlen (void *elts, size_t nelts, size_t elts_size)
 {
-  _arr_descr *dp = _ARR_DESCR (elts);
+	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);
 
-  dp = xrealloc (dp, _ARR_ELTS_OFFS+elts_size);
-  dp->u.allocated = dp->nelts = nelts;
+	dp = (ir_arr_descr*) xrealloc(dp, ARR_ELTS_OFFS+elts_size);
+	dp->allocated = dp->nelts = nelts;
 
-  return dp->v.elts;
+	return dp->elts;
 }
 
 /**
@@ -153,31 +163,53 @@ _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)
+void *ir_arr_resize(void *elts, size_t nelts, size_t eltsize)
 {
-  _arr_descr *dp = _ARR_DESCR (elts);
-  int n;
-
-  assert ((dp->magic == ARR_F_MAGIC) && (nelts >= 0));
-  ARR_VRFY (elts);
-  assert (dp->eltsize ? dp->eltsize == eltsize : (dp->eltsize = eltsize, 1));
-
-  /* @@@ lots of resizes for small nelts */
-  n = MAX (1, dp->u.allocated);
-  while (nelts > n) n <<= 1;
-  while (3*nelts < n) n >>= 1;
-  assert (n >= nelts);
-
-  if (n != dp->u.allocated) {
-    dp = 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;
+	ir_arr_descr *dp = ARR_DESCR(elts);
+	size_t n;
+
+	assert(dp->magic == ARR_F_MAGIC);
+	ARR_VRFY(elts);
 
-  return dp->v.elts;
+	/* @@@ lots of resizes for small nelts */
+	n = MAX(1, dp->allocated);
+	while (nelts > n) n <<= 1;
+	while (3*nelts < n) n >>= 1;
+	assert(n >= nelts);
+
+	if (n != dp->allocated) {
+		dp = (ir_arr_descr*) xrealloc(dp, ARR_ELTS_OFFS+eltsize*n);
+		dp->allocated = n;
+	}
+	dp->nelts = nelts;
+
+	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.
+ */
+size_t array_len(const void *arr)
+{
+	return ARR_LEN(arr);
+}
+
+/**
+ * This function returns the array descriptor of a flexible array.
+ * Do NOT use is in code!.
+ * This function is intended to be called from a debugger.
+ */
+ir_arr_descr *array_descr(const void *arr)
+{
+	if (! arr)
+		return NULL;
+	return ARR_DESCR(arr);
 }
+#endif /* DEBUG_libfirm */