diff options
Diffstat (limited to 'libguile/gc-inline.h')
-rw-r--r-- | libguile/gc-inline.h | 75 |
1 files changed, 27 insertions, 48 deletions
diff --git a/libguile/gc-inline.h b/libguile/gc-inline.h index fcbe5a54e..a1932d65a 100644 --- a/libguile/gc-inline.h +++ b/libguile/gc-inline.h @@ -1,33 +1,31 @@ -/* classes: h_files */ - #ifndef SCM_GC_INLINE_H #define SCM_GC_INLINE_H -/* Copyright (C) 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006, - * 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 3 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 - */ +/* Copyright 1995-1996,1998-2004,2006-2014,2018-2019 + Free Software Foundation, Inc. + + This file is part of Guile. + + Guile 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 3 of the License, or + (at your option) any later version. + + Guile 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 Guile. If not, see + <https://www.gnu.org/licenses/>. */ /* Much of this file was copied from gc_inline.h, from the BDW * collector. Its copyright notice is: * * Copyright 1988, 1989 Hans-J. Boehm, Alan J. Demers - * Copyright (c) 1991-1995 by Xerox Corporation. All rights reserved. - * Copyright (c) 2005 Hewlett-Packard Development Company, L.P. + * Copyright 1991-1995 by Xerox Corporation. All rights reserved. + * Copyright 2005 Hewlett-Packard Development Company, L.P. * * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED * OR IMPLIED. ANY USE IS AT YOUR OWN RISK. @@ -41,8 +39,6 @@ -#include "libguile/__scm.h" - #include "libguile/gc.h" #include "libguile/bdw-gc.h" #include "libguile/threads.h" @@ -51,17 +47,6 @@ -#define SCM_INLINE_GC_GRANULE_WORDS 2 -#define SCM_INLINE_GC_GRANULE_BYTES \ - (sizeof(void *) * SCM_INLINE_GC_GRANULE_WORDS) - -/* A freelist set contains SCM_INLINE_GC_FREELIST_COUNT pointers to - singly linked lists of objects of different sizes, the ith one - containing objects i + 1 granules in size. This setting of - SCM_INLINE_GC_FREELIST_COUNT will hold freelists for allocations of - up to 256 bytes. */ -#define SCM_INLINE_GC_FREELIST_COUNT (256U / SCM_INLINE_GC_GRANULE_BYTES) - static inline size_t scm_inline_gc_bytes_to_freelist_index (size_t bytes) { @@ -103,7 +88,7 @@ scm_inline_gc_alloc (void **freelist, size_t idx, scm_inline_gc_kind kind) } static inline void * -scm_inline_gc_malloc_pointerless (scm_i_thread *thread, size_t bytes) +scm_inline_gc_malloc_pointerless (scm_thread *thread, size_t bytes) { size_t idx = scm_inline_gc_bytes_to_freelist_index (bytes); @@ -115,7 +100,7 @@ scm_inline_gc_malloc_pointerless (scm_i_thread *thread, size_t bytes) } static inline void * -scm_inline_gc_malloc (scm_i_thread *thread, size_t bytes) +scm_inline_gc_malloc (scm_thread *thread, size_t bytes) { size_t idx = scm_inline_gc_bytes_to_freelist_index (bytes); @@ -127,13 +112,13 @@ scm_inline_gc_malloc (scm_i_thread *thread, size_t bytes) } static inline void * -scm_inline_gc_malloc_words (scm_i_thread *thread, size_t words) +scm_inline_gc_malloc_words (scm_thread *thread, size_t words) { return scm_inline_gc_malloc (thread, words * sizeof (void *)); } static inline SCM -scm_inline_cell (scm_i_thread *thread, scm_t_bits car, scm_t_bits cdr) +scm_inline_cell (scm_thread *thread, scm_t_bits car, scm_t_bits cdr) { SCM cell = SCM_PACK_POINTER (scm_inline_gc_malloc_words (thread, 2)); @@ -144,7 +129,7 @@ scm_inline_cell (scm_i_thread *thread, scm_t_bits car, scm_t_bits cdr) } static inline SCM -scm_inline_double_cell (scm_i_thread *thread, scm_t_bits car, scm_t_bits cbr, +scm_inline_double_cell (scm_thread *thread, scm_t_bits car, scm_t_bits cbr, scm_t_bits ccr, scm_t_bits cdr) { SCM cell = SCM_PACK_POINTER (scm_inline_gc_malloc_words (thread, 4)); @@ -158,7 +143,7 @@ scm_inline_double_cell (scm_i_thread *thread, scm_t_bits car, scm_t_bits cbr, } static inline SCM -scm_inline_words (scm_i_thread *thread, scm_t_bits car, scm_t_uint32 n_words) +scm_inline_words (scm_thread *thread, scm_t_bits car, uint32_t n_words) { SCM obj = SCM_PACK_POINTER (scm_inline_gc_malloc_words (thread, n_words)); @@ -168,16 +153,10 @@ scm_inline_words (scm_i_thread *thread, scm_t_bits car, scm_t_uint32 n_words) } static inline SCM -scm_inline_cons (scm_i_thread *thread, SCM x, SCM y) +scm_inline_cons (scm_thread *thread, SCM x, SCM y) { return scm_inline_cell (thread, SCM_UNPACK (x), SCM_UNPACK (y)); } #endif /* SCM_GC_INLINE_H */ - -/* - Local Variables: - c-file-style: "gnu" - End: -*/ |