/* -*-c-*-
*
- * $Id: sym.c,v 1.10 1999/12/10 23:42:04 mdw Exp $
+ * $Id: sym.c,v 1.11 2000/06/17 10:37:39 mdw Exp $
*
* Symbol table management
*
/*----- Revision history --------------------------------------------------*
*
* $Log: sym.c,v $
+ * Revision 1.11 2000/06/17 10:37:39 mdw
+ * Add support for arena management.
+ *
* Revision 1.10 1999/12/10 23:42:04 mdw
* Change header file guard names.
*
/* --- Local headers --- */
#include "alloc.h"
+#include "arena.h"
#include "bits.h"
#include "crc32.h"
#include "exc.h"
#include "hash.h"
#include "sub.h"
#include "sym.h"
-#include "track.h"
/*----- Tuning parameters -------------------------------------------------*/
void sym_create(sym_table *t)
{
- TRACK_CTX("symbol table creation");
- TRACK_PUSH;
hash_create(&t->t, SYM_INITSZ);
+ t->s = &sub_global;
t->load = SYM_LIMIT(SYM_INITSZ);
- TRACK_POP;
}
/* --- @sym_destroy@ --- *
{
sym_iter i;
- TRACK_CTX("symbol table destruction");
- TRACK_PUSH;
-
SYM_MKITER(&i, t);
for (;;) {
sym_base *p;
if (!p)
break;
if (p->len > SYM_BUFSZ)
- sub_free(p->name.p, p->len);
- free(p);
+ subarena_free(t->s, p->name.p, p->len);
+ x_free(t->t.a, p);
}
hash_destroy(&t->t);
-
- TRACK_POP;
}
/* --- @sym_find@ --- *
/* --- Create a new symbol block and initialize it --- */
- {
- TRACK_CTX("new symbol creation");
- TRACK_PUSH;
-
- q = xmalloc(sz);
- q->b.next = *bin;
- q->b.hash = hash;
- q->len = len;
- if (n) {
- if (len <= SYM_BUFSZ)
- memcpy(q->name.b, n, len);
- else {
- TRY {
- q->name.p = sub_alloc(len);
- memcpy(q->name.p, n, len);
- } CATCH {
- free(q);
- TRACK_POP;
- RETHROW;
- } END_TRY;
- }
+ q = x_alloc(t->t.a, sz);
+ q->b.next = *bin;
+ q->b.hash = hash;
+ q->len = len;
+ if (n) {
+ if (len <= SYM_BUFSZ)
+ memcpy(q->name.b, n, len);
+ else {
+ q->name.p = subarena_alloc(t->s, len);
+ memcpy(q->name.p, n, len);
}
-
- TRACK_POP;
}
*bin = &q->b;
sym_base *q = p;
hash_remove(&t->t, &q->b);
if (q->len > SYM_BUFSZ)
- sub_free(q->name.p, q->len);
- free(q);
+ subarena_free(t->s, q->name.p, q->len);
+ xfree(q);
t->load++;
}