Fixed non-standard C initializer

[libfirm] / ir / adt / array.c

diff --git a/ir/adt/array.c b/ir/adt/array.c
index 53984b9..f58a2cf 100644 (file)
--- a/ir/adt/array.c
+++ b/ir/adt/array.c
@@ -1,15 +1,39 @@
-/* Array --- dynamic & flexible arrays.
-   Copyright (C) 1995, 1996 Markus Armbruster
-   All rights reserved. */
-
-/* $Id$ */
+/*
+ * Copyright (C) 1995-2007 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.
+ */
+
+/**
+ * @file
+ * @brief       Array --- dynamic & flexible arrays.
+ * @author      Markus Armbruster
+ * @version     $Id$
+ */
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+# include "config.h"
+#endif
+
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
 #endif
 
-#include <stdlib.h>
 #include "array.h"
+#include "xmalloc.h"
 
 /* Undefine the macros to get the functions instead, cf tmalloc.c.  */
 #undef xmalloc
@@ -17,13 +41,34 @@
 #undef xstrdup
 #undef xfree
 
+#ifndef MAX
+# define MAX(a,b) ((a) > (b) ? (a) : (b))
+#endif
+#ifndef MIN
+# define MIN(a,b) ((a) > (b) ? (b) : (a))
+#endif
 
+/**
+ * An empty dynamic array
+ */
 _arr_descr arr_mt_descr
 #ifndef NDEBUG
-  = { ARR_D_MAGIC }
+  = { ARR_D_MAGIC, 0, {0}, 0, {{0}} }
 #endif
 ;
 
+/**
+ * Creates a dynamic array on a obstack.
+ *
+ * @param obstack    An struct obstack * were the data will be allocated
+ * @param nelts      The number of elements
+ * @param elts_size  The size of the array elements.
+ *
+ * @return A pointer to the dynamic array (can be used as a pointer to the
+ *         first element of this array).
+ *
+ * @remark Helper function, use NEW_ARR_D() instead.
+ */
 void *
 _new_arr_d (struct obstack *obstack, int nelts, size_t elts_size)
 {
@@ -38,7 +83,17 @@ _new_arr_d (struct obstack *obstack, int nelts, size_t elts_size)
   return new->v.elts;
 }
 
-
+/**
+ * Creates a flexible array.
+ *
+ * @param nelts      The number of elements
+ * @param elts_size  The size of the array elements.
+ *
+ * @return A pointer to the flexible array (can be used as a pointer to the
+ *         first element of this array).
+ *
+ * @remark Helper function, use NEW_ARR_F() instead.
+ */
 void *
 _new_arr_f (int nelts, size_t elts_size)
 {
@@ -51,28 +106,45 @@ _new_arr_f (int nelts, size_t elts_size)
   return new->v.elts;
 }
 
-
+/**
+ * Delete a flexible array.
+ *
+ * @param elts    The flexible array (pointer to the first element).
+ *
+ * @remark Helper function, use DEL_ARR_F() instead.
+ */
 void
 _del_arr_f (void *elts)
 {
   _arr_descr *dp = _ARR_DESCR (elts);
 
   ARR_VRFY (elts);
-  assert (dp->cookie == ARR_F_MAGIC);
+  assert (dp->magic == ARR_F_MAGIC);
 
 #ifndef NDEBUG
-  dp->cookie = 0xdeadbeef;
+  dp->magic = 0xdeadbeef;
 #endif
   free (dp);
 }
 
-
+/**
+ * Resize a flexible array, always reallocate data.
+ *
+ * @param elts       The flexible array (pointer to the first element).
+ * @param nelts      The new number of elements.
+ * @param elts_size  The size of the array elements.
+ *
+ * @return A resized flexible array, possibly other address than
+ *         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);
 
-  assert ((dp->cookie == ARR_F_MAGIC) && (nelts >= 0));
+  assert ((dp->magic == ARR_F_MAGIC) && (nelts >= 0));
   ARR_VRFY (elts);
   assert (!dp->eltsize || !nelts || (dp->eltsize == elts_size/nelts));
 
@@ -82,14 +154,26 @@ _arr_setlen (void *elts, int nelts, size_t elts_size)
   return dp->v.elts;
 }
 
-
+/**
+ * Resize a flexible array, allocate more data if needed but do NOT
+ * reduce.
+ *
+ * @param elts     The flexible array (pointer to the first element).
+ * @param nelts    The new number of elements.
+ * @param eltsize  The size of the array elements.
+ *
+ * @return A resized flexible array, possibly other address than
+ *         elts.
+ *
+ * @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;
 
-  assert ((dp->cookie == ARR_F_MAGIC) && (nelts >= 0));
+  assert ((dp->magic == ARR_F_MAGIC) && (nelts >= 0));
   ARR_VRFY (elts);
   assert (dp->eltsize ? dp->eltsize == eltsize : (dp->eltsize = eltsize, 1));
 
@@ -111,3 +195,25 @@ _arr_resize (void *elts, int nelts, size_t eltsize)
 
   return dp->v.elts;
 }
+
+#ifdef DEBUG_libfirm
+/**
+ * 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(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.
+ */
+_arr_descr *array_descr(void *arr) {
+  if (! arr)
+    return NULL;
+  return _ARR_DESCR(arr);
+}
+#endif /* DEBUG_libfirm */