-/* Copyright (C) 1995,1996,1998,1999,2000,2001 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1998,1999,2000,2001, 2003, 2004 Free Software Foundation, Inc.
*
- * This program 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, or (at your option)
- * any later version.
- *
- * This program 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 this software; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307 USA
- *
- * As a special exception, the Free Software Foundation gives permission
- * for additional uses of the text contained in its release of GUILE.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
*
- * The exception is that, if you link the GUILE library with other files
- * to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the GUILE library code into it.
- *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
- *
- * This exception applies only to the code released by the
- * Free Software Foundation under the name GUILE. If you copy
- * code from other Free Software Foundation releases into a copy of
- * GUILE, as the General Public License permits, the exception does
- * not apply to the code that you add in this way. To avoid misleading
- * anyone as to the status of such modified files, you must delete
- * this exception notice from them.
+ * This library 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
+ * Lesser General Public License for more details.
*
- * If you write modifications of your own for GUILE, it is your choice
- * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice. */
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
-/* Software engineering face-lift by Greg J. Badros, 11-Dec-1999,
- gjb@cs.washington.edu, http://www.cs.washington.edu/homes/gjb */
\f
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
#include <stdio.h>
#include <errno.h>
#include "libguile/_scm.h"
+#include "libguile/async.h"
#include "libguile/objects.h"
+#include "libguile/goops.h"
#include "libguile/ports.h"
#ifdef HAVE_MALLOC_H
\f
/* scm_smobs scm_numsmob
- * implement a dynamicly resized array of smob records.
+ * implement a fixed sized array of smob records.
* Indexes into this table are used when generating type
* tags for smobjects (if you know a tag you can get an index and conversely).
*/
-int scm_numsmob;
-scm_smob_descriptor *scm_smobs;
+
+#define MAX_SMOB_COUNT 256
+long scm_numsmob;
+scm_smob_descriptor scm_smobs[MAX_SMOB_COUNT];
+
+/* Lower 16 bit of data must be zero.
+*/
+void
+scm_i_set_smob_flags (SCM x, scm_t_bits data)
+{
+ SCM_SET_CELL_WORD_0 (x, (SCM_CELL_WORD_0 (x) & 0xFFFF) | data);
+}
+
+void
+scm_assert_smob_type (scm_t_bits tag, SCM val)
+{
+ if (!SCM_SMOB_PREDICATE (tag, val))
+ scm_wrong_type_arg_msg (NULL, 0, val, scm_smobs[SCM_TC2SMOBNUM(tag)].name);
+}
/* {Mark}
*/
to make their links fail. */
SCM
-scm_mark0 (SCM ptr)
+scm_mark0 (SCM ptr SCM_UNUSED)
{
return SCM_BOOL_F;
}
/* {Free}
*/
-scm_sizet
-scm_free0 (SCM ptr)
+size_t
+scm_free0 (SCM ptr SCM_UNUSED)
{
return 0;
}
-scm_sizet
+size_t
scm_smob_free (SCM obj)
{
- scm_must_free ((char *) SCM_CELL_WORD_1 (obj));
- return scm_smobs[SCM_SMOBNUM (obj)].size;
+ long n = SCM_SMOBNUM (obj);
+ if (scm_smobs[n].size > 0)
+ scm_gc_free ((void *) SCM_CELL_WORD_1 (obj),
+ scm_smobs[n].size, SCM_SMOBNAME (n));
+ return 0;
}
/* {Print}
*/
int
-scm_smob_print (SCM exp, SCM port, scm_print_state *pstate)
+scm_smob_print (SCM exp, SCM port, scm_print_state *pstate SCM_UNUSED)
{
- int n = SCM_SMOBNUM (exp);
+ long n = SCM_SMOBNUM (exp);
scm_puts ("#<", port);
scm_puts (SCM_SMOBNAME (n) ? SCM_SMOBNAME (n) : "smob", port);
scm_putc (' ', port);
- scm_intprint (SCM_UNPACK (scm_smobs[n].size ? SCM_CDR (exp) : exp), 16, port);
+ if (scm_smobs[n].size)
+ scm_uintprint (SCM_CELL_WORD_1 (exp), 16, port);
+ else
+ scm_uintprint (SCM_UNPACK (exp), 16, port);
scm_putc ('>', port);
return 1;
}
#define SCM_SMOB_APPLY0(SMOB) \
SCM_SMOB_DESCRIPTOR (SMOB).apply (SMOB)
-#define SCM_SMOB_APPLY1(SMOB,A1) \
+#define SCM_SMOB_APPLY1(SMOB, A1) \
SCM_SMOB_DESCRIPTOR (SMOB).apply (SMOB, A1)
-#define SCM_SMOB_APPLY2(SMOB,A1,A2) \
+#define SCM_SMOB_APPLY2(SMOB, A1, A2) \
SCM_SMOB_DESCRIPTOR (SMOB).apply (SMOB, A1, A2)
-#define SCM_SMOB_APPLY3(SMOB,A1,A2,A3) \
+#define SCM_SMOB_APPLY3(SMOB, A1, A2, A3) \
SCM_SMOB_DESCRIPTOR (SMOB).apply (SMOB, A1, A2, A3)
static SCM
static SCM
scm_smob_apply_1_001 (SCM smob, SCM a1)
{
- return SCM_SMOB_APPLY1 (smob, SCM_LIST1 (a1));
+ return SCM_SMOB_APPLY1 (smob, scm_list_1 (a1));
}
static SCM
}
static SCM
-scm_smob_apply_1_error (SCM smob, SCM a1)
+scm_smob_apply_1_error (SCM smob, SCM a1 SCM_UNUSED)
{
scm_wrong_num_args (smob);
}
static SCM
scm_smob_apply_2_001 (SCM smob, SCM a1, SCM a2)
{
- return SCM_SMOB_APPLY1 (smob, SCM_LIST2 (a1, a2));
+ return SCM_SMOB_APPLY1 (smob, scm_list_2 (a1, a2));
}
static SCM
scm_smob_apply_2_011 (SCM smob, SCM a1, SCM a2)
{
- return SCM_SMOB_APPLY2 (smob, a1, SCM_LIST1 (a2));
+ return SCM_SMOB_APPLY2 (smob, a1, scm_list_1 (a2));
}
static SCM
}
static SCM
-scm_smob_apply_2_error (SCM smob, SCM a1, SCM a2)
+scm_smob_apply_2_error (SCM smob, SCM a1 SCM_UNUSED, SCM a2 SCM_UNUSED)
{
scm_wrong_num_args (smob);
}
static SCM
scm_smob_apply_3_030 (SCM smob, SCM a1, SCM a2, SCM rst)
{
- if (!SCM_NULLP (SCM_CDR (rst)))
+ if (!scm_is_null (SCM_CDR (rst)))
scm_wrong_num_args (smob);
return SCM_SMOB_APPLY3 (smob, a1, a2, SCM_CAR (rst));
}
}
static SCM
-scm_smob_apply_3_error (SCM smob, SCM a1, SCM a2, SCM rst)
+scm_smob_apply_3_error (SCM smob,
+ SCM a1 SCM_UNUSED,
+ SCM a2 SCM_UNUSED,
+ SCM rst SCM_UNUSED)
{
scm_wrong_num_args (smob);
}
\f
-scm_bits_t
-scm_make_smob_type (char *name, scm_sizet size)
-{
- char *tmp;
- if (255 <= scm_numsmob)
- goto smoberr;
- SCM_DEFER_INTS;
- SCM_SYSCALL (tmp = (char *) realloc ((char *) scm_smobs,
- (1 + scm_numsmob)
- * sizeof (scm_smob_descriptor)));
- if (tmp)
- {
- scm_smobs = (scm_smob_descriptor *) tmp;
- scm_smobs[scm_numsmob].name = name;
- scm_smobs[scm_numsmob].size = size;
- scm_smobs[scm_numsmob].mark = 0;
- scm_smobs[scm_numsmob].free = (size == 0 ? scm_free0 : scm_smob_free);
- scm_smobs[scm_numsmob].print = scm_smob_print;
- scm_smobs[scm_numsmob].equalp = 0;
- scm_smobs[scm_numsmob].apply = 0;
- scm_smobs[scm_numsmob].apply_0 = 0;
- scm_smobs[scm_numsmob].apply_1 = 0;
- scm_smobs[scm_numsmob].apply_2 = 0;
- scm_smobs[scm_numsmob].apply_3 = 0;
- scm_smobs[scm_numsmob].gsubr_type = 0;
- scm_numsmob++;
- }
- SCM_ALLOW_INTS;
- if (!tmp)
+
+scm_t_bits
+scm_make_smob_type (char const *name, size_t size)
+#define FUNC_NAME "scm_make_smob_type"
+{
+ long new_smob;
+
+ SCM_CRITICAL_SECTION_START;
+ new_smob = scm_numsmob;
+ if (scm_numsmob != MAX_SMOB_COUNT)
+ ++scm_numsmob;
+ SCM_CRITICAL_SECTION_END;
+
+ if (new_smob == MAX_SMOB_COUNT)
+ scm_misc_error (FUNC_NAME, "maximum number of smobs exceeded", SCM_EOL);
+
+ scm_smobs[new_smob].name = name;
+ if (size != 0)
{
- smoberr:
- scm_memory_error ("scm_make_smob_type");
+ scm_smobs[new_smob].size = size;
+ scm_smobs[new_smob].free = scm_smob_free;
}
+
/* Make a class object if Goops is present. */
if (scm_smob_class)
- scm_smob_class[scm_numsmob - 1]
- = scm_make_extended_class (SCM_SMOBNAME (scm_numsmob - 1));
- return scm_tc7_smob + (scm_numsmob - 1) * 256;
+ scm_smob_class[new_smob] = scm_make_extended_class (name, 0);
+
+ return scm_tc7_smob + new_smob * 256;
}
+#undef FUNC_NAME
+
void
-scm_set_smob_mark (scm_bits_t tc, SCM (*mark) (SCM))
+scm_set_smob_mark (scm_t_bits tc, SCM (*mark) (SCM))
{
scm_smobs[SCM_TC2SMOBNUM (tc)].mark = mark;
}
void
-scm_set_smob_free (scm_bits_t tc, scm_sizet (*free) (SCM))
+scm_set_smob_free (scm_t_bits tc, size_t (*free) (SCM))
{
scm_smobs[SCM_TC2SMOBNUM (tc)].free = free;
}
void
-scm_set_smob_print (scm_bits_t tc, int (*print) (SCM, SCM, scm_print_state*))
+scm_set_smob_print (scm_t_bits tc, int (*print) (SCM, SCM, scm_print_state*))
{
scm_smobs[SCM_TC2SMOBNUM (tc)].print = print;
}
void
-scm_set_smob_equalp (scm_bits_t tc, SCM (*equalp) (SCM, SCM))
+scm_set_smob_equalp (scm_t_bits tc, SCM (*equalp) (SCM, SCM))
{
scm_smobs[SCM_TC2SMOBNUM (tc)].equalp = equalp;
}
void
-scm_set_smob_apply (scm_bits_t tc, SCM (*apply) (),
+scm_set_smob_apply (scm_t_bits tc, SCM (*apply) (),
unsigned int req, unsigned int opt, unsigned int rst)
{
SCM (*apply_0) (SCM);
scm_smobs[SCM_TC2SMOBNUM (tc)].apply_2 = apply_2;
scm_smobs[SCM_TC2SMOBNUM (tc)].apply_3 = apply_3;
scm_smobs[SCM_TC2SMOBNUM (tc)].gsubr_type = type;
+
+ if (scm_smob_class)
+ scm_i_inherit_applicable (scm_smob_class[SCM_TC2SMOBNUM (tc)]);
}
SCM
-scm_make_smob (scm_bits_t tc)
+scm_make_smob (scm_t_bits tc)
{
- int n = SCM_TC2SMOBNUM (tc);
- scm_sizet size = scm_smobs[n].size;
- SCM z;
- SCM_NEWCELL (z);
- if (size != 0)
- {
-#if 0
- if (scm_smobs[n].mark != 0)
- {
- fprintf
- (stderr,
- "forbidden operation for smobs with GC data, use SCM_NEWSMOB\n");
- abort ();
- }
-#endif
- SCM_SET_SMOB_DATA (z, scm_must_malloc (size, SCM_SMOBNAME (n)));
- }
- SCM_SET_CELL_TYPE (z, tc);
- return z;
+ long n = SCM_TC2SMOBNUM (tc);
+ size_t size = scm_smobs[n].size;
+ scm_t_bits data = (size > 0
+ ? (scm_t_bits) scm_gc_malloc (size, SCM_SMOBNAME (n))
+ : 0);
+ return scm_cell (tc, data);
}
\f
-/* {Deprecated stuff}
- */
-
-#if (SCM_DEBUG_DEPRECATED == 0)
-
-long
-scm_make_smob_type_mfpe (char *name, scm_sizet size,
- SCM (*mark) (SCM),
- scm_sizet (*free) (SCM),
- int (*print) (SCM, SCM, scm_print_state *),
- SCM (*equalp) (SCM, SCM))
-{
- long answer = scm_make_smob_type (name, size);
- scm_set_smob_mfpe (answer, mark, free, print, equalp);
- return answer;
-}
-
-void
-scm_set_smob_mfpe (long tc,
- SCM (*mark) (SCM),
- scm_sizet (*free) (SCM),
- int (*print) (SCM, SCM, scm_print_state *),
- SCM (*equalp) (SCM, SCM))
-{
- if (mark) scm_set_smob_mark (tc, mark);
- if (free) scm_set_smob_free (tc, free);
- if (print) scm_set_smob_print (tc, print);
- if (equalp) scm_set_smob_equalp (tc, equalp);
-}
-
-#endif /* SCM_DEBUG_DEPRECATED == 0 */
-
-\f
-/* {Initialization for i/o types, float, bignum, the type of free cells}
+/* {Initialization for the type of free cells}
*/
static int
-free_print (SCM exp, SCM port, scm_print_state *pstate)
+free_print (SCM exp, SCM port, scm_print_state *pstate SCM_UNUSED)
{
char buf[100];
-
sprintf (buf, "#<freed cell %p; GC missed a reference>",
(void *) SCM_UNPACK (exp));
scm_puts (buf, port);
+
+#if (SCM_DEBUG_CELL_ACCESSES == 1)
+ if (scm_debug_cell_accesses_p)
+ abort();
+#endif
+
return 1;
}
void
scm_smob_prehistory ()
{
- scm_bits_t tc;
+ long i;
+ scm_t_bits tc;
scm_numsmob = 0;
- scm_smobs = ((scm_smob_descriptor *)
- malloc (7 * sizeof (scm_smob_descriptor)));
+ for (i = 0; i < MAX_SMOB_COUNT; ++i)
+ {
+ scm_smobs[i].name = 0;
+ scm_smobs[i].size = 0;
+ scm_smobs[i].mark = 0;
+ scm_smobs[i].free = 0;
+ scm_smobs[i].print = scm_smob_print;
+ scm_smobs[i].equalp = 0;
+ scm_smobs[i].apply = 0;
+ scm_smobs[i].apply_0 = 0;
+ scm_smobs[i].apply_1 = 0;
+ scm_smobs[i].apply_2 = 0;
+ scm_smobs[i].apply_3 = 0;
+ scm_smobs[i].gsubr_type = 0;
+ }
- /* WARNING: These scm_make_smob_type calls must be done in this order */
+ /* WARNING: This scm_make_smob_type call must be done first. */
tc = scm_make_smob_type ("free", 0);
scm_set_smob_print (tc, free_print);
-
- tc = scm_make_smob_type ("big", 0); /* freed in gc */
- scm_set_smob_print (tc, scm_bigprint);
- scm_set_smob_equalp (tc, scm_bigequal);
-
- tc = scm_make_smob_type ("real", 0); /* freed in gc */
- scm_set_smob_print (tc, scm_print_real);
- scm_set_smob_equalp (tc, scm_real_equalp);
-
- tc = scm_make_smob_type ("complex", 0); /* freed in gc */
- scm_set_smob_print (tc, scm_print_complex);
- scm_set_smob_equalp (tc, scm_complex_equalp);
}
/*
HCoop / bpt / guile.git / blobdiff