mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-30 03:40:34 +02:00
* libguile/Makefile.am (modinclude_HEADERS): Added `boehm-gc.h'. * libguile/coop-defs.h: Use "libguile/boehm-gc.h" instead of <gc/gc.h>. * libguile/coop-threads.h: Likewise. * libguile/coop.c: Likewise. * libguile/gc.c: Likewise. (scm_storage_prehistory): Invoke `GC_init ()'. * libguile/guardians.c: Use "libguile/boehm-gc.h" instead of <gc/gc.h>. * libguile/inline.h: Likewise. (scm_double_cell): Use `GC_MALLOC' instead of `GC_malloc'. * libguile/pthread-threads.h: Use "libguile/boehm-gc.h" instead of <gc/gc.h>. * libguile/smob.c: Likewise. * libguile/smob.h: Likewise. * libguile/struct.c: Likewise. * libguile/threads.c: Likewise. * libguile/weaks.c: Likewise. git-archimport-id: lcourtes@laas.fr--2005-libre/guile-core--boehm-gc--1.9--patch-51
202 lines
6 KiB
C
202 lines
6 KiB
C
/* classes: h_files */
|
|
|
|
#ifndef SCM_INLINE_H
|
|
#define SCM_INLINE_H
|
|
|
|
/* Copyright (C) 2001, 2002, 2003, 2004, 2006 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
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* 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.
|
|
*
|
|
* 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
|
|
*/
|
|
|
|
/* This file is for inline functions. On platforms that don't support
|
|
inlining functions, they are turned into ordinary functions. See
|
|
"inline.c".
|
|
*/
|
|
|
|
#include "libguile/__scm.h"
|
|
|
|
#if (SCM_DEBUG_CELL_ACCESSES == 1)
|
|
#include <stdio.h>
|
|
#endif
|
|
|
|
#include "libguile/pairs.h"
|
|
#include "libguile/gc.h"
|
|
#include "libguile/threads.h"
|
|
#include "libguile/unif.h"
|
|
#include "libguile/pairs.h"
|
|
|
|
|
|
#include "libguile/boehm-gc.h"
|
|
|
|
|
|
SCM_API SCM scm_cell (scm_t_bits car, scm_t_bits cdr);
|
|
SCM_API SCM scm_double_cell (scm_t_bits car, scm_t_bits cbr,
|
|
scm_t_bits ccr, scm_t_bits cdr);
|
|
|
|
SCM_API SCM scm_array_handle_ref (scm_t_array_handle *h, ssize_t pos);
|
|
SCM_API void scm_array_handle_set (scm_t_array_handle *h, ssize_t pos, SCM val);
|
|
|
|
|
|
#if defined SCM_C_INLINE || defined SCM_INLINE_C_INCLUDING_INLINE_H
|
|
/* either inlining, or being included from inline.c. We use (and
|
|
repeat) this long #if test here and below so that we don't have to
|
|
introduce any extraneous symbols into the public namespace. We
|
|
only need SCM_C_INLINE to be seen publically . */
|
|
|
|
extern unsigned scm_newcell2_count;
|
|
extern unsigned scm_newcell_count;
|
|
|
|
#if defined SCM_C_INLINE && ! defined SCM_INLINE_C_INCLUDING_INLINE_H
|
|
/* definitely inlining */
|
|
#ifdef __GNUC__
|
|
extern
|
|
#else
|
|
static
|
|
#endif
|
|
SCM_C_INLINE
|
|
#endif
|
|
|
|
SCM
|
|
scm_cell (scm_t_bits car, scm_t_bits cdr)
|
|
{
|
|
SCM cell = SCM_PACK ((scm_t_bits) (GC_MALLOC (sizeof (scm_t_cell))));
|
|
|
|
/* Initialize the type slot last so that the cell is ignored by the GC
|
|
until it is completely initialized. This is only relevant when the GC
|
|
can actually run during this code, which it can't since the GC only runs
|
|
when all other threads are stopped. */
|
|
SCM_GC_SET_CELL_WORD (cell, 1, cdr);
|
|
SCM_GC_SET_CELL_WORD (cell, 0, car);
|
|
|
|
return cell;
|
|
}
|
|
|
|
#if defined SCM_C_INLINE && ! defined SCM_INLINE_C_INCLUDING_INLINE_H
|
|
/* definitely inlining */
|
|
#ifdef __GNUC__
|
|
extern
|
|
#else
|
|
static
|
|
#endif
|
|
SCM_C_INLINE
|
|
#endif
|
|
SCM
|
|
scm_double_cell (scm_t_bits car, scm_t_bits cbr,
|
|
scm_t_bits ccr, scm_t_bits cdr)
|
|
{
|
|
SCM z;
|
|
|
|
z = SCM_PACK ((scm_t_bits) (GC_MALLOC (2 * sizeof (scm_t_cell))));
|
|
/* Initialize the type slot last so that the cell is ignored by the
|
|
GC until it is completely initialized. This is only relevant
|
|
when the GC can actually run during this code, which it can't
|
|
since the GC only runs when all other threads are stopped.
|
|
*/
|
|
SCM_GC_SET_CELL_WORD (z, 1, cbr);
|
|
SCM_GC_SET_CELL_WORD (z, 2, ccr);
|
|
SCM_GC_SET_CELL_WORD (z, 3, cdr);
|
|
SCM_GC_SET_CELL_WORD (z, 0, car);
|
|
|
|
/* When this function is inlined, it's possible that the last
|
|
SCM_GC_SET_CELL_WORD above will be adjacent to a following
|
|
initialization of z. E.g., it occurred in scm_make_real. GCC
|
|
from around version 3 (e.g., certainly 3.2) began taking
|
|
advantage of strict C aliasing rules which say that it's OK to
|
|
interchange the initialization above and the one below when the
|
|
pointer types appear to differ sufficiently. We don't want that,
|
|
of course. GCC allows this behaviour to be disabled with the
|
|
-fno-strict-aliasing option, but would also need to be supplied
|
|
by Guile users. Instead, the following statements prevent the
|
|
reordering.
|
|
*/
|
|
#ifdef __GNUC__
|
|
__asm__ volatile ("" : : : "memory");
|
|
#else
|
|
/* portable version, just in case any other compiler does the same
|
|
thing. */
|
|
scm_remember_upto_here_1 (z);
|
|
#endif
|
|
|
|
return z;
|
|
}
|
|
|
|
#if defined SCM_C_INLINE && ! defined SCM_INLINE_C_INCLUDING_INLINE_H
|
|
/* definitely inlining */
|
|
#ifdef __GNUC__
|
|
extern
|
|
#else
|
|
static
|
|
#endif
|
|
SCM_C_INLINE
|
|
#endif
|
|
SCM
|
|
scm_array_handle_ref (scm_t_array_handle *h, ssize_t p)
|
|
{
|
|
return h->ref (h, p);
|
|
}
|
|
|
|
#if defined SCM_C_INLINE && ! defined SCM_INLINE_C_INCLUDING_INLINE_H
|
|
/* definitely inlining */
|
|
#ifdef __GNUC__
|
|
extern
|
|
#else
|
|
static
|
|
#endif
|
|
SCM_C_INLINE
|
|
#endif
|
|
void
|
|
scm_array_handle_set (scm_t_array_handle *h, ssize_t p, SCM v)
|
|
{
|
|
h->set (h, p, v);
|
|
}
|
|
|
|
#if defined SCM_C_INLINE && ! defined SCM_INLINE_C_INCLUDING_INLINE_H
|
|
/* definitely inlining */
|
|
#ifdef __GNUC__
|
|
extern
|
|
#else
|
|
static
|
|
#endif
|
|
SCM_C_INLINE
|
|
#endif
|
|
int
|
|
scm_is_pair (SCM x)
|
|
{
|
|
/* The following "workaround_for_gcc_295" avoids bad code generated by
|
|
i386 gcc 2.95.4 (the Debian packaged 2.95.4-24 at least).
|
|
|
|
Under the default -O2 the inlined SCM_I_CONSP test gets "optimized" so
|
|
the fetch of the tag word from x is done before confirming it's a
|
|
non-immediate (SCM_NIMP). Needless to say that bombs badly if x is a
|
|
immediate. This was seen to afflict scm_srfi1_split_at and something
|
|
deep in the bowels of ceval(). In both cases segvs resulted from
|
|
deferencing a random immediate value. srfi-1.test exposes the problem
|
|
through a short list, the immediate being SCM_EOL in that case.
|
|
Something in syntax.test exposed the ceval() problem.
|
|
|
|
Just "volatile SCM workaround_for_gcc_295 = lst" is enough to avoid the
|
|
problem, without even using that variable. The "w=w" is just to
|
|
prevent a warning about it being unused.
|
|
*/
|
|
#if defined (__GNUC__) && __GNUC__ == 2 && __GNUC_MINOR__ == 95
|
|
volatile SCM workaround_for_gcc_295 = x;
|
|
workaround_for_gcc_295 = workaround_for_gcc_295;
|
|
#endif
|
|
|
|
return SCM_I_CONSP (x);
|
|
}
|
|
|
|
#endif
|
|
#endif
|