* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr.c,v $
- * Revision 1.10 1995-04-18 08:15:20 quinn
+ * Revision 1.11 1995-05-15 11:56:08 quinn
+ * More work on memory management.
+ *
+ * Revision 1.10 1995/04/18 08:15:20 quinn
* Added dynamic memory allocation on encoding (whew). Code is now somewhat
* neater. We'll make the same change for decoding one day.
*
#include <stdio.h>
#include <stdlib.h>
+#include <dmalloc.h>
#include <odr.h>
char *odr_errlist[] =
free(o);
}
-void odr_setbuf(ODR o, char *buf, int len)
+void odr_setbuf(ODR o, char *buf, int len, int can_grow)
{
o->buf = o->bp = (unsigned char *) buf;
o->buflen = o->left = len;
o->ecb.buf = (unsigned char *) buf;
- o->ecb.can_grow = 0;
+ o->ecb.can_grow = can_grow;
o->ecb.top = o->ecb.pos = 0;
o->ecb.size = len;
}
-char *odr_getbuf(ODR o, int *len)
+char *odr_getbuf(ODR o, int *len, int *size)
{
*len = o->ecb.top;
+ if (size)
+ *size = o->ecb.size;
return (char*) o->ecb.buf;
}
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr_mem.c,v $
- * Revision 1.3 1995-04-18 08:15:21 quinn
+ * Revision 1.4 1995-05-15 11:56:09 quinn
+ * More work on memory management.
+ *
+ * Revision 1.3 1995/04/18 08:15:21 quinn
* Added dynamic memory allocation on encoding (whew). Code is now somewhat
* neater. We'll make the same change for decoding one day.
*
#include <stdlib.h>
#include <odr.h>
+#include <dmalloc.h>
/* ------------------------ NIBBLE MEMORY ---------------------- */
struct odr_memblock *next;
} odr_memblock;
-static odr_memblock *freelist = 0;
+static odr_memblock *freelist = 0; /* global freelist */
static void free_block(odr_memblock *p)
{
freelist = p;
}
+/*
+ * acquire a block with a minimum of size free bytes.
+ */
static odr_memblock *get_block(int size)
{
odr_memblock *r, *l;
return r;
}
-void odr_release_mem(odr_memblock *p)
+/*
+ * Return p to the global freelist.
+ */
+void odr_release_mem(ODR_MEM p)
{
odr_memblock *t;
}
}
+/*
+ * Extract the memory control block from o.
+ */
+ODR_MEM odr_extract_mem(ODR o)
+{
+ ODR_MEM r = o->mem;
+
+ o->mem = 0;
+ return r;
+}
+
void *odr_malloc(ODR o, int size)
{
struct odr_memblock *p = o->mem;
if (!p || p->size - p->top < size)
if (!(p = get_block(size)))
- {
- o->error = OMEMORY;
- return 0;
- }
+ abort();
else
{
p->next = o->mem;
o->mem = p;
}
r = p->buf + p->top;
+ /* align size */
p->top += (size + (sizeof(long) - 1)) & ~(sizeof(long) - 1);
return r;
}