From b3a674469165dba5af21e622ae25eb4d56589187 Mon Sep 17 00:00:00 2001 From: Abdulaziz Ghuloum Date: Mon, 25 Dec 2006 09:28:53 +0300 Subject: [PATCH] renamed oblist to symbol_table in pcb --- bin/ikarus | Bin 58456 -> 58432 bytes bin/ikarus-collect.c | 4 ++-- bin/ikarus-symbol-table.c | 8 ++------ bin/ikarus.h | 2 +- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/bin/ikarus b/bin/ikarus index e2e32bd5672f91fab6bc4a4aea86e55278bf407d..cb0187fa09f46e42e5735d8d9ac5bc60567c2b13 100755 GIT binary patch delta 4281 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, pcb->frame_base - wordsize); pcb->next_k = add_object(&gc, pcb->next_k, "next_k"); - pcb->oblist = add_object(&gc, pcb->oblist, "oblist"); + pcb->symbol_table = add_object(&gc, pcb->symbol_table, "symbol_table"); pcb->arg_list = add_object(&gc, pcb->arg_list, "args_list_foo"); /* now we trace all live objects */ collect_loop(&gc); diff --git a/bin/ikarus-symbol-table.c b/bin/ikarus-symbol-table.c index acdf73f..989e040 100644 --- a/bin/ikarus-symbol-table.c +++ b/bin/ikarus-symbol-table.c @@ -11,7 +11,7 @@ initialize_symbol_table(ikpcb* pcb){ ikp st = ik_mmap_ptr(size, 0, pcb) + vector_tag; bzero(st-vector_tag, size); ref(st, off_vector_length) = fix(NUM_OF_BUCKETS); - pcb->oblist = st; + pcb->symbol_table = st; return st; } @@ -54,13 +54,9 @@ static ikp ik_make_symbol(ikp str, ikpcb* pcb){ return sym; } -ikp ik_oblist(ikpcb* pcb){ - fprintf(stderr, "oblist dead!\n"); - exit(-1); -} ikp ik_intern_string(ikp str, ikpcb* pcb){ - ikp st = pcb->oblist; + ikp st = pcb->symbol_table; if(st == 0){ st = initialize_symbol_table(pcb); } diff --git a/bin/ikarus.h b/bin/ikarus.h index 2364121..19470c1 100644 --- a/bin/ikarus.h +++ b/bin/ikarus.h @@ -124,7 +124,7 @@ typedef struct ikpcb{ ikpage* uncached_pages; /* ikpages cached so that we don't malloc/free */ ikp stack_base; int stack_size; - ikp oblist; + ikp symbol_table;; ik_guardian_table* guardians[generation_count]; unsigned int* dirty_vector_base; unsigned int* segment_vector_base;