summaryrefslogtreecommitdiff
path: root/libguile/procs.c
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2009-02-12 00:02:11 +0100
committerLudovic Courtès <ludo@gnu.org>2009-02-12 00:02:11 +0100
commitac51e74b9533cc3df8fe9656b97a6385a6e71b80 (patch)
tree418eaa30271aab9f36e4c8562cf016087cfca84a /libguile/procs.c
parentfeccd2d3100fd2964d4c2df58ab3da7ce4949a66 (diff)
downloadguile-ac51e74b9533cc3df8fe9656b97a6385a6e71b80.tar.gz
Use double-cells to store subrs.
* libguile/procs.c (scm_subr_table, scm_subr_table_size, scm_subr_table_room, subr_table_gc_hint, scm_init_subr_table, scm_mark_subr_table): Remove. (scm_c_make_subr): Simply return a double-cell, with the procedure name and properties stored in a two-element array. (scm_free_subr_entry): Free the meta-info slot. * libguile/init.c (scm_i_init_guile): Remove call to `scm_init_subr_table ()'. * libguile/procs.h (SCM_SUBR_META_INFO): New macro. (SCM_SNAME, SCM_SUBR_PROPS): Use it. (SCM_SUBR_GENERIC, SCM_SET_SUBR_GENERIC, SCM_SET_SUBR_GENERIC_LOC): Update. (scm_t_subr_entry, SCM_SUBR_ENTRY, SCM_SUBRNUM, scm_subr_table, scm_mark_subr_table, scm_init_subr_table): Remove.
Diffstat (limited to 'libguile/procs.c')
-rw-r--r--libguile/procs.c65
1 files changed, 13 insertions, 52 deletions
diff --git a/libguile/procs.c b/libguile/procs.c
index 854ddba22..e36e7ca16 100644
--- a/libguile/procs.c
+++ b/libguile/procs.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995,1996,1997,1999,2000,2001, 2006, 2008 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1997,1999,2000,2001, 2006, 2008, 2009 Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -37,40 +37,26 @@
/* {Procedures}
*/
-scm_t_subr_entry *scm_subr_table;
/* libguile contained approx. 700 primitive procedures on 24 Aug 1999. */
/* Increased to 800 on 2001-05-07 -- Guile now has 779 primitives on
startup, 786 with guile-readline. 'martin */
-static unsigned long scm_subr_table_size = 0;
-static unsigned long scm_subr_table_room = 800;
-
-SCM
+SCM
scm_c_make_subr (const char *name, long type, SCM (*fcn) ())
{
register SCM z;
- unsigned long entry;
+ SCM *meta_info;
- if (scm_subr_table_size == scm_subr_table_room)
- {
- long new_size = scm_subr_table_room * 3 / 2;
- void *new_table
- = scm_realloc ((char *) scm_subr_table,
- sizeof (scm_t_subr_entry) * new_size);
- scm_subr_table = new_table;
- scm_subr_table_room = new_size;
- }
+ meta_info = scm_gc_malloc (2 * sizeof (* meta_info),
+ "subr meta-info");
+ meta_info[0] = scm_from_locale_symbol (name);
+ meta_info[1] = SCM_EOL; /* properties */
+
+ z = scm_double_cell ((scm_t_bits) type, (scm_t_bits) fcn,
+ 0 /* generic */, (scm_t_bits) meta_info);
- entry = scm_subr_table_size;
- z = scm_cell ((entry << 8) + type, (scm_t_bits) fcn);
- scm_subr_table[entry].handle = z;
- scm_subr_table[entry].name = scm_from_locale_symbol (name);
- scm_subr_table[entry].generic = 0;
- scm_subr_table[entry].properties = SCM_EOL;
- scm_subr_table_size++;
-
return z;
}
@@ -87,11 +73,8 @@ scm_c_define_subr (const char *name, long type, SCM (*fcn) ())
void
scm_free_subr_entry (SCM subr)
{
- long entry = SCM_SUBRNUM (subr);
- /* Move last entry in table to the free position */
- scm_subr_table[entry] = scm_subr_table[scm_subr_table_size - 1];
- SCM_SET_SUBRNUM (scm_subr_table[entry].handle, entry);
- scm_subr_table_size--;
+ scm_gc_free (SCM_SUBR_META_INFO (subr), 2 * sizeof (SCM),
+ "subr meta-info");
}
SCM
@@ -112,20 +95,6 @@ scm_c_define_subr_with_generic (const char *name,
return subr;
}
-void
-scm_mark_subr_table ()
-{
- long i;
- for (i = 0; i < scm_subr_table_size; ++i)
- {
- scm_gc_mark (scm_subr_table[i].name);
- if (scm_subr_table[i].generic && *scm_subr_table[i].generic)
- scm_gc_mark (*scm_subr_table[i].generic);
- if (SCM_NIMP (scm_subr_table[i].properties))
- scm_gc_mark (scm_subr_table[i].properties);
- }
-}
-
#ifdef CCLO
SCM
@@ -348,15 +317,7 @@ scm_setter (SCM proc)
return SCM_BOOL_F; /* not reached */
}
-
-void
-scm_init_subr_table ()
-{
- scm_subr_table
- = ((scm_t_subr_entry *)
- scm_malloc (sizeof (scm_t_subr_entry) * scm_subr_table_room));
-}
-
+
void
scm_init_procs ()
{