Support for 24-bit types.

[mLib] / alloc.c

diff --git a/alloc.c b/alloc.c
index b42718a6254f0e48859c2e65147ed9e322393aed..d425e97573b9f9c718add5cb9a0ccaf35b9e7dd7 100644 (file)
--- a/alloc.c
+++ b/alloc.c
@@ -1,36 +1,46 @@
 /* -*-c-*-
  *
 /* -*-c-*-
  *

- * $Id: alloc.c,v 1.1 1998/06/17 23:44:42 mdw Exp $
+ * $Id: alloc.c,v 1.4 2000/06/17 10:35:51 mdw Exp $

  *
  * Memory allocation functions
  *
  * (c) 1998 Straylight/Edgeware
  */
 
  *
  * Memory allocation functions
  *
  * (c) 1998 Straylight/Edgeware
  */
 

-/*----- Licensing notice --------------------------------------------------*
+/*----- Licensing notice --------------------------------------------------* 

  *
  * This file is part of the mLib utilities library.
  *
  * mLib is free software; you can redistribute it and/or modify
  *
  * This file is part of the mLib utilities library.
  *
  * mLib is free software; you can redistribute it and/or modify

- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
+ * it under the terms of the GNU Library General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ * 

  * mLib is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * mLib is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with mLib; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * GNU Library General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Library General Public
+ * License along with mLib; if not, write to the Free
+ * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+ * MA 02111-1307, USA.

  */
 
 /*----- Revision history --------------------------------------------------*
  *
  * $Log: alloc.c,v $
  */
 
 /*----- Revision history --------------------------------------------------*
  *
  * $Log: alloc.c,v $

- * Revision 1.1  1998/06/17 23:44:42  mdw
- * Initial revision
+ * Revision 1.4  2000/06/17 10:35:51  mdw
+ * Major overhaul for arena support.
+ *
+ * Revision 1.3  1999/05/06 19:51:35  mdw
+ * Reformatted the LGPL notice a little bit.
+ *
+ * Revision 1.2  1999/05/05 18:50:31  mdw
+ * Change licensing conditions to LGPL.
+ *
+ * Revision 1.1.1.1  1998/06/17 23:44:42  mdw
+ * Initial version of mLib

  *
  */
 
  *
  */
 


@@ -45,14 +55,15 @@
 /* --- Local headers --- */
 
 #include "alloc.h"
 /* --- Local headers --- */
 
 #include "alloc.h"

+#include "arena.h"

 #include "exc.h"
 #include "exc.h"

-#include "track.h"

 
 

-/*----- Functions provided ------------------------------------------------*/
+/*----- Functions and macros ----------------------------------------------*/

 
 

-/* --- @xmalloc@ --- *
+/* --- @x_alloc@ --- *

  *
  *

- * Arguments:  @size_t sz@ = size of block to allocate
+ * Arguments:  @arena *a@ = pointer to underlying arena
+ *             @size_t sz@ = size of block to allocate

  *
  * Returns:    Pointer to allocated block.
  *
  *
  * Returns:    Pointer to allocated block.
  *


@@ -60,17 +71,18 @@
  *             exception @EXC_NOMEM@ is thrown.
  */
 
  *             exception @EXC_NOMEM@ is thrown.
  */
 

-void *xmalloc(size_t sz)
+void *x_alloc(arena *a, size_t sz)

 {
 {

-  void *p = malloc(sz);
+  void *p = A_ALLOC(a, sz);

   if (!p)
     THROW(EXC_NOMEM);
   return (p);
 }
 
   if (!p)
     THROW(EXC_NOMEM);
   return (p);
 }
 

-/* --- @xstrdup@ --- *
+/* --- @x_strdup@ --- *

  *
  *

- * Arguments:  @const char *s@ = pointer to a string
+ * Arguments:  @arena *a@ = pointer to underlying arena
+ *             @const char *s@ = pointer to a string

  *
  * Returns:    Pointer to a copy of the string.
  *
  *
  * Returns:    Pointer to a copy of the string.
  *


@@ -79,17 +91,18 @@ void *xmalloc(size_t sz)
  *             thrown.
  */
 
  *             thrown.
  */
 

-char *xstrdup(const char *s)
+char *x_strdup(arena *a, const char *s)

 {
   size_t sz = strlen(s) + 1;
 {
   size_t sz = strlen(s) + 1;

-  char *p = xmalloc(sz);
+  char *p = x_alloc(a, sz);

   memcpy(p, s, sz);
   return (p);
 }
 
   memcpy(p, s, sz);
   return (p);
 }
 

-/* --- @xrealloc@ --- *
+/* --- @x_realloc@ --- *

  *
  *

- * Arguments:  @void *p@ = pointer to a block of memory
+ * Arguments:  @arena *a@ = pointer to underlying arena
+ *             @void *p@ = pointer to a block of memory

  *             @size_t sz@ = new size desired for the block
  *
  * Returns:    Pointer to the resized memory block (which is almost
  *             @size_t sz@ = new size desired for the block
  *
  * Returns:    Pointer to the resized memory block (which is almost


@@ -99,12 +112,76 @@ char *xstrdup(const char *s)
  *             exception @EXC_NOMEM@ is thrown.
  */
 
  *             exception @EXC_NOMEM@ is thrown.
  */
 

-void *xrealloc(void *p, size_t sz)
+void *x_realloc(arena *a, void *p, size_t sz)

 {
 {

-  p = realloc(p, sz);
+  p = A_REALLOC(a, p, sz);

   if (!p)
     THROW(EXC_NOMEM);
   return (p);
 }
 
   if (!p)
     THROW(EXC_NOMEM);
   return (p);
 }
 

+/* --- @x_free@ --- *
+ *
+ * Arguments:  @arena *a@ = pointer to underlying arena
+ *             @void *p@ = pointer to a block of memory.
+ *
+ * Returns:    ---
+ *
+ * Use:                Frees a block of memory.
+ */
+
+void (x_free)(arena *a, void *p) { x_free(a, p); }
+
+/*----- Old functions for the standard arena ------------------------------*/
+
+/* --- @xmalloc@ --- *
+ *
+ * Arguments:  @size_t sz@ = size of block to allocate
+ *
+ * Returns:    Pointer to allocated block.
+ *
+ * Use:                Allocates memory.  If there's not enough memory, the
+ *             exception @EXC_NOMEM@ is thrown.
+ */
+
+void *(xmalloc)(size_t sz) { return xmalloc(sz); }
+
+/* --- @xstrdup@ --- *
+ *
+ * Arguments:  @const char *s@ = pointer to a string
+ *
+ * Returns:    Pointer to a copy of the string.
+ *
+ * Use:                Copies a string (like @strdup@ would, if it existed).  If
+ *             there's not enough memory, the exception @EXC_NOMEM@ is
+ *             thrown.
+ */
+
+char *(xstrdup)(const char *s) { return xstrdup(s); }
+
+/* --- @xrealloc@ --- *
+ *
+ * Arguments:  @void *p@ = pointer to a block of memory
+ *             @size_t sz@ = new size desired for the block
+ *
+ * Returns:    Pointer to the resized memory block (which is almost
+ *             certainly not in the same place any more).
+ *
+ * Use:                Resizes a memory block.  If there's not enough memory, the
+ *             exception @EXC_NOMEM@ is thrown.
+ */
+
+void *(xrealloc)(void *p, size_t sz) { return xrealloc(p, sz); }
+
+/* --- @xfree@ --- *
+ *
+ * Arguments:  @void *p@ = pointer to a block of memory.
+ *
+ * Returns:    ---
+ *
+ * Use:                Frees a block of memory.
+ */
+
+void (xfree)(void *p) { xfree(p); }
+

 /*----- That's all, folks -------------------------------------------------*/
 /*----- That's all, folks -------------------------------------------------*/